Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 28 additions & 14 deletions packages/nimble/inst/include/nimble/NimArr.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ template<int nDim, class T, class T2>
target.getVptrRef() = ans;
target.mapCopy(val);
} else {
std::copy(val.getConstPtr(), val.getConstPtr() + length, *ans);
if(length > 0)
std::copy(val.getConstPtr(), val.getConstPtr() + length, *ans);
}
}

Expand Down Expand Up @@ -172,7 +173,8 @@ class NimArr<1, T> : public NimArrBase<T> {
if (NimArrBase<T>::own_v) nimble_free(NimArrBase<T>::v);
NimArrBase<T>::v = nimble_malloc<T>(size1);
NimArrBase<T>::own_v = true;
std::copy(other.v, other.v + size1, NimArrBase<T>::v);
if (size1 > 0)
std::copy(other.v, other.v + size1, NimArrBase<T>::v);
}
NimArrBase<T>::setVptr();
return *this;
Expand Down Expand Up @@ -211,7 +213,8 @@ class NimArr<1, T> : public NimArrBase<T> {
if (NimArrBase<T>::own_v) nimble_free(NimArrBase<T>::v);
NimArrBase<T>::v = nimble_malloc<T>(NimArrBase<T>::NAlength);
NimArrBase<T>::own_v = true;
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
if (NimArrBase<T>::NAlength > 0)
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
}
NimArrBase<T>::setVptr();
return (*this);
Expand All @@ -238,7 +241,8 @@ class NimArr<1, T> : public NimArrBase<T> {
} else {
NimArrBase<T>::v = nimble_malloc<T>(size1);
NimArrBase<T>::own_v = true;
std::copy(other.v, other.v + size1, NimArrBase<T>::v);
if (size1 > 0)
std::copy(other.v, other.v + size1, NimArrBase<T>::v);
}
NimArrBase<T>::setVptr();
}
Expand Down Expand Up @@ -421,7 +425,8 @@ class NimArr<2, T> : public NimArrBase<T> {
if (NimArrBase<T>::own_v) nimble_free(NimArrBase<T>::v);
NimArrBase<T>::v = nimble_malloc<T>(NimArrBase<T>::NAlength);
NimArrBase<T>::own_v = true;
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
if (NimArrBase<T>::NAlength > 0)
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
}
NimArrBase<T>::setVptr();
return *this;
Expand Down Expand Up @@ -454,7 +459,8 @@ class NimArr<2, T> : public NimArrBase<T> {
} else {
NimArrBase<T>::v = nimble_malloc<T>(NimArrBase<T>::NAlength);
NimArrBase<T>::own_v = true;
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
if (NimArrBase<T>::NAlength > 0)
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
}
NimArrBase<T>::setVptr();
}
Expand Down Expand Up @@ -666,7 +672,8 @@ class NimArr<3, T> : public NimArrBase<T> {
if (NimArrBase<T>::own_v) nimble_free(NimArrBase<T>::v);
NimArrBase<T>::v = nimble_malloc<T>(NimArrBase<T>::NAlength);
NimArrBase<T>::own_v = true;
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
if (NimArrBase<T>::NAlength > 0)
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
}
NimArrBase<T>::setVptr();
return *this;
Expand Down Expand Up @@ -704,7 +711,8 @@ class NimArr<3, T> : public NimArrBase<T> {
} else {
NimArrBase<T>::v = nimble_malloc<T>(NimArrBase<T>::NAlength);
NimArrBase<T>::own_v = true;
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
if (NimArrBase<T>::NAlength > 0)
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
}
NimArrBase<T>::setVptr();
}
Expand Down Expand Up @@ -949,7 +957,8 @@ class NimArr<4, T> : public NimArrBase<T> {
if (NimArrBase<T>::own_v) nimble_free(NimArrBase<T>::v);
NimArrBase<T>::v = nimble_malloc<T>(NimArrBase<T>::NAlength);
NimArrBase<T>::own_v = true;
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
if (NimArrBase<T>::NAlength > 0)
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
}
NimArrBase<T>::setVptr();
return *this;
Expand Down Expand Up @@ -994,7 +1003,8 @@ class NimArr<4, T> : public NimArrBase<T> {
} else {
NimArrBase<T>::v = nimble_malloc<T>(NimArrBase<T>::NAlength);
NimArrBase<T>::own_v = true;
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
if (NimArrBase<T>::NAlength > 0)
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
}
NimArrBase<T>::setVptr();
}
Expand Down Expand Up @@ -1270,7 +1280,8 @@ class NimArr<5, T> : public NimArrBase<T> {
if (NimArrBase<T>::own_v) nimble_free(NimArrBase<T>::v);
NimArrBase<T>::v = nimble_malloc<T>(NimArrBase<T>::NAlength);
NimArrBase<T>::own_v = true;
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
if (NimArrBase<T>::NAlength > 0)
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
}
NimArrBase<T>::setVptr();
return *this;
Expand Down Expand Up @@ -1321,7 +1332,8 @@ class NimArr<5, T> : public NimArrBase<T> {
} else {
NimArrBase<T>::v = nimble_malloc<T>(NimArrBase<T>::NAlength);
NimArrBase<T>::own_v = true;
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
if (NimArrBase<T>::NAlength > 0)
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
}
NimArrBase<T>::setVptr();
}
Expand Down Expand Up @@ -1626,7 +1638,8 @@ class NimArr<6, T> : public NimArrBase<T> {
if (NimArrBase<T>::own_v) nimble_free(NimArrBase<T>::v);
NimArrBase<T>::v = nimble_malloc<T>(NimArrBase<T>::NAlength);
NimArrBase<T>::own_v = true;
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
if (NimArrBase<T>::NAlength > 0)
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
}
NimArrBase<T>::setVptr();
return *this;
Expand Down Expand Up @@ -1683,7 +1696,8 @@ class NimArr<6, T> : public NimArrBase<T> {
} else {
NimArrBase<T>::v = nimble_malloc<T>(NimArrBase<T>::NAlength);
NimArrBase<T>::own_v = true;
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
if (NimArrBase<T>::NAlength > 0)
std::copy(other.v, other.v + NimArrBase<T>::NAlength, NimArrBase<T>::v);
}
NimArrBase<T>::setVptr();
}
Expand Down
18 changes: 12 additions & 6 deletions packages/nimble/inst/include/nimble/RcppNimbleUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -245,13 +245,15 @@ void SEXP_2_NimArr(SEXP Sn, NimArr<ndim, double> &ans) {
ans.setSize(inputDims);
int nn = LENGTH(Sn);
if(Rf_isReal(Sn)) {
std::copy(REAL(Sn), REAL(Sn) + nn, ans.getPtr() );
if(nn > 0)
std::copy(REAL(Sn), REAL(Sn) + nn, ans.getPtr() );
} else {
NIM_ASSERT3(Rf_isInteger(Sn) || Rf_isLogical(Sn),
"could not handle input of type %s to SEXP_2_NimArr<%d, double>\n",
Rf_type2char(TYPEOF(Sn)), ndim);
int *iSn = Rf_isInteger(Sn) ? INTEGER(Sn) : LOGICAL(Sn);
std::copy(iSn, iSn + nn, ans.getPtr()); //v);
if(nn > 0)
std::copy(iSn, iSn + nn, ans.getPtr()); //v);
}
}

