tweaks

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future.batchtools
-Version: 0.12.2-9918
+Version: 0.12.2-9919
 Depends:
     R (>= 3.2.0),
     parallelly,

R/BatchtoolsFutureBackend-class.R

@@ -209,6 +209,9 @@ launchFuture.BatchtoolsFutureBackend <- local({
     })
 
     config <- list(reg = reg)
+    if (debug) {
+      mprint(list(config = config))
+    }
     future[["config"]] <- config
 
     ## Register finalizer?

R/temp_registry.R

@@ -3,10 +3,19 @@ temp_registry <- local({
   ## All known batchtools registries
   regs <- new.env()
 
-  make_registry <- function(conf.file = NULL, cluster.functions = NULL, config = list(), ...) {
+  make_registry <- function(cluster.functions = NULL, config = list(), ...) {
     ## Temporarily disable batchtools output?
     ## (i.e. messages and progress bars)
     debug <- isTRUE(getOption("future.debug"))
+    if (debug) {
+      mdebugf_push("make_registry() ...")
+      mdebug("cluster.functions:")
+      mstr(cluster.functions)
+      mdebug("config:")
+      mstr(config)
+      on.exit(mdebug_pop())
+    }
+
     batchtools_output <- getOption("future.batchtools.output", debug)
 
     work.dir <- config$work.dir
@@ -15,13 +24,13 @@ temp_registry <- local({
 
     if (!batchtools_output) {
       oopts <- options(batchtools.verbose = FALSE, batchtools.progress = FALSE)
-      on.exit(options(oopts))
+      on.exit(options(oopts), add = TRUE)
     }
 
     ## WORKAROUND: batchtools::makeRegistry() updates the RNG state,
     ## which we must make sure to undo.
     with_stealth_rng({
-      reg <- makeRegistry(work.dir = work.dir, conf.file = conf.file, ...)
+      reg <- makeRegistry(work.dir = work.dir, ...)
     })
 
     if (!is.null(cluster.functions)) {    ### FIXME
@@ -41,7 +50,13 @@ temp_registry <- local({
     reg
   } ## make_registry()
 
-  function(label = "batchtools", path = NULL, conf.file = NULL, cluster.functions = NULL, config = list(), ...) {
+  function(label = "batchtools", path = NULL, cluster.functions = NULL, config = list(), ...) {
+    debug <- isTRUE(getOption("future.debug"))
+    if (debug) {
+      mdebugf_push("temp_registry() ...")
+      on.exit(mdebug_pop())
+    }
+
     if (is.null(label)) label <- "batchtools"
     ## The job label (the name on the job queue) - may be duplicated
     label <- as.character(label)
@@ -83,7 +98,7 @@ temp_registry <- local({
     ## expression "^[a-zA-Z]+[0-9a-zA-Z_]*$".
     ## /HB 2016-10-19
     reg_id <- as_valid_registry_id(label)
-    make_registry(file.dir = path_registry, conf.file = conf.file, cluster.functions = cluster.functions, config = config, ...)
+    make_registry(file.dir = path_registry, cluster.functions = cluster.functions, config = config, ...)
   }
 })
 

inst/templates/slurm.tmpl

@@ -8,7 +8,7 @@
 <% Slurm defaults
 defaults <- list(
   nodes = 1,          # single-host processing
-   time = "00:05:00"  # 5-min runtime
+   time = "00:05:00", # 5-min runtime
    mem  = "100M"      # 100 MiB memory
 )
 resources <- c(resources, defaults[setdiff(names(defaults), names(resources))])