v2.11 - update for cmdstanr v0.0.0.9006

-fixes deprecated stuff in latest cmdstanr. this breaks my old exe caching code, so will need to figure out a new way to accomplish that.
rmcelreath · Jun 26, 2020 · 89b3e63 · jgabry · Jun 26, 2020 · rmcelreath
1 parent a6d2438
commit 89b3e63
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: rethinking
 Type: Package
 Title: Statistical Rethinking book package
-Version: 2.10
-Date: 2020-05-13
+Version: 2.11
+Date: 2020-06-26
 Author: Richard McElreath
 Maintainer: Richard McElreath <richard_mcelreath@eva.mpg.de>
 Imports: coda, MASS, mvtnorm, loo, shape

diff --git a/R/ulam-function.R b/R/ulam-function.R
@@ -1410,11 +1410,11 @@ ulam <- function( flist , data , pars , pars_omit , start , chains=1 , cores=1 ,
                     filex <- cmdstanr_model_write( model_code )
                     mod <- cmdstan_model(
                         stan_file=filex[[1]],
-                        exe_file=filex[[2]],
+                      # exe_file=filex[[2]],
                         compile=filex[[3]],
                         cpp_options=list(stan_threads=TRUE) )
-                    set_num_threads( threads )
-                    cmdstanfit <- mod$sample( data=data , chains=chains , cores=cores , iter_sampling=iter , adapt_delta=as.numeric(control[['adapt_delta']]) , ... )
+                    # set_num_threads( threads )
+                    cmdstanfit <- mod$sample( data=data , chains=chains , parallel_chains=cores , iter_sampling=iter , adapt_delta=as.numeric(control[['adapt_delta']]) , threads_per_chain=threads , ... )
                     stanfit <- rstan::read_stan_csv(cmdstanfit$output_files())
                 }
             } else

diff --git a/tests/rethinking_tests/test_cmdstanr_threads.R b/tests/rethinking_tests/test_cmdstanr_threads.R
@@ -30,7 +30,7 @@ m2 <- ulam(
         a ~ normal(0,1.5),
         b ~ normal(0,0.5)
     ) , data=dat , 
-    cmdstan=TRUE , threads=2 , chains=1 , cores=1 , refresh=1000 )
+    cmdstan=TRUE , threads=2 , chains=2 , cores=2 , refresh=1000 )
 
 # hierarchical version
 N_id <- round(N/10)