Merge branch 'feature/FutureBackend' of github.com:HenrikBengtsson/future into feature/FutureBackend

Author: HenrikBengtsson

R/backend_api-ClusterRegistry.R

@@ -47,6 +47,11 @@ ClusterRegistry <- local({
 
 .makeCluster <- function(workers, ...) {
   if (length(workers) == 0L) return(NULL)
+  oenv <- Sys.getenv("R_FUTURE_PLAN", NA_character_)
+  Sys.unsetenv("R_FUTURE_PLAN")
+  on.exit({
+    if (!is.na(oenv)) Sys.setenv(R_FUTURE_PLAN = oenv)
+  })
   cl <- makeClusterPSOCK(workers, ...)
   cl <- addCovrLibPath(cl)
   cl

R/backend_api-Future-class.R

@@ -783,8 +783,7 @@ getFutureContext <- function(future, mc.cores = NULL, local = TRUE, ..., debug =
   ## Use default future strategy + identify packages needed by the backend
   if (length(strategiesR) == 0L) {
     if (debug) mdebug("Packages needed by future strategies (n = 0): <none>")
-    strategiesR <- getOption("future.plan")
-    if (is.null(strategiesR)) strategiesR <- sequential
+    strategiesR <- sequential
     backendPackages <- c("future")
   } else {
     ## Identify package namespaces needed for strategies

R/zzz.R

@@ -20,6 +20,14 @@ attr(multicore, "backend") <- MulticoreFutureBackend
   update_package_option("future.debug", mode = "logical")
   debug <- isTRUE(getOption("future.debug"))
 
+  ## Special case: Disable 'R_FUTURE_PLAN' when 'R CMD check'
+  ## runs checks on examples, because, for instance,
+  ## R_FUTURE_PLAN=multisession, will create connections that
+  ## the check code will think are left over connections.
+  if (!is.na(Sys.getenv("R_FUTURE_PLAN")) && "CheckExEnv" %in% search()) {
+    Sys.unsetenv("R_FUTURE_PLAN")
+  }
+  
   if (debug) {
     envs <- Sys.getenv()
     envs <- envs[grep("R_FUTURE_", names(envs), fixed = TRUE)]

tests/cluster,worker-termination.R

@@ -14,8 +14,8 @@ message("Library paths: ", commaq(.libPaths()))
 message("Package path: ", sQuote(system.file(package = "future")))
 message("TMPDIR for parallel workers: ", sQuote(Sys.getenv("TMPDIR")))
 
-types <- "PSOCK"
-
+types <- NULL
+if (!covr_testing) types <- c(types, "PSOCK")
 if (supportsMulticore()) types <- c(types, "FORK")
 
 pid <- Sys.getpid()

tests/cluster-missing-future-pkg.R

@@ -6,8 +6,8 @@ message("*** cluster() ...")
 message("Library paths: ", commaq(.libPaths()))
 message("Package path: ", sQuote(system.file(package = "future")))
 
-types <- "PSOCK"
-
+types <- NULL
+if (!covr_testing) types <- c(types, "PSOCK")
 if (supportsMulticore()) types <- c(types, "FORK")
 
 setupClusterWithoutPkgs <- function(type = "PSOCK", withouts = c("future")) {