Merge pull request #600 from Zentrik/master

Improve Performance for OptimizationBBO
SciML · Oct 1, 2023 · 7acb4d5 · 7acb4d5
2 parents 5a4517d + 87f72a9
commit 7acb4d5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/lib/OptimizationBBO/src/OptimizationBBO.jl b/lib/OptimizationBBO/src/OptimizationBBO.jl
@@ -112,7 +112,7 @@ function SciMLBase.__solve(cache::Optimization.OptimizationCache{
     cur, state = iterate(cache.data)
 
     function _cb(trace)
-        if isnothing(cache.callback)
+        if cache.callback === Optimization.DEFAULT_CALLBACK
             cb_call = false
         else
             cb_call = cache.callback(decompose_trace(trace, cache.progress), x...)
@@ -125,7 +125,7 @@ function SciMLBase.__solve(cache::Optimization.OptimizationCache{
             BlackBoxOptim.shutdown_optimizer!(trace) #doesn't work
         end
 
-        if !isnothing(cache.data)
+        if cache.data !== Optimization.DEFAULT_DATA
             cur, state = iterate(cache.data, state)
         end
         cb_call
@@ -135,11 +135,11 @@ function SciMLBase.__solve(cache::Optimization.OptimizationCache{
     maxtime = Optimization._check_and_convert_maxtime(cache.solver_args.maxtime)
 
     _loss = function (θ)
-        if isnothing(cache.callback) && isnothing(cache.data)
+        if cache.callback === Optimization.DEFAULT_CALLBACK && cache.data === Optimization.DEFAULT_DATA
             return first(cache.f(θ, cache.p))
-        elseif isnothing(cache.callback)
+        elseif cache.callback === Optimization.DEFAULT_CALLBACK
             return first(cache.f(θ, cache.p, cur...))
-        elseif isnothing(cache.data)
+        elseif cache.data !== Optimization.DEFAULT_DATA
             x = cache.f(θ, cache.p)
             return first(x)
         else
@@ -149,8 +149,8 @@ function SciMLBase.__solve(cache::Optimization.OptimizationCache{
     end
 
     opt_args = __map_optimizer_args(cache, cache.opt;
-        callback = isnothing(cache.callback) &&
-                   isnothing(cache.data) ?
+        callback = cache.callback === Optimization.DEFAULT_CALLBACK &&
+                   cache.data === Optimization.DEFAULT_DATA ?
                    nothing : _cb,
         cache.solver_args...,
         maxiters = maxiters,

diff --git a/lib/OptimizationBBO/test/runtests.jl b/lib/OptimizationBBO/test/runtests.jl
@@ -13,6 +13,8 @@ using Test
     sol = solve(prob, BBO_adaptive_de_rand_1_bin_radiuslimited())
     @test 10 * sol.objective < l1
 
+    @test (@allocated solve(prob, BBO_adaptive_de_rand_1_bin_radiuslimited())) < 1e7
+
     prob = Optimization.OptimizationProblem(optprob, nothing, _p, lb = [-1.0, -1.0],
         ub = [0.8, 0.8])
     sol = solve(prob, BBO_adaptive_de_rand_1_bin_radiuslimited())

diff --git a/lib/OptimizationOptimisers/src/sophia.jl b/lib/OptimizationOptimisers/src/sophia.jl
@@ -71,11 +71,11 @@ function SciMLBase.__solve(cache::OptimizationCache{
     maxiters = Optimization._check_and_convert_maxiters(maxiters)
 
     _loss = function (θ)
-        if isnothing(cache.callback) && isnothing(data)
+        if cache.callback === Optimization.DEFAULT_CALLBACK && data === Optimization.DEFAULT_DATA
             return first(cache.f(θ, cache.p))
-        elseif isnothing(cache.callback)
+        elseif cache.callback === Optimization.DEFAULT_CALLBACK
             return first(cache.f(θ, cache.p, cur...))
-        elseif isnothing(data)
+        elseif data === Optimization.DEFAULT_DATA
             x = cache.f(θ, cache.p)
             return first(x)
         else

diff --git a/src/cache.jl b/src/cache.jl
@@ -1,6 +1,6 @@
 
 function Base.getproperty(cache::SciMLBase.AbstractOptimizationCache, x::Symbol)
-    if x in fieldnames(Optimization.ReInitCache)
+    if x in (:u0, :p)
         return getfield(cache.reinit_cache, x)
     end
     return getfield(cache, x)
@@ -52,7 +52,7 @@ struct OptimizationCache{F, RC, LB, UB, LC, UC, S, O, D, P, C} <:
 end
 
 function OptimizationCache(prob::SciMLBase.OptimizationProblem, opt, data;
-    callback = (args...) -> (false),
+    callback = Optimization.DEFAULT_CALLBACK,
     maxiters::Union{Number, Nothing} = nothing,
     maxtime::Union{Number, Nothing} = nothing,
     abstol::Union{Number, Nothing} = nothing,
@@ -71,7 +71,7 @@ end
 
 function SciMLBase.__init(prob::SciMLBase.OptimizationProblem, opt,
     data = Optimization.DEFAULT_DATA;
-    callback = (args...) -> (false),
+    callback = Optimization.DEFAULT_CALLBACK,
     maxiters::Union{Number, Nothing} = nothing,
     maxtime::Union{Number, Nothing} = nothing,
     abstol::Union{Number, Nothing} = nothing,

diff --git a/src/utils.jl b/src/utils.jl
@@ -1,3 +1,7 @@
+struct NullCallback end
+(x::NullCallback)(args...) = false;
+const DEFAULT_CALLBACK = NullCallback()
+
 struct NullData end
 const DEFAULT_DATA = Iterators.cycle((NullData(),))
 Base.iterate(::NullData, i = 1) = nothing