added future_apply

bayesplay · Dec 19, 2023 · fd06414 · fd06414
1 parent 7045086
commit fd06414
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -23,7 +23,8 @@ Imports:
     gginnards,
     stats,
     ggplot2,
-    rlang
+    rlang,
+    future.apply
 Authors@R: 
     person(given = c("Lincoln", "John"), 
             family = "Colling",

diff --git a/R/utils.r b/R/utils.r
@@ -17,25 +17,15 @@ pmap <- function(x, f, ...) {
 
 par_map <- function(x, f, ...) {
   f <- match.fun(f)
-  # mclapply doesn't work on windows?
-  # dout <- parallel::mclapply(x, f, mc.cores = parallel::detectCores(), ...) # nolint
-  cl <- parallel::makeCluster(parallel::detectCores())
-  dout <- parallel::parLapply(cl, x, f, ...)
-  parallel::stopCluster(cl)
+  dout <- future.apply::future_lapply(x, f, ...)
   row.names(dout) <- NULL
   dout
 }
 
 par_pmap <- function(x, f, ...) {
   x_list <- unname(split(x, ~ row.names(x)))
   f <- match.fun(f)
-  # dout <- parallel::mclapply(x_list, f,
-  #   mc.cores = parallel::detectCores(), ...
-  # )
-
-  cl <- parallel::makeCluster(parallel::detectCores())
-  dout <- parallel::parLapply(cl, x_list, f, ...)
-  parallel::stopCluster(cl)
+  dout <- future.apply::future_lapply(x_list, f, ...)
   row.names(dout) <- NULL
   Reduce(f = rbind, dout)
 }