Only marshal on actual worker send

ropensci · Apr 13, 2024 · fd68951 · fd68951
1 parent 5b9dc78
commit fd68951
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/R/class_builder.R b/R/class_builder.R
@@ -65,7 +65,6 @@ target_prepare.tar_builder <- function(
   )
   builder_ensure_deps(target, pipeline, "main")
   builder_update_subpipeline(target, pipeline)
-  builder_marshal_subpipeline(target)
 }
 
 # nocov start
@@ -127,7 +126,6 @@ target_run.tar_builder <- function(target, envir, path_store) {
     target$subpipeline <- NULL
   })
   target_gc(target)
-  builder_unmarshal_subpipeline(target)
   builder_ensure_deps(target, target$subpipeline, "worker")
   frames <- frames_produce(envir, target, target$subpipeline)
   builder_set_tar_runtime(target, frames, path_store)
@@ -154,6 +152,7 @@ target_run_worker.tar_builder <- function(
   tar_runtime$fun <- fun
   tar_options$import(options)
   set_envvars(envvars)
+  builder_unmarshal_subpipeline(target)
   target_run(target, envir, path_store)
   builder_marshal_value(target)
   target

diff --git a/R/class_clustermq.R b/R/class_clustermq.R
@@ -161,6 +161,7 @@ clustermq_class <- R6::R6Class(
     run_target = function(name) {
       target <- pipeline_get_target(self$pipeline, name)
       target_prepare(target, self$pipeline, self$scheduler, self$meta)
+      builder_marshal_subpipeline(target)
       self$sync_meta_time()
       if_any(
         target_should_run_worker(target),

diff --git a/R/class_crew.R b/R/class_crew.R
@@ -160,6 +160,7 @@ crew_class <- R6::R6Class(
         meta = self$meta,
         pending = FALSE
       )
+      builder_marshal_subpipeline(target)
       self$sync_meta_time()
       self$controller$push(
         command = command,

diff --git a/R/class_future.R b/R/class_future.R
@@ -162,6 +162,7 @@ future_class <- R6::R6Class(
     run_target = function(name) {
       target <- pipeline_get_target(self$pipeline, name)
       target_prepare(target, self$pipeline, self$scheduler, self$meta)
+      builder_marshal_subpipeline(target)
       self$sync_meta_time()
       if_any(
         target_should_run_worker(target),