comply with ode progress log

Author: prbzrg

Project.toml

@@ -12,7 +12,6 @@ Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 LoggingExtras = "e6f89c97-d47a-5376-807f-9c37f3926c36"
 OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-ProgressLogging = "33c8b6b6-d38a-422a-b730-caa89a2f386c"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
@@ -58,7 +57,6 @@ OptimizationOptimisers = "0.3"
 OrdinaryDiffEqTsit5 = "1"
 Pkg = "1"
 Printf = "1.10"
-ProgressLogging = "0.1"
 Random = "1.10"
 Reexport = "1.2"
 ReverseDiff = "1"
@@ -109,6 +107,6 @@ Mooncake = "da2b9cff-9c12-43a0-ae48-6db2b0edb7d6"
 
 [targets]
 test = ["Aqua", "BenchmarkTools", "Boltz", "ComponentArrays", "DiffEqFlux", "Enzyme", "FiniteDiff", "Flux", "ForwardDiff",
-    "Ipopt", "IterTools", "Lux", "MLUtils", "ModelingToolkit", "Optim", "OptimizationLBFGSB", "OptimizationMOI", "OptimizationOptimJL", "OptimizationOptimisers", 
+    "Ipopt", "IterTools", "Lux", "MLUtils", "ModelingToolkit", "Optim", "OptimizationLBFGSB", "OptimizationMOI", "OptimizationOptimJL", "OptimizationOptimisers",
     "OrdinaryDiffEqTsit5", "Pkg", "Random", "ReverseDiff", "SafeTestsets", "SciMLSensitivity", "SparseArrays",
     "Symbolics",  "Test", "Tracker", "Zygote", "Mooncake"]

lib/OptimizationOptimisers/Project.toml

@@ -4,7 +4,6 @@ authors = ["Vaibhav Dixit <[email protected]> and contributors"]
 version = "0.3.12"
 [deps]
 OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb"
-ProgressLogging = "33c8b6b6-d38a-422a-b730-caa89a2f386c"
 SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
@@ -24,7 +23,6 @@ Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 [compat]
 julia = "1.10"
 OptimizationBase = "3"
-ProgressLogging = "0.1"
 SciMLBase = "2.58"
 Optimisers = "0.2, 0.3, 0.4"
 Reexport = "1.2"

lib/OptimizationOptimisers/src/OptimizationOptimisers.jl

@@ -1,6 +1,6 @@
 module OptimizationOptimisers
 
-using Reexport, ProgressLogging, UUIDs
+using Reexport, UUIDs
 @reexport using Optimisers, OptimizationBase
 using SciMLBase
 
@@ -134,9 +134,9 @@ function SciMLBase.__solve(cache::OptimizationBase.OptimizationCache{
             break
         end
         cache.progress &&
-            @info ProgressLogging.Progress(progress_id, iterations / maxiters;
-                name = "loss: $(round(first(first(x)); digits=3))")
-
+            @logmsg(LogLevel(-1), "Optimization";
+                _id = progress_id, message = "Loss: $(round(first(first(x)); digits=3))",
+                progress = iterations / maxiters)
         if cache.solver_args.save_best
             if first(x)[1] < first(min_err)[1]  #found a better solution
                 min_opt = opt
@@ -160,8 +160,8 @@ function SciMLBase.__solve(cache::OptimizationBase.OptimizationCache{
         end
         state, θ = Optimisers.update(state, θ, G)
     end
-
-    cache.progress && @info ProgressLogging.Progress(progress_id; done = true)
+    cache.progress && @logmsg(LogLevel(-1), "Optimization";
+        _id = progress_id, message = "Done", progress = 1.0)
     t1 = time()
     stats = OptimizationBase.OptimizationStats(; iterations,
         time = t1 - t0, fevals, gevals)

src/Optimization.jl

@@ -11,7 +11,7 @@ if !isdefined(Base, :get_extension)
     using Requires
 end
 
-using Logging, ProgressLogging, ConsoleProgressMonitor, TerminalLoggers, LoggingExtras
+using Logging, ConsoleProgressMonitor, TerminalLoggers, LoggingExtras
 using ArrayInterface, Base.Iterators, SparseArrays, LinearAlgebra
 
 import OptimizationBase: instantiate_function, OptimizationCache, ReInitCache