refactor: remove rush backward compatibility (#328)

* refactor: remove rush backward compatibility

* ...

* ...

Author: be-marc

DESCRIPTION

@@ -45,7 +45,7 @@ Suggests:
     progressr,
     redux,
     RhpcBLASctl,
-    rush (>= 0.4.1),
+    rush (>= 1.0.0),
     testthat (>= 3.0.0)
 Config/testthat/edition: 3
 Config/testthat/parallel: false

NEWS.md

@@ -1,5 +1,6 @@
 # bbotk (development version)
 
+* Minimum required version of `rush` is now 1.0.0. Removed all compatibility workarounds for older versions.
 * feat: Add `mlr_test_functions` dictionary with well-known 2-D optimization test functions (Branin, Rosenbrock, Himmelblau, Rastrigin, etc.) and sugar functions `otfun()` / `otfuns()`.
 
 # bbotk 1.9.0

R/ArchiveAsync.R

@@ -45,7 +45,7 @@
 #' )
 #'
 #' # start workers
-#' rush::rush_plan(worker_type = "remote")
+#' rush::rush_plan(worker_type = "mirai")
 #' mirai::daemons(1)
 #'
 #' # initialize instance
@@ -134,7 +134,7 @@ ArchiveAsync = R6Class("ArchiveAsync",
     #' Named list of additional information.
     push_result = function(key, ys, x_domain, extra = NULL) {
       extra = c(list(x_domain = list(x_domain), timestamp_ys = Sys.time()), extra)
-      self$rush$push_results(key, list(ys), extra = list(extra))
+      self$rush$finish_tasks(key, list(ys), extra = list(extra))
     },
 
     #' @description
@@ -145,7 +145,7 @@ ArchiveAsync = R6Class("ArchiveAsync",
     #' @param message (`character()`)\cr
     #' Error message.
     push_failed_point = function(key, message) {
-      self$rush$push_failed(key, list(list(message = message)))
+      self$rush$fail_tasks(key, list(list(message = message)))
     },
 
     #' @description

R/ArchiveAsyncFrozen.R

@@ -44,7 +44,7 @@
 #' )
 #'
 #' # start workers
-#' rush::rush_plan(worker_type = "remote")
+#' rush::rush_plan(worker_type = "mirai")
 #' mirai::daemons(1)
 #'
 #' # initialize instance

R/OptimInstanceAsyncMultiCrit.R

@@ -48,7 +48,7 @@
 #' )
 #'
 #' # start workers
-#' rush::rush_plan(worker_type = "remote")
+#' rush::rush_plan(worker_type = "mirai")
 #' mirai::daemons(1)
 #'
 #' # initialize instance

R/OptimInstanceAsyncSingleCrit.R

@@ -44,7 +44,7 @@
 #' )
 #'
 #' # start workers
-#' rush::rush_plan(worker_type = "remote")
+#' rush::rush_plan(worker_type = "mirai")
 #' mirai::daemons(1)
 #'
 #' # initialize instance

R/OptimizerAsync.R

@@ -19,11 +19,12 @@
 #' The [rush::rush_plan()] function defines the number of workers and their type.
 #' There are three types of workers:
 #'
-#' - "local": Workers are started as local processes with \CRANpkg{processx}.
-#'   See `$start_local_workers()` in [Rush] for more details.
-#' - "remote": Workers are started with \CRANpkg{mirai} on local or remote machines.
+#' - "mirai": Workers are started with \CRANpkg{mirai} on local or remote machines.
+#'   See `$start_workers()` in [Rush] for more details.
 #'   [mirai::daemons()] must be created before starting the optimization.
-#'   See `$start_remote_workers()` in [Rush] for more details.
+#' - "processx": Workers are started as local processes with \CRANpkg{processx}.
+
+#'   See `$start_local_workers()` in [Rush] for more details.
 #' - "script": Workers are started by the user with a custom script.
 #'   See `$create_worker_script()` in [Rush] for more details.
 #'
@@ -111,8 +112,7 @@ optimize_async_default = function(instance, optimizer, design = NULL, n_workers
   } else {
     # run .optimize() on workers
     rush = instance$rush
-    # FIXME: change to "mirai" after rush 1.0.0 is released
-    worker_type = rush::rush_config()$worker_type %??% "remote"
+    worker_type = rush::rush_config()$worker_type %??% "mirai"
 
     if (worker_type == "script") {
       # worker script
@@ -123,18 +123,18 @@ optimize_async_default = function(instance, optimizer, design = NULL, n_workers
         instance = instance)
 
       rush$wait_for_workers(n = 1)
-    } else if (worker_type %in% c("remote", "mirai")) { # FIXME: change to "mirai" after rush 1.0.0 is released
-      # remote workers
-      worker_ids = rush$start_remote_workers(
+    } else if (worker_type == "mirai") {
+      # mirai workers
+      worker_ids = rush$start_workers(
         n_workers = n_workers,
         worker_loop = bbotk_worker_loop,
         packages = c(optimizer$packages, instance$objective$packages, "bbotk"),
         optimizer = optimizer,
         instance = instance)
 
       rush$wait_for_workers(n = 1, worker_ids)
-    } else if (worker_type %in% c("local", "processx")) { # FIXME: change to "processx" after rush 1.0.0 is released
-      # local workers
+    } else if (worker_type == "processx") {
+      # processx workers
       worker_ids = rush$start_local_workers(
         n_workers = n_workers,
         worker_loop = bbotk_worker_loop,
@@ -191,7 +191,7 @@ optimize_async_default = function(instance, optimizer, design = NULL, n_workers
   # move queued and running tasks to failed
   failed_tasks = unlist(rush$tasks_with_state(states = c("queued", "running")))
   if (length(failed_tasks)) {
-    rush$push_failed(failed_tasks, conditions = replicate(length(failed_tasks), list(message = "Optimization terminated"), simplify = FALSE))
+    rush$fail_tasks(failed_tasks, conditions = replicate(length(failed_tasks), list(message = "Optimization terminated"), simplify = FALSE))
   }
 
   if (!instance$archive$n_finished) {

R/OptimizerAsyncDesignPoints.R

@@ -46,7 +46,7 @@
 #' )
 #'
 #' # start workers
-#' rush::rush_plan(worker_type = "remote")
+#' rush::rush_plan(worker_type = "mirai")
 #' mirai::daemons(1)
 #'
 #' # initialize instance

R/OptimizerAsyncGridSearch.R

@@ -51,7 +51,7 @@
 #' )
 #'
 #' # start workers
-#' rush::rush_plan(worker_type = "remote")
+#' rush::rush_plan(worker_type = "mirai")
 #' mirai::daemons(1)
 #'
 #' # initialize instance

R/OptimizerAsyncRandomSearch.R

@@ -42,7 +42,7 @@
 #' )
 #'
 #' # start workers
-#' rush::rush_plan(worker_type = "remote")
+#' rush::rush_plan(worker_type = "mirai")
 #' mirai::daemons(1)
 #'
 #' # initialize instance