Expand All @@ -269,13 +271,15 @@ void SEXP_2_NimArr(SEXP Sn, NimArr<ndim, int> &ans) {
ans.setSize(inputDims);
int nn = LENGTH(Sn);
if(Rf_isReal(Sn)) {
std::copy(REAL(Sn), REAL(Sn) + nn, ans.getPtr() );
if(nn > 0)
std::copy(REAL(Sn), REAL(Sn) + nn, ans.getPtr() );
} else {
NIM_ASSERT3(Rf_isInteger(Sn) || Rf_isLogical(Sn),
"could not handle input type %s to SEXP_2_NimArr<%d, int>\n",
Rf_type2char(TYPEOF(Sn)), ndim);
int *iSn = Rf_isInteger(Sn) ? INTEGER(Sn) : LOGICAL(Sn);
std::copy(iSn, iSn + nn, ans.getPtr()); //v);
if(nn > 0)
std::copy(iSn, iSn + nn, ans.getPtr()); //v);
}
}

Expand All @@ -292,13 +296,15 @@ void SEXP_2_NimArr(SEXP Sn, NimArr<ndim, bool> &ans) {
ans.setSize(inputDims);
int nn = LENGTH(Sn);
if(Rf_isReal(Sn)) {
std::copy(REAL(Sn), REAL(Sn) + nn, ans.getPtr() );
if(nn > 0)
std::copy(REAL(Sn), REAL(Sn) + nn, ans.getPtr() );
} else {
NIM_ASSERT3(Rf_isInteger(Sn) || Rf_isLogical(Sn),
"could not handle input type %s to SEXP_2_NimArr<%d, bool>\n",
Rf_type2char(TYPEOF(Sn)), ndim);
int *iSn = Rf_isInteger(Sn) ? INTEGER(Sn) : LOGICAL(Sn);
std::copy(iSn, iSn + nn, ans.getPtr()); //v);
if(nn > 0)
std::copy(iSn, iSn + nn, ans.getPtr()); //v);
}
}

Expand Down
7 changes: 4 additions & 3 deletions packages/nimble/inst/include/nimble/accessorClasses.h
Original file line number Diff line number Diff line change
Expand Up @@ -739,9 +739,10 @@ class NodeVectorClassNew_derivs : public NodeVectorClassNew {
NimArrVars.setSize(length_wrt);
getValues(NimArrVars, model_wrt_accessor);

std::copy(NimArrVars.getPtr(),
NimArrVars.getPtr() + length_wrt,
independentVars.begin());
if(length_wrt > 0)
std::copy(NimArrVars.getPtr(),
NimArrVars.getPtr() + length_wrt,
independentVars.begin());

//std::cout<<"done runTape_setInd"<<std::endl;
// 2. Run tape
Expand Down
10 changes: 6 additions & 4 deletions packages/nimble/inst/include/nimble/nimbleCppADbaseClass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,8 @@ void getDerivs_internal(vector<BASE> &independentVars,
if (ordersFound[0]) {
ansList->value.setSize(res_dimy_o0, false, false);
if(outAlly_o0) {
std::copy(value_ans.begin(), value_ans.end(), ansList->value.getPtr());
if(!value_ans.empty())
std::copy(value_ans.begin(), value_ans.end(), ansList->value.getPtr());
} else {
BASE *LHS = ansList->value.getPtr();
for(size_t iii=0;iii<res_dimy_o0;iii++,LHS++) {
Expand Down Expand Up @@ -909,9 +910,10 @@ void nimbleFunctionCppADbase::getDerivs_calculate_internal(nimbleCppADinfoClass
NimArrVars.setSize(length_wrt);
getValues(NimArrVars, nodes.model_wrt_accessor);

std::copy(NimArrVars.getPtr(),
NimArrVars.getPtr() + length_wrt,
ADinfo.independentVars.begin());
if(length_wrt > 0)
std::copy(NimArrVars.getPtr(),
NimArrVars.getPtr() + length_wrt,
ADinfo.independentVars.begin());
/* set dynamic */
// Copy extraInput (CppAD "dynamic") values from the model into the dynamicVars
// *and* set them in the tape.
Expand Down
Loading