Different poped differences based on rxode2 api

nlmixr2 · Nov 4, 2024 · 74ebf1d · 74ebf1d
1 parent ae998de
commit 74ebf1d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -43,7 +43,7 @@ Imports:
     methods,
     qs,
     rex,
-    rxode2 (> 3.0.2)
+    rxode2 (>= 3.0.2)
 RoxygenNote: 7.3.2
 Roxygen: list(markdown = TRUE)
 Config/testthat/edition: 3

diff --git a/src/Makevars.in b/src/Makevars.in
@@ -2,9 +2,9 @@
 ARMA=`"$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e 'cat(file.path(find.package("RcppArmadillo"),"include"))'`
 RCPP=`"$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e 'cat(file.path(find.package("Rcpp"),"include"))'`
 EG=`"$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e 'cat(file.path(find.package("RcppEigen"),"include"))'`
+RXAPI=`"$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e 'cat(length(rxode2::.rxode2ptrs()))'`
 
 PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
-PKG_CXXFLAGS = -Id -@ISYSTEM@"$(EG)" -@ISYSTEM@"$(RCPP)" -@ISYSTEM@"$(ARMA)"
-SHLIB_LDFLAGS = $(SHLIB_CXXLDFLAGS) 
+PKG_CXXFLAGS = -Id -@ISYSTEM@"$(EG)" -@ISYSTEM@"$(RCPP)" -@ISYSTEM@"$(ARMA)" -DRXAPI=$(RXAPI)
+SHLIB_LDFLAGS = $(SHLIB_CXXLDFLAGS)
 SHLIB_LD = $(SHLIB_CXXLD)
-
diff --git a/src/poped.cpp b/src/poped.cpp
@@ -387,8 +387,13 @@ Rcpp::IntegerVector popedGetLoadedInfo() {
   retN[6] = "stiff";
   ret[6] = getOpStiff(op);
 
+#if RXAPI > 48
   retN[7] = "npars";
   ret[7] = getRxNpars(rx);
+#else
+  retN[7] = "npars";
+  ret[7] = NA_INTEGER;
+#endif
   ret.attr("names") = retN;
   return ret;
 }