Not in parallel when ncores is one.

pbastide · Feb 27, 2024 · b69f4e1 · b69f4e1
1 parent a837f8d
commit b69f4e1
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/R/phylogeneticCorrelations.R b/R/phylogeneticCorrelations.R
@@ -155,12 +155,17 @@ get_consensus_tree <- function(y_data, design, phy, model, measurement_error, we
   starting_values <- get_starting_values(alpha_bounds, ...)
   dots_args <- get_dots_args(...)
 
-  cl <- parallel::makeCluster(ncores) # , outfile = ""
-  doParallel::registerDoParallel(cl)
-  on.exit(parallel::stopCluster(cl))
+  if (ncores > 1) {
+    cl <- parallel::makeCluster(ncores) # , outfile = ""
+    doParallel::registerDoParallel(cl)
+    on.exit(parallel::stopCluster(cl))
+    `%myinfix%` <- `%dopar%`
+  } else {
+    `%myinfix%` <- `%do%`
+  }
   reqpckg <- c("phylolm")
 
-  all_fits <- foreach::foreach(i = 1:nrow(y_data), .packages = reqpckg) %dopar% {
+  all_fits <- foreach::foreach(i = 1:nrow(y_data), .packages = reqpckg) %myinfix% {
     y <- y_data[i, ]
     # w <- weights[i, ]