add explicit allowscallback everywhere

SebastianM-C · SebastianM-C · commit bfcebf1c84b0 · 2025-11-04T03:28:18.000+02:00
diff --git a/lib/OptimizationAuglag/src/OptimizationAuglag.jl b/lib/OptimizationAuglag/src/OptimizationAuglag.jl
@@ -17,6 +17,7 @@ using LinearAlgebra: norm
 end
 
 SciMLBase.has_init(::AugLag) = true
+SciMLBase.allowscallback(::AugLag) = true
 SciMLBase.allowsbounds(::AugLag) = true
 SciMLBase.requiresgradient(::AugLag) = true
 SciMLBase.allowsconstraints(::AugLag) = true
diff --git a/lib/OptimizationBBO/src/OptimizationBBO.jl b/lib/OptimizationBBO/src/OptimizationBBO.jl
@@ -9,7 +9,7 @@ abstract type BBO end
 
 SciMLBase.requiresbounds(::BBO) = true
 SciMLBase.allowsbounds(::BBO) = true
-
+SciMLBase.allowscallback(opt::BBO) = true
 SciMLBase.has_init(opt::BBO) = true
 
 for j in string.(BlackBoxOptim.SingleObjectiveMethodNames)
diff --git a/lib/OptimizationCMAEvolutionStrategy/src/OptimizationCMAEvolutionStrategy.jl b/lib/OptimizationCMAEvolutionStrategy/src/OptimizationCMAEvolutionStrategy.jl
@@ -9,6 +9,7 @@ export CMAEvolutionStrategyOpt
 
 struct CMAEvolutionStrategyOpt end
 
+SciMLBase.allowscallback(opt::CMAEvolutionStrategyOpt) = true
 SciMLBase.allowsbounds(::CMAEvolutionStrategyOpt) = true
 SciMLBase.has_init(opt::CMAEvolutionStrategyOpt) = true
 SciMLBase.requiresgradient(::CMAEvolutionStrategyOpt) = false
diff --git a/lib/OptimizationEvolutionary/src/OptimizationEvolutionary.jl b/lib/OptimizationEvolutionary/src/OptimizationEvolutionary.jl
@@ -4,6 +4,7 @@ using Reexport
 @reexport using Evolutionary, OptimizationBase
 using SciMLBase
 
+SciMLBase.allowscallback(opt::Evolutionary.AbstractOptimizer) = true
 SciMLBase.allowsbounds(opt::Evolutionary.AbstractOptimizer) = true
 SciMLBase.allowsconstraints(opt::Evolutionary.AbstractOptimizer) = true
 SciMLBase.has_init(opt::Evolutionary.AbstractOptimizer) = true
diff --git a/lib/OptimizationIpopt/src/OptimizationIpopt.jl b/lib/OptimizationIpopt/src/OptimizationIpopt.jl
@@ -170,6 +170,8 @@ function SciMLBase.has_init(alg::IpoptOptimizer)
     true
 end
 
+SciMLBase.allowscallback(alg::IpoptOptimizer) = true
+
 # Compatibility with OptimizationBase@v3
 function SciMLBase.supports_opt_cache_interface(alg::IpoptOptimizer)
     true
diff --git a/lib/OptimizationLBFGSB/src/OptimizationLBFGSB.jl b/lib/OptimizationLBFGSB/src/OptimizationLBFGSB.jl
@@ -31,6 +31,7 @@ References
     ϵ = 1e-8
 end
 
+SciMLBase.allowscallback(::LBFGSB) = true
 SciMLBase.has_init(::LBFGSB) = true
 SciMLBase.allowsbounds(::LBFGSB) = true
 SciMLBase.requiresgradient(::LBFGSB) = true
