remove data from all sub libs

SciML · Sep 10, 2024 · c4d9714 · c4d9714
1 parent 52b1f64
commit c4d9714
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 288 deletions.
diff --git a/docs/src/index.md b/docs/src/index.md
@@ -200,7 +200,6 @@ Pkg.status() # hide
 using InteractiveUtils # hide
 versioninfo() # hide
 ```
-
 ```@raw html
 </details>
 ```

diff --git a/lib/OptimizationBBO/src/OptimizationBBO.jl b/lib/OptimizationBBO/src/OptimizationBBO.jl
@@ -111,12 +111,6 @@ function SciMLBase.__solve(cache::Optimization.OptimizationCache{
 }
     local x, cur, state
 
-    if cache.data != Optimization.DEFAULT_DATA
-        maxiters = length(cache.data)
-    end
-
-    cur, state = iterate(cache.data)
-
     function _cb(trace)
         if cache.callback === Optimization.DEFAULT_CALLBACK
             cb_call = false
@@ -138,9 +132,6 @@ function SciMLBase.__solve(cache::Optimization.OptimizationCache{
             BlackBoxOptim.shutdown_optimizer!(trace) #doesn't work
         end
 
-        if cache.data !== Optimization.DEFAULT_DATA
-            cur, state = iterate(cache.data, state)
-        end
         cb_call
     end
 
@@ -149,37 +140,14 @@ function SciMLBase.__solve(cache::Optimization.OptimizationCache{
 
     _loss = function (θ)
         if isa(cache.f, MultiObjectiveOptimizationFunction)
-            if cache.callback === Optimization.DEFAULT_CALLBACK &&
-               cache.data === Optimization.DEFAULT_DATA
-                return cache.f(θ, cache.p)
-            elseif cache.callback === Optimization.DEFAULT_CALLBACK
-                return cache.f(θ, cache.p, cur...)
-            elseif cache.data !== Optimization.DEFAULT_DATA
-                x = cache.f(θ, cache.p)
-                return x
-            else
-                x = cache.f(θ, cache.p, cur...)
-                return first(x)
-            end
+            return cache.f(θ, cache.p)
         else
-            if cache.callback === Optimization.DEFAULT_CALLBACK &&
-               cache.data === Optimization.DEFAULT_DATA
-                return first(cache.f(θ, cache.p))
-            elseif cache.callback === Optimization.DEFAULT_CALLBACK
-                return first(cache.f(θ, cache.p, cur...))
-            elseif cache.data !== Optimization.DEFAULT_DATA
-                x = cache.f(θ, cache.p)
-                return first(x)
-            else
-                x = cache.f(θ, cache.p, cur...)
-                return first(x)
-            end
+            return first(cache.f(θ, cache.p))
         end
     end
 
     opt_args = __map_optimizer_args(cache, cache.opt;
-        callback = cache.callback === Optimization.DEFAULT_CALLBACK &&
-                   cache.data === Optimization.DEFAULT_DATA ?
+        callback = cache.callback === Optimization.DEFAULT_CALLBACK ?
                    nothing : _cb,
         cache.solver_args...,
         maxiters = maxiters,

diff --git a/lib/OptimizationCMAEvolutionStrategy/src/OptimizationCMAEvolutionStrategy.jl b/lib/OptimizationCMAEvolutionStrategy/src/OptimizationCMAEvolutionStrategy.jl
@@ -74,12 +74,6 @@ function SciMLBase.__solve(cache::OptimizationCache{
 }
     local x, cur, state
 
-    if cache.data != Optimization.DEFAULT_DATA
-        maxiters = length(cache.data)
-    end
-
-    cur, state = iterate(cache.data)
-
     function _cb(opt, y, fvals, perm)
         curr_u = opt.logger.xbest[end]
         opt_state = Optimization.OptimizationState(; iter = length(opt.logger.fmedian),
@@ -91,7 +85,6 @@ function SciMLBase.__solve(cache::OptimizationCache{
         if !(cb_call isa Bool)
             error("The callback should return a boolean `halt` for whether to stop the optimization process.")
         end
-        cur, state = iterate(cache.data, state)
         cb_call
     end
 

diff --git a/lib/OptimizationEvolutionary/src/OptimizationEvolutionary.jl b/lib/OptimizationEvolutionary/src/OptimizationEvolutionary.jl
@@ -99,12 +99,6 @@ function SciMLBase.__solve(cache::OptimizationCache{
 }
     local x, cur, state
 
-    if cache.data != Optimization.DEFAULT_DATA
-        maxiters = length(cache.data)
-    end
-
-    cur, state = iterate(cache.data)
-
     function _cb(trace)
         curr_u = decompose_trace(trace).metadata["curr_u"]
         opt_state = Optimization.OptimizationState(;
@@ -116,7 +110,6 @@ function SciMLBase.__solve(cache::OptimizationCache{
         if !(cb_call isa Bool)
             error("The callback should return a boolean `halt` for whether to stop the optimization process.")
         end
-        cur, state = iterate(cache.data, state)
         cb_call
     end
 
@@ -127,10 +120,10 @@ function SciMLBase.__solve(cache::OptimizationCache{
 
     _loss = function (θ)
         if isa(f, MultiObjectiveOptimizationFunction)
-            x = f(θ, cache.p, cur...)
+            x = f(θ, cache.p)
             return x
         else
-            x = f(θ, cache.p, cur...)
+            x = f(θ, cache.p)
             return first(x)
         end
     end

diff --git a/lib/OptimizationFlux/LICENSE b/lib/OptimizationFlux/LICENSE
diff --git a/lib/OptimizationFlux/Project.toml b/lib/OptimizationFlux/Project.toml
diff --git a/lib/OptimizationFlux/src/OptimizationFlux.jl b/lib/OptimizationFlux/src/OptimizationFlux.jl
diff --git a/lib/OptimizationFlux/test/runtests.jl b/lib/OptimizationFlux/test/runtests.jl
diff --git a/lib/OptimizationGCMAES/src/OptimizationGCMAES.jl b/lib/OptimizationGCMAES/src/OptimizationGCMAES.jl
@@ -48,11 +48,10 @@ function __map_optimizer_args(cache::OptimizationCache, opt::GCMAESOpt;
 end
 
 function SciMLBase.__init(prob::SciMLBase.OptimizationProblem,
-        opt::GCMAESOpt,
-        data = Optimization.DEFAULT_DATA; σ0 = 0.2,
+        opt::GCMAESOpt; σ0 = 0.2,
         callback = (args...) -> (false),
         progress = false, kwargs...)
-    return OptimizationCache(prob, opt, data; σ0 = σ0, callback = callback,
+    return OptimizationCache(prob, opt; σ0 = σ0, callback = callback,
         progress = progress,
         kwargs...)
 end

diff --git a/lib/OptimizationManopt/src/OptimizationManopt.jl b/lib/OptimizationManopt/src/OptimizationManopt.jl
@@ -403,14 +403,6 @@ function SciMLBase.__solve(cache::OptimizationCache{
         throw(ArgumentError("Manifold not specified in the problem for e.g. `OptimizationProblem(f, x, p; manifold = SymmetricPositiveDefinite(5))`."))
     end
 
-    if cache.data !== Optimization.DEFAULT_DATA
-        maxiters = length(cache.data)
-    else
-        maxiters = cache.solver_args.maxiters
-    end
-
-    cur, state = iterate(cache.data)
-
     function _cb(x, θ)
         opt_state = Optimization.OptimizationState(iter = 0,
             u = θ,
@@ -419,13 +411,7 @@ function SciMLBase.__solve(cache::OptimizationCache{
         if !(cb_call isa Bool)
             error("The callback should return a boolean `halt` for whether to stop the optimization process.")
         end
-        nx_itr = iterate(cache.data, state)
-        if isnothing(nx_itr)
-            true
-        else
-            cur, state = nx_itr
-            cb_call
-        end
+        cb_call
     end
     solver_kwarg = __map_optimizer_args!(cache, cache.opt, callback = _cb,
         maxiters = maxiters,

diff --git a/lib/OptimizationMetaheuristics/src/OptimizationMetaheuristics.jl b/lib/OptimizationMetaheuristics/src/OptimizationMetaheuristics.jl
@@ -66,11 +66,10 @@ function __map_optimizer_args!(cache::OptimizationCache,
 end
 
 function SciMLBase.__init(prob::SciMLBase.OptimizationProblem,
-        opt::Metaheuristics.AbstractAlgorithm,
-        data = Optimization.DEFAULT_DATA; use_initial = false,
+        opt::Metaheuristics.AbstractAlgorithm; use_initial = false,
         callback = (args...) -> (false),
         progress = false, kwargs...)
-    return OptimizationCache(prob, opt, data; use_initial = use_initial,
+    return OptimizationCache(prob, opt; use_initial = use_initial,
         callback = callback,
         progress = progress,
         kwargs...)