CLEANUP: Drop 'future.backend.version' option; we're using version 2 now, if backend supports it

Author: HenrikBengtsson

.github/workflows/R-CMD-check.yaml

@@ -31,7 +31,6 @@ jobs:
 
           - {os: ubuntu-latest,  r: 'release'  , availablecores: 1, label: 'availableCores.system=1' }
           - {os: ubuntu-latest,  r: 'release'  , availablecores: 2, label: 'availableCores.system=2' }
-          - {os: ubuntu-latest,  r: 'release'  , backend_version: 1, label: 'backend_version=1' }
           - {os: ubuntu-latest,  r: 'release'  , language: ko,    label: ko    }
           - {os: ubuntu-latest,  r: 'release'  , language: zh_CN, label: zh_CN }
           - {os: ubuntu-latest,  r: 'release'  , language: zh_TW, label: zh_TW }
@@ -60,7 +59,6 @@ jobs:
       R_PARALLELLY_AVAILABLECORES_SYSTEM: ${{ matrix.config.availablecores }}
       R_FUTURE_RNG_ONMISUSE: error
       R_FUTURE_GLOBALS_KEEPWHERE: ${{ matrix.config.globals_keepWhere }}
-      R_FUTURE_BACKEND_VERSION: ${{ matrix.config.backend_version }}
 
     steps:
       - uses: actions/checkout@v4

Makefile

@@ -15,12 +15,10 @@ spelling:
 future.tests/%:
 	$(R_SCRIPT) -e "future.tests::check" --args --test-plan=$*
 
-future.tests/future: future.tests/sequential future.tests/multicore future.tests/multisession future.tests/cluster
-
 future.tests/future.mirai: future.tests/future.mirai\:\:mirai_multisession future.tests/future.mirai\:\:mirai_cluster
 
 future.tests/future.callr: future.tests/future.callr\:\:callr
 
 future.tests/future.batchtools: future.tests/future.batchtools\:\:batchtools_local
 
-future.tests: future.tests/future
+future.tests: future.tests/sequential future.tests/multicore future.tests/multisession future.tests/cluster

NAMESPACE

@@ -74,7 +74,6 @@ S3method(result,ConstantFuture)
 S3method(result,Future)
 S3method(result,MulticoreFuture)
 S3method(result,UniprocessFuture)
-S3method(run,ClusterFuture)
 S3method(run,ConstantFuture)
 S3method(run,Future)
 S3method(run,UniprocessFuture)

R/backend_api-ClusterFuture-class.R

@@ -94,111 +94,6 @@ as_ClusterFuture <- function(future, workers = NULL, ...) {
 }
 
 
-#' @export
-run.ClusterFuture <- function(future, ...) {
-  if (getOption("future.backend.version", 2L) == 2L) {
-    return(NextMethod())
-  }
-
-  debug <- getOption("future.debug", FALSE)
-  
-  if (future[["state"]] != 'created') {
-    label <- future[["label"]]
-    if (is.null(label)) label <- "<none>"
-    stop(FutureError(sprintf("A future ('%s') can only be launched once", label), future = future))
-  }
-  
-  ## Assert that the process that created the future is
-  ## also the one that evaluates/resolves/queries it.
-  assertOwner(future)
-
-  backend <- future[["backend"]]
-  workers <- backend[["workers"]]
-  reg <- backend[["reg"]]
-
-  data <- getFutureData(future)
-  persistent <- isTRUE(future[["persistent"]])
-
-  ## Next available cluster node
-  t_start <- Sys.time()
-  node_idx <- requestNode(await = function() {
-    FutureRegistry(reg, action = "collect-first", earlySignal = TRUE)
-  }, workers = workers)
-  future[["node"]] <- node_idx
-
-  ## Cluster node to use
-  cl <- workers[node_idx]
-  
-  if (inherits(future[[".journal"]], "FutureJournal")) {
-    appendToFutureJournal(future,
-         event = "getWorker",
-      category = "overhead",
-        parent = "launch",
-         start = t_start,
-          stop = Sys.time()
-    )
-  }
-
-
-  ## (i) Reset global environment of cluster node such that
-  ##     previous futures are not affecting this one, which
-  ##     may happen even if the future is evaluated inside a
-  ##     local, e.g. local({ a <<- 1 }).
-  if (!persistent) {
-    t_start <- Sys.time()
-    cluster_call_blocking(cl, fun = grmall, future = future, when = "call grmall() on")
-    if (inherits(future[[".journal"]], "FutureJournal")) {
-      appendToFutureJournal(future,
-           event = "eraseWorker",
-        category = "overhead",
-          parent = "launch",
-           start = t_start,
-            stop = Sys.time()
-      )
-    }
-  }
-
-
-  ## (ii) Attach packages that needs to be attached
-  ##      NOTE: Already take care of by evalFuture().
-  ##      However, if we need to get an early error about missing packages,
-  ##      we can get the error here before launching the future.
-  t_start <- Sys.time()
-  packages <- future[["packages"]]
-  if (future[["earlySignal"]] && length(packages) > 0) {
-    if (debug) mdebugf("Attaching %d packages (%s) on cluster node #%d ...",
-                      length(packages), hpaste(sQuote(packages)), node_idx)
-
-    cluster_call_blocking(cl, fun = requirePackages, packages, future = future, when = "call requirePackages() on")
-
-    if (debug) mdebugf("Attaching %d packages (%s) on cluster node #%d ... DONE",
-                      length(packages), hpaste(sQuote(packages)), node_idx)
-  }
-  
-  if (inherits(future[[".journal"]], "FutureJournal")) {
-    appendToFutureJournal(future,
-         event = "attachPackages",
-      category = "overhead",
-        parent = "launch",
-         start = t_start,
-          stop = Sys.time()
-    )
-  }
-
-  ## Add to registry
-  FutureRegistry(reg, action = "add", future = future, earlySignal = FALSE)
-
-  ## (iv) Launch future
-  node_call_nonblocking(cl[[1L]], fun = evalFuture, args = list(data), when = "launch future on")
-
-  future[["state"]] <- 'running'
-
-  if (debug) mdebugf("%s started", class(future)[1])
-  
-  invisible(future)
-}
-
-
 getSocketSelectTimeout <- function(future, timeout = NULL) {
   if (!is.null(timeout)) return(timeout)
 

R/utils-options.R

@@ -362,7 +362,4 @@ update_package_options <- function(debug = FALSE) {
   ## future 1.34.0:
   update_package_option("future.globals.objectSize.method", mode = "character", debug = debug)
   update_package_option("future.plan.cleanup.legacy", mode = "logical", debug = debug)
-
-  ## future (>= 1.34.0-9000):
-  update_package_option("future.backend.version", mode = "integer", default = 2L, debug = debug)
 }