Merge pull request #2032 from pepijndevos/pv/progress

log progress with configurable ID
SciML · Oct 6, 2023 · 4231f9c · 4231f9c
2 parents 8451c2e + 5a66c02
commit 4231f9c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/integrators/integrator_utils.jl b/src/integrators/integrator_utils.jl
@@ -152,7 +152,7 @@ function _postamble!(integrator)
     if integrator.opts.progress
         @logmsg(LogLevel(-1),
             integrator.opts.progress_name,
-            _id=:OrdinaryDiffEq,
+            _id=integrator.opts.progress_id,
             message=integrator.opts.progress_message(integrator.dt, integrator.u,
                 integrator.p, integrator.t),
             progress="done")
@@ -270,7 +270,7 @@ function _loopfooter!(integrator)
         t1, t2 = integrator.sol.prob.tspan
         @logmsg(LogLevel(-1),
             integrator.opts.progress_name,
-            _id=:OrdinaryDiffEq,
+            _id=integrator.opts.progress_id,
             message=integrator.opts.progress_message(integrator.dt, integrator.u,
                 integrator.p, integrator.t),
             progress=(integrator.t - t1) / (t2 - t1))

diff --git a/src/integrators/type.jl b/src/integrators/type.jl
@@ -30,6 +30,7 @@ mutable struct DEOptions{absType, relType, QT, tType, Controller, F1, F2, F3, F4
     progress_steps::Int
     progress_name::String
     progress_message::F6
+    progress_id::Symbol
     timeseries_errors::Bool
     dense_errors::Bool
     dense::Bool

diff --git a/src/solve.jl b/src/solve.jl
@@ -63,6 +63,7 @@ function DiffEqBase.__init(prob::Union{DiffEqBase.AbstractODEProblem,
     progress_steps = 1000,
     progress_name = "ODE",
     progress_message = ODE_DEFAULT_PROG_MESSAGE,
+    progress_id = gensym("OrdinaryDiffEq"),
     userdata = nothing,
     allow_extrapolation = alg_extrapolates(alg),
     initialize_integrator = true,
@@ -99,7 +100,7 @@ function DiffEqBase.__init(prob::Union{DiffEqBase.AbstractODEProblem,
         @warn("Dense output is incompatible with saveat. Please use the SavingCallback from the Callback Library to mix the two behaviors.")
     end
 
-    progress && @logmsg(LogLevel(-1), progress_name, _id=_id = :OrdinaryDiffEq, progress=0)
+    progress && @logmsg(LogLevel(-1), progress_name, _id=progress_id, progress=0)
 
     tType = eltype(prob.tspan)
     tspan = prob.tspan
@@ -380,6 +381,7 @@ function DiffEqBase.__init(prob::Union{DiffEqBase.AbstractODEProblem,
         progress_steps,
         progress_name,
         progress_message,
+        progress_id,
         timeseries_errors,
         dense_errors, dense,
         save_on, save_start,