Make use of the new parallelly (>= 1.44.0) features

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future
-Version: 1.40.0-9315
+Version: 1.40.0-9400
 Title: Unified Parallel and Distributed Processing in R for Everyone
 Depends:
     R (>= 3.2.0)
@@ -8,15 +8,16 @@ Imports:
     globals (>= 0.16.1),
     listenv (>= 0.8.0),
     parallel,
-    parallelly (>= 1.43.0),
+    parallelly (>= 1.44.0),
     utils
 Suggests:
     methods,
     RhpcBLASctl,
     R.rsp,
     markdown
 Remotes:
-    futureverse/globals@develop
+    futureverse/parallelly,
+    futureverse/globals
 VignetteBuilder: R.rsp
 Authors@R: c(person("Henrik", "Bengtsson",
                     role = c("aut", "cre", "cph"),

NAMESPACE

@@ -196,9 +196,6 @@ export(supportsMulticore)
 export(tweak)
 export(validateFutureGlobals)
 export(value)
-if (packageVersion("parallelly") <= "1.43.0") {
-  S3method(all.equal,connection)
-}
 importFrom(digest,digest)
 importFrom(globals,Globals)
 importFrom(globals,as.Globals)

NEWS.md

@@ -27,9 +27,10 @@
    on the total and average runtime of all finished futures thus far.
 
  * Now `plan(multisession)` defaults to
-   `parallelly::availableCores(constraints = "connections")`
+   `parallelly::availableCores(constraints = "connections-16")`
    workers. This is done to make sure to not use more parallel workers
-   than the number of connections available in R, because each
+   than the number of connections available in R, and to leave 16
+   connections available for other needs. This is because each
    parallel PSOCK worker requires its own R connections. Previously,
    it would attempt to launch even more workers on machines with a
    large number of CPU cores, e.g. 128, 196, and 256 CPU-core

R/backend_api-13.MultisessionFutureBackend-class.R

@@ -9,7 +9,7 @@
 #' @keywords internal
 #' @rdname FutureBackend
 #' @export
-MultisessionFutureBackend <- function(workers = availableCores(constraints = "connections"), rscript_libs = .libPaths(), interrupts = TRUE, gc = FALSE, earlySignal = FALSE, ...) {
+MultisessionFutureBackend <- function(workers = availableCores(constraints = "connections-16"), rscript_libs = .libPaths(), interrupts = TRUE, gc = FALSE, earlySignal = FALSE, ...) {
   debug <- isTRUE(getOption("future.debug"))
   if (debug) {
     mdebugf_push("MultisessionFutureBackend(workers = <workers>, interrupts = %s, ...) ...", interrupts)
@@ -124,7 +124,7 @@ print.MultisessionFutureBackend <- function(x, validate = TRUE, ...) {
 #' cores that are available for the current \R session.
 #'
 #' @export
-multisession <- function(..., workers = availableCores(constraints = "connections"), lazy = FALSE, rscript_libs = .libPaths(), gc = FALSE, earlySignal = FALSE, envir = parent.frame()) {
+multisession <- function(..., workers = availableCores(constraints = "connections-16"), lazy = FALSE, rscript_libs = .libPaths(), gc = FALSE, earlySignal = FALSE, envir = parent.frame()) {
   ## WORKAROUNDS:
   ## (1) promises::future_promise() calls the "evaluator" function directly
   if ("promises" %in% loadedNamespaces()) {

R/utils-connections.R

@@ -1,16 +1,3 @@
-#' @rawNamespace if (packageVersion("parallelly") <= "1.43.0") {
-#'   S3method(all.equal,connection)
-#' }
-if (packageVersion("parallelly") <= "1.43.0") {
-  all.equal.connection <- function(target, current, ...) {
-    if (!identical(target, current)) {
-      return("Connections differ")
-    }
-    TRUE
-  }
-}
-
-
 ## This is needed in order to be able to assert that we later
 ## actually work with the same connection.  See R-devel thread
 ## 'closeAllConnections() can really mess things up' on 2016-10-30