Fix dependency structure of solvers to OptimizationBase

Author: ChrisRackauckas

lib/OptimizationAuglag/Project.toml

@@ -5,21 +5,21 @@ version = "0.1.0"
 
 [deps]
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
-MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54"
-Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
 OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb"
+MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54"
 OptimizationOptimisers = "42dfb2eb-d2b4-4451-abcd-913932933ac1"
+SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
 ForwardDiff = "1.0.1"
-MLUtils = "0.4.8"
-Optimization = "4.4.0"
 OptimizationBase = "2.10.0"
+MLUtils = "0.4.8"
 OptimizationOptimisers = "0.3.8"
 Test = "1.10.0"
+SciMLBase = "2.58"
 
 [targets]
 test = ["Test"]

lib/OptimizationAuglag/src/OptimizationAuglag.jl

@@ -1,7 +1,6 @@
 module OptimizationAuglag
 
-using Optimization
-using OptimizationBase.SciMLBase: OptimizationProblem, OptimizationFunction, OptimizationStats
+using SciMLBase: OptimizationProblem, OptimizationFunction, OptimizationStats
 using OptimizationBase.LinearAlgebra: norm
 
 @kwdef struct AugLag

lib/OptimizationBBO/Project.toml

@@ -5,17 +5,19 @@ version = "0.4.3"
 
 [deps]
 BlackBoxOptim = "a134a8b2-14d6-55f6-9291-3336d3ab0209"
-Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
+OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb"
+SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
 [compat]
+julia = "1.10"
 BlackBoxOptim = "0.6"
-Optimization = "4.4"
+OptimizationBase = "2.10"
+SciMLBase = "2.58"
 Reexport = "1.2"
-julia = "1.10"
-
-[extras]
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
 test = ["Test"]

lib/OptimizationBBO/src/OptimizationBBO.jl

@@ -1,10 +1,10 @@
 module OptimizationBBO
 
 using Reexport
-import Optimization
-import Optimization: OptimizationBase
-import BlackBoxOptim, Optimization.SciMLBase
-import Optimization.SciMLBase: MultiObjectiveOptimizationFunction
+import OptimizationBase
+import OptimizationBase: SciMLBase
+import BlackBoxOptim
+import SciMLBase: MultiObjectiveOptimizationFunction
 
 abstract type BBO end
 
@@ -48,7 +48,7 @@ function decompose_trace(opt::BlackBoxOptim.OptRunController, progress)
     return BlackBoxOptim.best_candidate(opt)
 end
 
