explicitly export to global

philchalmers · Feb 6, 2025 · 93630b0 · 93630b0
1 parent 5190306
commit 93630b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/R/SimSolve.R b/R/SimSolve.R
@@ -605,14 +605,15 @@ SimSolve <- function(design, interval, b, generate, analyse, summarise,
             on.exit(parallel::stopCluster(cl), add = TRUE)
         }
     }
+    browser()
     export_funs <- parent_env_fun(control$global_fun_level)
     if(parallel){
         if(!useFuture && is.null(cl)){
             cl <- parallel::makeCluster(ncores, type=type)
             on.exit(parallel::stopCluster(cl), add = TRUE)
         }
         if(!useFuture){
-            parallel::clusterExport(cl=cl, export_funs, envir = parent.frame(1L))
+            parallel::clusterExport(cl=cl, export_funs)
             parallel::clusterExport(cl=cl, "ANALYSE_FUNCTIONS", envir = environment())
             if(verbose > 0 && verbose < 2)
                 message(sprintf("\nNumber of parallel clusters in use: %i", length(cl)))

diff --git a/R/runSimulation.R b/R/runSimulation.R
@@ -1295,10 +1295,10 @@ runSimulation <- function(design, replications, generate, analyse, summarise,
             on.exit(parallel::stopCluster(cl), add = TRUE)
         }
         if(!useFuture){
-            parallel::clusterExport(cl=cl, export_funs, envir = parent.frame(1L))
+            parallel::clusterExport(cl=cl, export_funs)
             parallel::clusterExport(cl=cl, "ANALYSE_FUNCTIONS", envir = environment())
             parallel::clusterExport(cl=cl, "TRY_ALL_ANALYSE", envir = environment())
-            if(verbose)
+            if(verbose > 0 && verbose < 2)
                 message(sprintf("\nNumber of parallel clusters in use: %i", length(cl)))
         }
     }