only pass progress_id if needed

SciML · Nov 2, 2023 · 3ed4b27 · 3ed4b27
1 parent 8db1dfe
commit 3ed4b27
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/ensemble/basic_ensemble_solve.jl b/src/ensemble/basic_ensemble_solve.jl
@@ -185,11 +185,14 @@ function batch_func(i, prob, alg; kwargs...)
     new_prob = prob.prob_func(_prob, i, iter)
     rerun = true
 
-    name = get(kwargs, :progress_name, "Ensemble")
-    progress_name = "$name #$i"
-    progress_id = Symbol("SciMLBase_$i")
-
-    x = prob.output_func(solve(new_prob, alg; progress_name, progress_id, kwargs...), i)
+    progress = get(kwargs, :progress, false)
+    if progress
+        name = get(kwargs, :progress_name, "Ensemble")
+        progress_name = "$name #$i"
+        progress_id = Symbol("SciMLBase_$i")
+        kwargs = (kwargs..., progress_name=progress_name, progress_id=progress_id)
+    end
+    x = prob.output_func(solve(new_prob, alg; kwargs...), i)
     if !(typeof(x) <: Tuple)
         rerun_warn()
         _x = (x, false)
@@ -201,7 +204,7 @@ function batch_func(i, prob, alg; kwargs...)
         iter += 1
         _prob = prob.safetycopy ? deepcopy(prob.prob) : prob.prob
         new_prob = prob.prob_func(_prob, i, iter)
-        x = prob.output_func(solve(new_prob, alg; progress_name, progress_id, kwargs...), i)
+        x = prob.output_func(solve(new_prob, alg; kwargs...), i)
         if !(typeof(x) <: Tuple)
             rerun_warn()
             _x = (x, false)