Update

odow · Jul 23, 2024 · 7fe9c72 · 7fe9c72
1 parent f466f91
commit 7fe9c72
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/algorithm.jl b/src/algorithm.jl
@@ -851,7 +851,7 @@ function iteration(model::PolicyGraph{T}, options::Options) where {T}
                 bound,
                 forward_trajectory.cumulative_value,
                 time() - options.start_time,
-                Distributed.myid(),
+                max(Threads.threadid(), Distributed.myid()),
                 model.ext[:total_solves],
                 duality_log_key(options.duality_handler),
                 model.ext[:numerical_issue],
@@ -863,7 +863,7 @@ function iteration(model::PolicyGraph{T}, options::Options) where {T}
     has_converged, status =
         convergence_test(model, options.log, options.stopping_rules)
     return IterationResult(
-        Distributed.myid(),
+        max(Threads.threadid(), Distributed.myid()),
         bound,
         forward_trajectory.cumulative_value,
         has_converged,

diff --git a/src/plugins/parallel_schemes.jl b/src/plugins/parallel_schemes.jl
@@ -350,6 +350,7 @@ function master_loop(
         lock(options.lock) do
             options.post_iteration_callback(result)
             log_iteration(options)
+            return
         end
         if result.has_converged
             return result.status
@@ -372,6 +373,7 @@ function _simulate(
         simulation = _simulate(model, variables; kwargs...)
         lock(ret_lock) do
             push!(ret, simulation)
+            return
         end
     end
     return ret