BUG FIX: plan(batchtools_multicore) did not support 'workers' argument being a function

Author: HenrikBengtsson

.github/workflows/future_tests.yaml

@@ -16,7 +16,8 @@ jobs:
       fail-fast: false
       matrix:
         future:
-          - { plan: 'future.batchtools::batchtools_local' }
+          - { plan: 'future.batchtools::batchtools_local'       }
+          - { plan: 'future.batchtools::batchtools_multicore'   }
           - { plan: 'future.batchtools::batchtools_interactive' }
 
     env:

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future.batchtools
-Version: 0.12.0-9000
+Version: 0.12.0-9001
 Depends:
     R (>= 3.2.0),
     parallelly,

NEWS.md

@@ -1,6 +1,9 @@
 # Version (development version)
 
- * ...
+## Bug Fixes
+
+ * `plan(batchtools_multicore)` did not support `workers` argument
+   being a function.
 
 
 # Version 0.12.0 [2023-02-24]

R/batchtools_multicore.R

@@ -33,7 +33,11 @@ batchtools_multicore <- function(expr, envir = parent.frame(),
                             registry = list(), ...) {
   if (substitute) expr <- substitute(expr)
 
-  if (is.null(workers)) workers <- availableCores(constraints = "multicore")
+  if (is.null(workers)) {
+    workers <- availableCores(constraints = "multicore")
+  } else if (is.function(workers)) {
+    workers <- workers()
+  }
   stop_if_not(length(workers) == 1L, is.numeric(workers),
             is.finite(workers), workers >= 1L)
 

R/nbrOfWorkers.R

@@ -18,6 +18,7 @@ nbrOfWorkers.batchtools <- function(evaluator) {
   expr <- formals(evaluator)$workers
   workers <- eval(expr, enclos = baseenv())
   if (!is.null(workers)) {
+    if (is.function(workers)) workers <- workers()
     stop_if_not(length(workers) >= 1)
     if (is.numeric(workers)) return(prod(workers))
     if (is.character(workers)) return(length(workers))
@@ -57,6 +58,7 @@ nbrOfWorkers.batchtools_multicore <- function(evaluator) {
   ## 1. Infer from 'workers' argument
   expr <- formals(evaluator)$workers
   workers <- eval(expr, enclos = baseenv())
+  if (is.function(workers)) workers <- workers()
   stop_if_not(length(workers) == 1L, is.numeric(workers), !is.na(workers), is.finite(workers), workers >= 1)
   workers
 }