nbrOfWorkers() now go via FutureBackend, if implemented

Author: HenrikBengtsson

R/utils-prune_pkg_code.R

@@ -17,6 +17,7 @@ prune_call <- function(expr, name) {
 prune_fcns <- function(expr) {
   expr <- prune_call(expr, name = "stop_if_not")
   expr <- prune_call(expr, name = "with_assert")
+  expr <- prune_call(expr, name = "assert_no_positional_args_but_first")
   expr
 }
 

R/utils_api-nbrOfWorkers.R

@@ -41,8 +41,8 @@ nbrOfWorkers.cluster <- function(evaluator) {
 #' @export
 nbrOfWorkers.uniprocess <- function(evaluator) {
   assert_no_positional_args_but_first()
-  
-  1L
+  backend <- makeFutureBackend(evaluator)
+  nbrOfWorkers(backend)
 }
 
 
@@ -65,6 +65,11 @@ nbrOfWorkers.multiprocess <- function(evaluator) {
 #' @export
 nbrOfWorkers.future <- function(evaluator) {
   assert_no_positional_args_but_first()
+
+  backend <- makeFutureBackend(evaluator)
+  if (inherits(backend, "FutureBackend")) {
+    return(nbrOfWorkers(backend))
+  }  
 
   expr <- formals(evaluator)$workers
   workers <- eval(expr, enclos = baseenv())

tests/constant.R

@@ -13,18 +13,6 @@ y <- value(f)
 print(y)
 stopifnot(y == 42L)
 
-
-plan(constant)
-## No global variables
-f <- try(future(42L), silent = FALSE)
-print(f)
-stopifnot(inherits(f, "ConstantFuture"))
-
-print(resolved(f))
-y <- value(f)
-print(y)
-stopifnot(y == 42L)
-
 message("*** constant() ... DONE")
 
 source("incl/end.R")