diff --git a/lib/OptimizationMOI/src/OptimizationMOI.jl b/lib/OptimizationMOI/src/OptimizationMOI.jl
@@ -288,6 +288,11 @@ function SciMLBase.has_init(alg::Union{MOI.AbstractOptimizer,
     true
 end
 
+function SciMLBase.allowscallback(alg::Union{MOI.AbstractOptimizer,
+        MOI.OptimizerWithAttributes})
+    true
+end
+
 # Compatibility with OptimizationBase@v3
 function SciMLBase.supports_opt_cache_interface(alg::Union{MOI.AbstractOptimizer,
         MOI.OptimizerWithAttributes})
diff --git a/lib/OptimizationMadNLP/src/OptimizationMadNLP.jl b/lib/OptimizationMadNLP/src/OptimizationMadNLP.jl
@@ -247,6 +247,8 @@ end
 
 SciMLBase.has_init(opt::MadNLPOptimizer) = true
 
+SciMLBase.allowscallback(opt::MadNLPOptimizer) = false
+
 function SciMLBase.requiresgradient(opt::MadNLPOptimizer)
     true
 end
diff --git a/lib/OptimizationManopt/src/OptimizationManopt.jl b/lib/OptimizationManopt/src/OptimizationManopt.jl
@@ -13,6 +13,7 @@ internal state.
 abstract type AbstractManoptOptimizer end
 
 SciMLBase.has_init(opt::AbstractManoptOptimizer) = true
+SciMLBase.allowscallback(opt::AbstractManoptOptimizer) = true
 
 function __map_optimizer_args!(cache::OptimizationBase.OptimizationCache,
         opt::AbstractManoptOptimizer;
diff --git a/lib/OptimizationNLopt/src/OptimizationNLopt.jl b/lib/OptimizationNLopt/src/OptimizationNLopt.jl
@@ -9,6 +9,7 @@ using OptimizationBase: deduce_retcode
 
 SciMLBase.allowsbounds(opt::Union{NLopt.Algorithm, NLopt.Opt}) = true
 SciMLBase.has_init(opt::Union{NLopt.Algorithm, NLopt.Opt}) = true
+SciMLBase.allowscallback(opt::Union{NLopt.Algorithm, NLopt.Opt}) = true
 
 function SciMLBase.requiresgradient(opt::Union{NLopt.Algorithm, NLopt.Opt})
     # https://github.com/JuliaOpt/NLopt.jl/blob/master/src/NLopt.jl#L18C7-L18C16
diff --git a/lib/OptimizationOptimJL/src/OptimizationOptimJL.jl b/lib/OptimizationOptimJL/src/OptimizationOptimJL.jl
@@ -16,6 +16,10 @@ SciMLBase.has_init(opt::Optim.AbstractOptimizer) = true
 SciMLBase.has_init(opt::Union{Optim.Fminbox, Optim.SAMIN}) = true
 SciMLBase.has_init(opt::Optim.ConstrainedOptimizer) = true
 
+SciMLBase.allowscallback(opt::Optim.AbstractOptimizer) = true
+SciMLBase.allowscallback(opt::Union{Optim.Fminbox, Optim.SAMIN}) = true
+SciMLBase.allowscallback(opt::Optim.ConstrainedOptimizer) = true
+
 function SciMLBase.requiresgradient(opt::Optim.AbstractOptimizer)
     !(opt isa Optim.ZerothOrderOptimizer)
 end
diff --git a/lib/OptimizationOptimisers/src/OptimizationOptimisers.jl b/lib/OptimizationOptimisers/src/OptimizationOptimisers.jl
@@ -7,6 +7,7 @@ using SciMLBase
 SciMLBase.has_init(opt::AbstractRule) = true
 SciMLBase.requiresgradient(opt::AbstractRule) = true
 SciMLBase.allowsfg(opt::AbstractRule) = true
+SciMLBase.allowscallback(opt::AbstractRule) = true
 
 function SciMLBase.__init(
         prob::SciMLBase.OptimizationProblem, opt::AbstractRule;
@@ -67,7 +68,6 @@ function SciMLBase.__solve(cache::OptimizationCache{O}) where {O <: AbstractRule
     breakall = false
     progress_id = :OptimizationOptimizersJL
     for epoch in 1:epochs, d in data
-
         if cache.f.fg !== nothing && dataiterate
             x = cache.f.fg(G, θ, d)
             iterations += 1
@@ -107,7 +107,7 @@ function SciMLBase.__solve(cache::OptimizationCache{O}) where {O <: AbstractRule
         if cache.progress
             message = "Loss: $(round(first(first(x)); digits = 3))"
             @logmsg(LogLevel(-1), "Optimization", _id=progress_id,
-                message=message, progress=iterations/maxiters)
+                message=message, progress=iterations / maxiters)
         end
         if cache.solver_args.save_best
             if first(x)[1] < first(min_err)[1]  #found a better solution
diff --git a/lib/OptimizationPRIMA/src/OptimizationPRIMA.jl b/lib/OptimizationPRIMA/src/OptimizationPRIMA.jl
@@ -14,6 +14,7 @@ struct COBYLA <: PRIMASolvers end
 export UOBYQA, NEWUOA, BOBYQA, LINCOA, COBYLA
 
 SciMLBase.has_init(::PRIMASolvers) = true
+SciMLBase.allowscallback(::PRIMASolvers) = true
 SciMLBase.allowsconstraints(::Union{LINCOA, COBYLA}) = true
 SciMLBase.allowsbounds(opt::Union{BOBYQA, LINCOA, COBYLA}) = true
 SciMLBase.requiresconstraints(opt::COBYLA) = true
diff --git a/lib/OptimizationPolyalgorithms/src/OptimizationPolyalgorithms.jl b/lib/OptimizationPolyalgorithms/src/OptimizationPolyalgorithms.jl
@@ -6,6 +6,7 @@ using SciMLBase, OptimizationOptimJL, OptimizationOptimisers
 
 struct PolyOpt end
 
+SciMLBase.allowscallback(::PolyOpt) = SciMLBase.allowscallback(Optimisers.Adam) && SciMLBase.allowscallback(OptimizationOptimJL.BFGS)
 SciMLBase.requiresgradient(opt::PolyOpt) = true
 
 function SciMLBase.__solve(prob::OptimizationProblem,
diff --git a/lib/OptimizationSciPy/src/OptimizationSciPy.jl b/lib/OptimizationSciPy/src/OptimizationSciPy.jl
@@ -216,17 +216,20 @@ for opt_type in [:ScipyMinimize, :ScipyDifferentialEvolution, :ScipyBasinhopping
     :ScipyLinprog, :ScipyMilp]
     @eval begin
         SciMLBase.allowsbounds(::$opt_type) = true
+        SciMLBase.allowscallback(::$opt_type) = true
         SciMLBase.has_init(::$opt_type) = true
     end
 end
 
 for opt_type in [:ScipyMinimizeScalar, :ScipyRootScalar, :ScipyLeastSquares]
     @eval begin
         SciMLBase.has_init(::$opt_type) = true
+        SciMLBase.allowscallback(::$opt_type) = true
     end
 end
 
 SciMLBase.has_init(::ScipyRoot) = true
+SciMLBase.allowscallback(::ScipyRoot) = true
 
 function SciMLBase.requiresgradient(opt::ScipyMinimize)
     gradient_free = ["Nelder-Mead", "Powell", "COBYLA", "COBYQA"]
diff --git a/lib/OptimizationSophia/src/OptimizationSophia.jl b/lib/OptimizationSophia/src/OptimizationSophia.jl
@@ -62,6 +62,7 @@ struct Sophia
 end
 
 SciMLBase.has_init(opt::Sophia) = true
+SciMLBase.allowscallback(opt::Sophia) = true
 SciMLBase.requiresgradient(opt::Sophia) = true
 SciMLBase.allowsfg(opt::Sophia) = true
 SciMLBase.requireshessian(opt::Sophia) = true
