diff options
| author | Ken Kellner <ken@kenkellner.com> | 2023-05-23 08:38:01 -0400 |
|---|---|---|
| committer | Ken Kellner <ken@kenkellner.com> | 2023-05-23 08:38:01 -0400 |
| commit | dcf3f0398a7922565f29f9bd5c9b8a5016d71a51 (patch) | |
| tree | 647f0085d577c0ead0f446c5a8f54c6a99dca605 | |
| parent | 3b151048fc4d446e25aa7efaa077cfd51c541cc3 (diff) | |
Test fixes to Makevars
| -rw-r--r-- | DESCRIPTION | 4 | ||||
| -rw-r--r-- | src/Makevars | 2 | ||||
| -rw-r--r-- | src/Makevars.win | 2 | ||||
| -rw-r--r-- | tests/testthat/test_ubmsFit_methods.R | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/DESCRIPTION b/DESCRIPTION index 2ec3fd5..22f8aaa 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: ubms -Version: 1.2.3 -Date: 2023-05-17 +Version: 1.2.4 +Date: 2023-05-23 Title: Bayesian Models for Data from Unmarked Animals using 'Stan' Authors@R: person("Ken", "Kellner", email="contact@kenkellner.com", role=c("cre","aut")) diff --git a/src/Makevars b/src/Makevars index 1a7240d..7b9c5ab 100644 --- a/src/Makevars +++ b/src/Makevars @@ -3,7 +3,7 @@ STANHEADERS_SRC = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "message()" -e STANC_FLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "cat(ifelse(utils::packageVersion('rstan') >= 2.26, '-DUSE_STANC3',''))") # COMMENT THIS OUT WHEN TESTING CLANG -PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DBOOST_MATH_OVERFLOW_ERROR_POLICY=errno_on_error $(STANC_FLAGS) +PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DBOOST_MATH_OVERFLOW_ERROR_POLICY=errno_on_error $(STANC_FLAGS) -D_HAS_AUTO_PTR_ETC=0 # UNCOMMENT THIS WHEN TESTING CLANG #PKG_CPPFLAGS = -I"../inst/include" -isystem"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DBOOST_MATH_OVERFLOW_ERROR_POLICY=errno_on_error $(STANC_FLAGS) diff --git a/src/Makevars.win b/src/Makevars.win index 01e474c..23dfbd7 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,7 +1,7 @@ STANHEADERS_SRC = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "message()" -e "cat(system.file('include', 'src', package = 'StanHeaders', mustWork = TRUE))" -e "message()" | grep "StanHeaders") STANC_FLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "cat(ifelse(utils::packageVersion('rstan') >= 2.26, '-DUSE_STANC3',''))") -PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DRCPP_PARALLEL_USE_TBB=1 $(STANC_FLAGS) +PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DRCPP_PARALLEL_USE_TBB=1 $(STANC_FLAGS) -D_HAS_AUTO_PTR_ETC=0 PKG_CXXFLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "RcppParallel::CxxFlags()") $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "StanHeaders:::CxxFlags()") PKG_LIBS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "RcppParallel::RcppParallelLibs()") $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "StanHeaders:::LdFlags()") diff --git a/tests/testthat/test_ubmsFit_methods.R b/tests/testthat/test_ubmsFit_methods.R index 3237ce2..d25a1ed 100644 --- a/tests/testthat/test_ubmsFit_methods.R +++ b/tests/testthat/test_ubmsFit_methods.R @@ -98,6 +98,7 @@ test_that("traceplot method works for ubmsFit",{ }) test_that("predicting map works for ubmsFit",{ + skip_on_ci() r <- raster::raster(matrix(rnorm(30), ncol=5, nrow=6)) names(r) <- "x1" r2 <- r |