Mercurial > repos > siwaa > redelac_stics_g

diff redelacSticsInputGenerator.R @ 17:4d0807472ad3 draft default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"planemo upload for repository https://forgemia.inra.fr/redelac commit 9c5802d9b947f1e59bd5df610ebe5dfc89745be6"
author siwaa
date Tue, 23 Jan 2024 18:51:34 +0000
parents f2fe11a20371
children
line wrap: on
line diff
--- a/redelacSticsInputGenerator.R	Mon Jan 22 15:15:07 2024 +0000
+++ b/redelacSticsInputGenerator.R	Tue Jan 23 18:51:34 2024 +0000
@@ -78,8 +78,10 @@
 
 if (parallel) {
   doFuture::registerDoFuture()
-
-  future::plan(multicore, workers = nbSlots)
+  future::plan(multisession, workers = nbSlots)
+  `%dordopar%` <- `%dofuture%`
+} else {
+  `%dordopar%` <- `%do%`
 }
 
 beforeGenXmlTime <- Sys.time()
@@ -93,7 +95,7 @@
 ids <- seq(1, nbUSMs, chunckSize)
 
 foreach (i = ids,
-         .options.future = list(packages = c("foreach", "SticsRFiles"))) %dofuture% {
+         .options.future = list(packages = c("foreach", "SticsRFiles"))) %dordopar% {
            gen_usms_xml(file = file.path(workspace, paste0("usms__", i, ".xml")),
                         param_df = usms_param[i:min(i + chunckSize - 1, nbUSMs),])
          }
@@ -106,7 +108,7 @@
 beforeGenTxtTime <- Sys.time()
 
 foreach (i = ids,
-         .options.future = list(packages = c("foreach", "SticsRFiles"))) %dofuture% {
+         .options.future = list(packages = c("foreach", "SticsRFiles"))) %dordopar% {
            gen_usms_xml2txt(
              javastics = javastics_path,
              workspace = workspace,