From c7bf4d89d5583fcccce3b0fa2fa5c54fc83e7ee0 Mon Sep 17 00:00:00 2001 From: Vaibhav Dixit Date: Wed, 3 Jul 2024 17:16:50 -0400 Subject: [PATCH 1/7] Bump OptimizationBase to 1.3.2 --- Project.toml | 2 +- lib/OptimizationManopt/Project.toml | 4 ++-- lib/OptimizationManopt/src/OptimizationManopt.jl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Project.toml b/Project.toml index a24893515..075de926e 100644 --- a/Project.toml +++ b/Project.toml @@ -29,7 +29,7 @@ LBFGSB = "0.4.1" LinearAlgebra = "1.10" Logging = "1.10" LoggingExtras = "0.4, 1" -OptimizationBase = "1" +OptimizationBase = "1.3.2" Pkg = "1" Printf = "1.10" ProgressLogging = "0.1" diff --git a/lib/OptimizationManopt/Project.toml b/lib/OptimizationManopt/Project.toml index b63ad4ac0..2f2f74416 100644 --- 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 "] -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.26.3" Reexport = "1.2" julia = "1.9" diff --git a/lib/OptimizationManopt/src/OptimizationManopt.jl b/lib/OptimizationManopt/src/OptimizationManopt.jl index d68792640..3f34b4f66 100644 --- 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) ? From b34f9ee15aa02cca3b46fb6bf669b0ea9a9957b5 Mon Sep 17 00:00:00 2001 From: Vaibhav Dixit Date: Wed, 3 Jul 2024 22:38:26 -0400 Subject: [PATCH 2/7] PRIMA optcache constructor update --- lib/OptimizationPRIMA/src/OptimizationPRIMA.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/OptimizationPRIMA/src/OptimizationPRIMA.jl b/lib/OptimizationPRIMA/src/OptimizationPRIMA.jl index 4bb4fbf03..6257b19c1 100644 --- a/lib/OptimizationPRIMA/src/OptimizationPRIMA.jl +++ b/lib/OptimizationPRIMA/src/OptimizationPRIMA.jl @@ -39,7 +39,7 @@ 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, nothing, merge((; maxiters, maxtime, abstol, reltol), NamedTuple(kwargs))) end From 0d7fcf84960f281e86ce670c6871f8734abc9910 Mon Sep 17 00:00:00 2001 From: Vaibhav Dixit Date: Wed, 3 Jul 2024 22:38:53 -0400 Subject: [PATCH 3/7] bump to 1.3.3 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 075de926e..b315bf242 100644 --- a/Project.toml +++ b/Project.toml @@ -29,7 +29,7 @@ LBFGSB = "0.4.1" LinearAlgebra = "1.10" Logging = "1.10" LoggingExtras = "0.4, 1" -OptimizationBase = "1.3.2" +OptimizationBase = "1.3.3" Pkg = "1" Printf = "1.10" ProgressLogging = "0.1" From 1fe300db7251636abfe32c015f1c35030e157733 Mon Sep 17 00:00:00 2001 From: Vaibhav Dixit Date: Thu, 4 Jul 2024 13:44:41 -0400 Subject: [PATCH 4/7] Optcache prima fix --- lib/OptimizationPRIMA/src/OptimizationPRIMA.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/OptimizationPRIMA/src/OptimizationPRIMA.jl b/lib/OptimizationPRIMA/src/OptimizationPRIMA.jl index 6257b19c1..13afb6557 100644 --- 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, nothing, nothing, + opt, data, progress, callback, nothing, + Optimization.OptimizationBase.AnalysisResults(nothing, nothing), merge((; maxiters, maxtime, abstol, reltol), NamedTuple(kwargs))) end From 6270644c92ec39c240f4fd916cde9e218b70e714 Mon Sep 17 00:00:00 2001 From: Vaibhav Dixit Date: Thu, 4 Jul 2024 16:10:27 -0400 Subject: [PATCH 5/7] bump versions and compats --- Project.toml | 2 +- lib/OptimizationManopt/Project.toml | 2 +- lib/OptimizationPRIMA/Project.toml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Project.toml b/Project.toml index b315bf242..6e14d3d7a 100644 --- 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" diff --git a/lib/OptimizationManopt/Project.toml b/lib/OptimizationManopt/Project.toml index 2f2f74416..b9f1151ab 100644 --- a/lib/OptimizationManopt/Project.toml +++ b/lib/OptimizationManopt/Project.toml @@ -18,7 +18,7 @@ ManifoldDiff = "0.3.10" Manifolds = "0.9.18" ManifoldsBase = "0.15.10" Manopt = "0.4.63" -Optimization = "3.26.3" +Optimization = "3.27" Reexport = "1.2" julia = "1.9" diff --git a/lib/OptimizationPRIMA/Project.toml b/lib/OptimizationPRIMA/Project.toml index c4dc02a06..2dfe8e01d 100644 --- 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 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" From e3912453f1288430b1027ba5e8c4961512e0e47a Mon Sep 17 00:00:00 2001 From: Vaibhav Dixit Date: Fri, 5 Jul 2024 22:42:36 -0400 Subject: [PATCH 6/7] rtol manopt test --- lib/OptimizationManopt/test/runtests.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/OptimizationManopt/test/runtests.jl b/lib/OptimizationManopt/test/runtests.jl index fac4e25ed..3a6687189 100644 --- 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 From 0794532ee5fe510503fac7b60f8b412b960fc2bf Mon Sep 17 00:00:00 2001 From: Vaibhav Dixit Date: Fri, 5 Jul 2024 23:06:36 -0400 Subject: [PATCH 7/7] docs compat --- docs/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Project.toml b/docs/Project.toml index d13f1e8c3..5af2678fe 100644 --- 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"