Skip to content

Commit 3ab0cfe

Browse files
committed
replace supports_opt_cache_interface with has_init
1 parent 34ce708 commit 3ab0cfe

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

lib/OptimizationBase/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ModelingToolkit = "10.23"
5555
PDMats = "0.11"
5656
Reexport = "1.2"
5757
ReverseDiff = "1.14"
58-
SciMLBase = "2.104"
58+
SciMLBase = "2.122"
5959
SparseConnectivityTracer = "0.6, 1"
6060
SparseMatrixColorings = "0.4"
6161
SymbolicAnalysis = "0.3"

lib/OptimizationBase/src/OptimizationBase.jl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,10 @@ import SciMLBase: solve, init, solve!, __init, __solve,
1515
requireshessian, requiresconsjac,
1616
requiresconshess
1717

18-
supports_opt_cache_interface(alg) = false
19-
@static if !hasmethod(SciMLBase.__solve, Tuple{OptimizationProblem, SciMLBase.AbstractOptimizationAlgorithm})
20-
include("solve.jl")
21-
end
22-
2318
export ObjSense, MaxSense, MinSense
2419
export allowsbounds, requiresbounds, allowsconstraints, requiresconstraints,
2520
allowscallback, requiresgradient, requireshessian,
26-
requiresconsjac, requiresconshess, supports_opt_cache_interface
21+
requiresconsjac, requiresconshess
2722

2823
using FastClosures
2924

@@ -36,6 +31,7 @@ const DEFAULT_DATA = Iterators.cycle((NullData(),))
3631
Base.iterate(::NullData, i = 1) = nothing
3732
Base.length(::NullData) = 0
3833

34+
include("solve.jl")
3935
include("adtypes.jl")
4036
include("symify.jl")
4137
include("cache.jl")

lib/OptimizationBase/src/solve.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ from NLopt for an example. The common local optimizer arguments are:
9292
"""
9393
function solve(prob::SciMLBase.OptimizationProblem, alg, args...;
9494
kwargs...)::SciMLBase.AbstractOptimizationSolution
95-
if SciMLBase.supports_opt_cache_interface(alg)
95+
if SciMLBase.has_init(alg)
9696
solve!(init(prob, alg, args...; kwargs...))
9797
else
9898
if prob.u0 !== nothing && !isconcretetype(eltype(prob.u0))

0 commit comments

Comments
 (0)