Merge pull request #785 from SciML/optbase1.3

Bump OptimizationBase to 1.3.3
SciML · Jul 6, 2024 · 52c2812 · 52c2812
2 parents 38b2556 + 0794532
commit 52c2812
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "Optimization"
 uuid = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
-version = "3.26.3"
+version = "3.27.0"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
@@ -29,7 +29,7 @@ LBFGSB = "0.4.1"
 LinearAlgebra = "1.10"
 Logging = "1.10"
 LoggingExtras = "0.4, 1"
-OptimizationBase = "1"
+OptimizationBase = "1.3.3"
 Pkg = "1"
 Printf = "1.10"
 ProgressLogging = "0.1"

diff --git a/docs/Project.toml b/docs/Project.toml
@@ -60,7 +60,7 @@ OptimizationEvolutionary = "0.1, 0.2, 0.3"
 OptimizationFlux = "0.2.1"
 OptimizationGCMAES = "0.1, 0.2"
 OptimizationMOI = "0.1, 0.2, 0.3, 0.4"
-OptimizationManopt = "0.0.2"
+OptimizationManopt = "0.0.2, 0.0.3"
 OptimizationMetaheuristics = "0.1, 0.2"
 OptimizationMultistartOptimization = "0.1, 0.2"
 OptimizationNLopt = "0.1, 0.2"

diff --git a/lib/OptimizationManopt/Project.toml b/lib/OptimizationManopt/Project.toml
@@ -1,7 +1,7 @@
 name = "OptimizationManopt"
 uuid = "e57b7fff-7ee7-4550-b4f0-90e9476e9fb6"
 authors = ["Mateusz Baran <[email protected]>"]
-version = "0.0.2"
+version = "0.0.3"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -18,7 +18,7 @@ ManifoldDiff = "0.3.10"
 Manifolds = "0.9.18"
 ManifoldsBase = "0.15.10"
 Manopt = "0.4.63"
-Optimization = "3.25.1"
+Optimization = "3.27"
 Reexport = "1.2"
 julia = "1.9"
 

diff --git a/lib/OptimizationManopt/src/OptimizationManopt.jl b/lib/OptimizationManopt/src/OptimizationManopt.jl
@@ -393,7 +393,7 @@ function SciMLBase.__solve(cache::OptimizationCache{
 }
     local x, cur, state
 
-    manifold = haskey(cache.solver_args, :manifold) ? cache.solver_args[:manifold] : nothing
+    manifold = cache.manifold
     gradF = haskey(cache.solver_args, :riemannian_grad) ?
             cache.solver_args[:riemannian_grad] : nothing
     hessF = haskey(cache.solver_args, :riemannian_hess) ?

diff --git a/lib/OptimizationManopt/test/runtests.jl b/lib/OptimizationManopt/test/runtests.jl
@@ -215,7 +215,7 @@ end
     opt = OptimizationManopt.GradientDescentOptimizer()
     @time sol = Optimization.solve(prob, opt)
 
-    @test sol.u≈q atol=1e-2
+    @test sol.u≈q rtol=1e-2
 
     function closed_form_solution!(M::SymmetricPositiveDefinite, q, L, U, p, X)
         # extract p^1/2 and p^{-1/2}
@@ -243,5 +243,5 @@ end
     @time sol = Optimization.solve(
         prob, opt, sub_problem = (M, q, p, X) -> closed_form_solution!(M, q, L, U, p, X),
         maxiters = 1000)
-    @test sol.u≈q atol=1e-2
+    @test sol.u≈q rtol=1e-2
 end
diff --git a/lib/OptimizationPRIMA/Project.toml b/lib/OptimizationPRIMA/Project.toml
@@ -1,7 +1,7 @@
 name = "OptimizationPRIMA"
 uuid = "72f8369c-a2ea-4298-9126-56167ce9cbc2"
 authors = ["Vaibhav Dixit <[email protected]> and contributors"]
-version = "0.1.0"
+version = "0.2.0"
 
 [deps]
 Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
@@ -11,7 +11,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 
 [compat]
 julia = "1"
-Optimization = "3.21"
+Optimization = "3.27"
 PRIMA = "0.2.0"
 Reexport = "1"
 

diff --git a/lib/OptimizationPRIMA/src/OptimizationPRIMA.jl b/lib/OptimizationPRIMA/src/OptimizationPRIMA.jl
@@ -39,7 +39,8 @@ function Optimization.OptimizationCache(prob::SciMLBase.OptimizationProblem,
 
     return Optimization.OptimizationCache(f, reinit_cache, prob.lb, prob.ub, prob.lcons,
         prob.ucons, prob.sense,
-        opt, data, progress, callback,
+        opt, data, progress, callback, nothing,
+        Optimization.OptimizationBase.AnalysisResults(nothing, nothing),
         merge((; maxiters, maxtime, abstol, reltol),
             NamedTuple(kwargs)))
 end