ensure the number of workers cannot be less than 1 in suitableParalle…

…lPlan()
jasenfinch · Apr 26, 2023 · dc2a04f · dc2a04f
1 parent e4376a5
commit dc2a04f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/R/parallel.R b/R/parallel.R
@@ -25,7 +25,7 @@ suitableParallelPlan <- function(strategy = NULL,workers = NULL,RAM_per_worker =
       as.numeric()
 
     suitable_workers <- floor(total_RAM / RAM_per_worker)
-    max_workers <- availableCores() * proportion_max_workers
+    max_workers <- ceiling(availableCores() * proportion_max_workers)
 
     if (suitable_workers > max_workers) {
       workers <- max_workers 
@@ -34,6 +34,10 @@ suitableParallelPlan <- function(strategy = NULL,workers = NULL,RAM_per_worker =
     }
   }
 
+  if (workers < 1){
+    workers <- 1
+  }
+
   plan(strategy,workers = workers)
 
   if (!is.character(strategy)) strategy <- class(strategy)[1]

diff --git a/tests/testthat/test-parallel.R b/tests/testthat/test-parallel.R
@@ -8,4 +8,8 @@ test_that("a suitable parallel plan generated when strategy specified as a funct
 
 test_that("a suitable parallel plan generated when suitable workers exceeds the maximum available", {
   expect_message(suitableParallelPlan(RAM_per_worker = 0.1))
+})
+
+test_that("a suitable parallel plan generated when the number of workers is less than 1", {
+  expect_message(suitableParallelPlan(workers = 0.1))
 })