bump scimlbase and fix Optimisers err

SciML · Jan 5, 2024 · c0e59f6 · c0e59f6
1 parent 08b130e
commit c0e59f6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/Project.toml b/Project.toml
@@ -57,7 +57,7 @@ Printf = "1.9"
 ProgressLogging = "0.1"
 Reexport = "1.2"
 ReverseDiff = "1.14"
-SciMLBase = "2.16.2"
+SciMLBase = "2.16.3"
 SparseArrays = "1.9, 1.10"
 SparseDiffTools = "2.14"
 SymbolicIndexingInterface = "0.3"

diff --git a/lib/OptimizationFlux/src/OptimizationFlux.jl b/lib/OptimizationFlux/src/OptimizationFlux.jl
@@ -102,8 +102,8 @@ function SciMLBase.__solve(cache::OptimizationCache{
     end
 
     t1 = time()
-    stats = Optimization.OptimizationStats(; iterations = i, 
-        time = t1 - t0, fevals = i, gevals = i)
+    stats = Optimization.OptimizationStats(; iterations = maxiters, 
+        time = t1 - t0, fevals = maxiters, gevals = maxiters)
     SciMLBase.build_solution(cache, opt, θ, x[1], stats = stats)
     # here should be build_solution to create the output message
 end

diff --git a/lib/OptimizationOptimisers/src/OptimizationOptimisers.jl b/lib/OptimizationOptimisers/src/OptimizationOptimisers.jl
@@ -41,12 +41,14 @@ function SciMLBase.__solve(cache::OptimizationCache{
         P,
         C,
 }
-    local i
     if cache.data != Optimization.DEFAULT_DATA
         maxiters = length(cache.data)
         data = cache.data
     else
         maxiters = Optimization._check_and_convert_maxiters(cache.solver_args.maxiters)
+        if maxiters === nothing
+            throw(ArgumentError("The number of iterations must be specified as the maxiters kwarg."))
+        end
         data = Optimization.take(cache.data, maxiters)
     end
     opt = cache.opt
@@ -96,8 +98,8 @@ function SciMLBase.__solve(cache::OptimizationCache{
     end
 
     t1 = time()
-    stats = Optimization.OptimizationStats(; iterations = i, 
-        time = t1 - t0, fevals = i, gevals = i)
+    stats = Optimization.OptimizationStats(; iterations = maxiters,
+        time = t1 - t0, fevals = maxiters, gevals = maxiters)
     SciMLBase.build_solution(cache, cache.opt, θ, first(x)[1], stats = stats)
     # here should be build_solution to create the output message
 end

diff --git a/lib/OptimizationOptimisers/test/runtests.jl b/lib/OptimizationOptimisers/test/runtests.jl
@@ -66,4 +66,6 @@ using Zygote
         end
         sol = solve(prob, Optimisers.Adam(0.1), maxiters = 1000, progress = false, callback = callback)
     end
+
+    @test_throws ArgumentError sol = solve(prob, Optimisers.Adam())
 end