-function __map_optimizer_args(prob::Optimization.OptimizationCache, opt::BBO;
+function __map_optimizer_args(prob::OptimizationBase.OptimizationCache, opt::BBO;
         callback = nothing,
         maxiters::Union{Number, Nothing} = nothing,
         maxtime::Union{Number, Nothing} = nothing,
@@ -96,7 +96,7 @@ function map_objective(obj::BlackBoxOptim.IndexedTupleFitness)
     obj.orig
 end
 
-function SciMLBase.__solve(cache::Optimization.OptimizationCache{
+function SciMLBase.__solve(cache::OptimizationBase.OptimizationCache{
         F,
         RC,
         LB,
@@ -123,13 +123,13 @@ function SciMLBase.__solve(cache::Optimization.OptimizationCache{
         C
 }
     function _cb(trace)
-        if cache.callback === Optimization.DEFAULT_CALLBACK
+        if cache.callback === OptimizationBase.DEFAULT_CALLBACK
             cb_call = false
         else
             n_steps = BlackBoxOptim.num_steps(trace)
             curr_u = decompose_trace(trace, cache.progress)
             objective = map_objective(BlackBoxOptim.best_fitness(trace))
-            opt_state = Optimization.OptimizationState(;
+            opt_state = OptimizationBase.OptimizationState(;
                 iter = n_steps,
                 u = curr_u,
                 p = cache.p,
@@ -148,15 +148,15 @@ function SciMLBase.__solve(cache::Optimization.OptimizationCache{
         cb_call
     end
 
-    maxiters = Optimization._check_and_convert_maxiters(cache.solver_args.maxiters)
-    maxtime = Optimization._check_and_convert_maxtime(cache.solver_args.maxtime)
+    maxiters = OptimizationBase._check_and_convert_maxiters(cache.solver_args.maxiters)
+    maxtime = OptimizationBase._check_and_convert_maxtime(cache.solver_args.maxtime)
 
     _loss = function (θ)
         cache.f(θ, cache.p)
     end
 
     opt_args = __map_optimizer_args(cache, cache.opt;
-        callback = cache.callback === Optimization.DEFAULT_CALLBACK ?
+        callback = cache.callback === OptimizationBase.DEFAULT_CALLBACK ?
                    nothing : _cb,
         cache.solver_args...,
         maxiters = maxiters,
@@ -176,8 +176,8 @@ function SciMLBase.__solve(cache::Optimization.OptimizationCache{
     end
 
     # Use the improved convert function
-    opt_ret = Optimization.deduce_retcode(opt_res.stop_reason)
-    stats = Optimization.OptimizationStats(;
+    opt_ret = OptimizationBase.deduce_retcode(opt_res.stop_reason)
+    stats = OptimizationBase.OptimizationStats(;
         iterations = opt_res.iterations,
         time = opt_res.elapsed_time,
         fevals = opt_res.f_calls)

lib/OptimizationBase/src/OptimizationBase.jl

@@ -28,6 +28,8 @@ include("OptimizationDIExt.jl")
 include("OptimizationDISparseExt.jl")
 include("function.jl")
 include("solve.jl")
+include("utils.jl")
+include("state.jl")
 
 export solve, OptimizationCache, DEFAULT_CALLBACK, DEFAULT_DATA,
        IncompatibleOptimizerError, OptimizerMissingError, _check_opt_alg,

src/state.jl renamed to lib/OptimizationBase/src/state.jl

@@ -5,17 +5,19 @@ version = "0.3.2"
 
 [deps]
 CMAEvolutionStrategy = "8d3b24bd-414e-49e0-94fb-163cc3a3e411"
-Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
+OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb"
+SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
 [compat]
-julia = "1.10"
 CMAEvolutionStrategy = "0.2"
-Optimization = "4.4"
+julia = "1.10"
+OptimizationBase = "2.10"
+SciMLBase = "2.58"
 Reexport = "1.2"
 
-[extras]
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-
 [targets]
 test = ["Test"]

src/utils.jl renamed to lib/OptimizationBase/src/utils.jl

@@ -1,8 +1,9 @@
 module OptimizationCMAEvolutionStrategy
 
 using Reexport
-@reexport using Optimization
-using CMAEvolutionStrategy, Optimization.SciMLBase
+@reexport using OptimizationBase
+using CMAEvolutionStrategy
+using OptimizationBase: SciMLBase
 
 export CMAEvolutionStrategyOpt
 
@@ -20,7 +21,7 @@ SciMLBase.requireshessian(::CMAEvolutionStrategyOpt) = false
 SciMLBase.requiresconsjac(::CMAEvolutionStrategyOpt) = false
 SciMLBase.requiresconshess(::CMAEvolutionStrategyOpt) = false
 
-function __map_optimizer_args(prob::OptimizationCache, opt::CMAEvolutionStrategyOpt;
+function __map_optimizer_args(prob::OptimizationBase.OptimizationCache, opt::CMAEvolutionStrategyOpt;
         callback = nothing,
         maxiters::Union{Number, Nothing} = nothing,
         maxtime::Union{Number, Nothing} = nothing,
@@ -52,7 +53,7 @@ function __map_optimizer_args(prob::OptimizationCache, opt::CMAEvolutionStrategy
     return mapped_args
 end
 
-function SciMLBase.__solve(cache::OptimizationCache{
+function SciMLBase.__solve(cache::OptimizationBase.OptimizationCache{
         F,
         RC,
         LB,
@@ -82,7 +83,7 @@ function SciMLBase.__solve(cache::OptimizationCache{
 
     function _cb(opt, y, fvals, perm)
         curr_u = xbest(opt)
-        opt_state = Optimization.OptimizationState(; iter = length(opt.logger.fmedian),
+        opt_state = OptimizationBase.OptimizationState(; iter = length(opt.logger.fmedian),
             u = curr_u,
             p = cache.p,
             objective = fbest(opt),
@@ -95,8 +96,8 @@ function SciMLBase.__solve(cache::OptimizationCache{
         cb_call
     end
 
-    maxiters = Optimization._check_and_convert_maxiters(cache.solver_args.maxiters)
-    maxtime = Optimization._check_and_convert_maxtime(cache.solver_args.maxtime)
+    maxiters = OptimizationBase._check_and_convert_maxiters(cache.solver_args.maxiters)
+    maxtime = OptimizationBase._check_and_convert_maxtime(cache.solver_args.maxtime)
 
     _loss = function (θ)
         x = cache.f(θ, cache.p)
@@ -112,7 +113,7 @@ function SciMLBase.__solve(cache::OptimizationCache{
     t1 = time()
 
     opt_ret = opt_res.stop.reason
-    stats = Optimization.OptimizationStats(;
+    stats = OptimizationBase.OptimizationStats(;
         iterations = length(opt_res.logger.fmedian),
         time = t1 - t0,
         fevals = length(opt_res.logger.fmedian))

lib/OptimizationCMAEvolutionStrategy/Project.toml

@@ -4,19 +4,21 @@ authors = ["Vaibhav Dixit <[email protected]> and contributors"]
 version = "0.4.2"
 
 [deps]
+OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb"
 Evolutionary = "86b6b26d-c046-49b6-aa0b-5f0f74682bd6"
-Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
+SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
 [compat]
 julia = "1.10"
+OptimizationBase = "2.10"
 Evolutionary = "0.11"
-Optimization = "4.4"
+SciMLBase = "2.58"
 Reexport = "1.2"
 
-[extras]
-Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-
 [targets]
 test = ["Random", "Test"]