diff redelacSticsSimulator.R @ 10:65c00476f417 draft default tip

"planemo upload for repository https://forgemia.inra.fr/redelac/redelac-toolbox/-/tree/4a2264991516b494ed11d1a7d5260ba543696a04/tools/REDELACSticsSimulator commit 4a2264991516b494ed11d1a7d5260ba543696a04-dirty"
author siwaa
date Fri, 27 Oct 2023 09:15:25 +0000
parents 2586f7dbcde1
children
line wrap: on
line diff
--- a/redelacSticsSimulator.R	Tue Oct 17 11:21:34 2023 +0000
+++ b/redelacSticsSimulator.R	Fri Oct 27 09:15:25 2023 +0000
@@ -9,6 +9,7 @@
 library(dplyr)
 library(stringr)
 library(readr)
+library(doFuture)
 
 sessionInfo()
 
@@ -50,11 +51,9 @@
 rotation <- successRef$rotation[1]
 
 if (parallel) {
-  cl <- makeCluster(nbSlots)
-  print("Inside R, info on the cluster:")
-  print(cl)
-  registerDoParallel(cl)
-  `%dordopar%` <- `%dopar%`
+  doFuture::registerDoFuture()
+  future::plan(multisession, workers = nbSlots)
+  `%dordopar%` <- `%dofuture%`
 } else {
   `%dordopar%` <- `%do%`
 }
@@ -75,10 +74,9 @@
 result <- foreach(j = 1:length(casesUpcSol)) %:%
   foreach(
     i = 1:nrow(successive_usms_tab_split[[j]]),
-    .packages = c("foreach", "SticsRFiles", "SticsOnR")
+    .options.future = list(packages =c("foreach", "SticsRFiles", "SticsOnR"))
+
   ) %dordopar% {
-    if (parallel)
-      sink("./logPaRedelac.txt", append = TRUE)
 
     nusms <- as.numeric(successive_usms_tab_split[[j]][i, 2])
 
@@ -97,18 +95,12 @@
 
     list_usms <- vec
 
-    cat(paste0("-->", successive_usms_tab_split[[j]][i, 1], "launched\n"))
+    cat(paste0("--> succession : ", successive_usms_tab_split[[j]][i, 1], " launched\n"))
 
     return(stics_wrapper(model_options = sim_options, situation = list_usms))
 
   }
 
-if (parallel) {
-  stopCluster(cl)
-  sink()
-  cat(read_file("./logPaRedelac.txt"))
-}
-
 for (j in  1:length(casesUpcSol)) {
   splited <- strsplit(casesUpcSol[j], split = "-")[[1]]