Update accept_reject

prdm0 · Apr 23, 2024 · 2508dd5 · 2508dd5
1 parent 7f97e8c
commit 2508dd5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 98 deletions.
diff --git a/.github/workflows/rhub.yaml b/.github/workflows/rhub.yaml
diff --git a/NAMESPACE b/NAMESPACE
@@ -33,6 +33,7 @@ importFrom(lbfgs,lbfgs)
 importFrom(numDeriv,grad)
 importFrom(parallel,detectCores)
 importFrom(parallel,makeCluster)
+importFrom(parallel,stopCluster)
 importFrom(pbmcapply,pbmclapply)
 importFrom(purrr,map_dbl)
 importFrom(purrr,partial)

diff --git a/R/accept_reject.r b/R/accept_reject.r
@@ -106,7 +106,7 @@
 #' @importFrom lbfgs lbfgs
 #' @importFrom purrr partial map_dbl
 #' @importFrom numDeriv grad
-#' @importFrom parallel detectCores makeCluster
+#' @importFrom parallel detectCores makeCluster stopCluster
 #' @importFrom stats dunif runif dweibull
 #' @importFrom utils capture.output
 #' @importFrom assertthat assert_that
@@ -245,13 +245,13 @@ accept_reject <-
           mc.cores = n_cores
           )))
     } else if(parallel && .Platform$OS.type == "windows"){
-      cl <- makeCluster(parallel::detectCores())
+      cl <- parallel::makeCluster(getOption("cl.cores", 2L))
       capture.output(
         r <- unlist(parallel::parLapply(
           X = n_each_core,
           fun = one_step
       )))
-      stopCluster(cl)
+      parallel::stopCluster(cl)
     } else {
       r <- one_step(n)
     }