FIX: When calling a future constructor via do.call(), we must use quote = TRUE; otherwise 'expr' is resolved

Author: HenrikBengtsson

R/BatchtoolsSSHFuture-class.R

@@ -25,7 +25,9 @@ BatchtoolsSSHFuture <- function(expr = NULL, substitute = TRUE, envir = parent.f
     cluster.functions = cluster.functions
   )
   if (length(dotdotdot) > 0) args <- c(args, dotdotdot)
-  future <- do.call(BatchtoolsCustomFuture, args = args)
+
+  future <- do.call(BatchtoolsCustomFuture, args = args, quote = TRUE)
+
   future <- structure(future, class = c("BatchtoolsSSHFuture", class(future)))
 
   future$workers <- workers

R/BatchtoolsSSHRegistry.R

@@ -50,6 +50,6 @@ BatchtoolsSSHRegistry <- local({
   ncpus <- table(workers)
 
   mapply(names(ncpus), ncpus, FUN = function(hostname, ncpus) {
-    Worker$new(hostname, ncpus = ncpus)
+    Worker$new(hostname, ncpus = ncpus, max.load = Inf)
   })
 }

R/batchtools_template.R

@@ -221,7 +221,7 @@ batchtools_by_template <- function(expr, envir = parent.frame(),
     workers = workers
   )
   if (length(dotdotdot) > 0) args <- c(args, dotdotdot)
-  future <- do.call(constructor, args = args)
+  future <- do.call(constructor, args = args, quote = TRUE)
 
   if (!future$lazy) future <- run(future)
 

tests/batchtools_ssh.R

@@ -0,0 +1,33 @@
+source("incl/start.R")
+library("listenv")
+
+message("*** batchtools_ssh() ...")
+
+plan(batchtools_ssh, workers = 2L)
+supports_ssh <- tryCatch({
+  f <- future(42L)
+  v <- value(f)
+  identical(v, 42L)
+}, error = function(e) FALSE)
+message("Supports batchtools_ssh: ", supports_ssh)
+
+if (supports_ssh) {
+  message("future(a) ...")
+  a0 <- a <- 42
+  f <- future(a)
+  stopifnot(identical(f$globals$a, a0))
+  v <- value(f)
+  stopifnot(identical(v, a0))
+
+  message("future(a, lazy = TRUE) ...")
+  a0 <- a <- 42
+  f <- future(a, lazy = TRUE)
+  rm(list = "a")
+  stopifnot(identical(f$globals$a, a0))
+  v <- value(f)
+  stopifnot(identical(v, a0))
+} ## if (supports_ssh)
+
+message("*** batchtools_ssh() ... DONE")
+
+source("incl/end.R")