Skip to content

Commit 51f97d2

Browse files
SebastianM-CSebastianM-C
committed
fix method overwriting during precompilation
1 parent d32d3f9 commit 51f97d2

File tree

20 files changed

+41
-152
lines changed

20 files changed

+41
-152
lines changed

‎lib/OptimizationAuglag/src/OptimizationAuglag.jl‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@ using LinearAlgebra: norm
1616
ϵ = 1e-8
1717
end
1818

19-
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
20-
SciMLBase.supports_opt_cache_interface(::AugLag) = true
21-
end
22-
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
23-
OptimizationBase.supports_opt_cache_interface(::AugLag) = true
24-
end
19+
OptimizationBase.supports_opt_cache_interface(::AugLag) = true
2520
SciMLBase.allowsbounds(::AugLag) = true
2621
SciMLBase.requiresgradient(::AugLag) = true
2722
SciMLBase.allowsconstraints(::AugLag) = true

‎lib/OptimizationBBO/src/OptimizationBBO.jl‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,7 @@ abstract type BBO end
1010

1111
SciMLBase.requiresbounds(::BBO) = true
1212
SciMLBase.allowsbounds(::BBO) = true
13-
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
14-
SciMLBase.supports_opt_cache_interface(opt::BBO) = true
15-
end
16-
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
17-
OptimizationBase.supports_opt_cache_interface(opt::BBO) = true
18-
end
13+
OptimizationBase.supports_opt_cache_interface(opt::BBO) = true
1914

2015
for j in string.(BlackBoxOptim.SingleObjectiveMethodNames)
2116
eval(Meta.parse("Base.@kwdef struct BBO_" * j * " <: BBO method=:" * j * " end"))

‎lib/OptimizationCMAEvolutionStrategy/src/OptimizationCMAEvolutionStrategy.jl‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,7 @@ export CMAEvolutionStrategyOpt
1010
struct CMAEvolutionStrategyOpt end
1111

1212
SciMLBase.allowsbounds(::CMAEvolutionStrategyOpt) = true
13-
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
14-
SciMLBase.supports_opt_cache_interface(opt::CMAEvolutionStrategyOpt) = true
15-
end
16-
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
17-
OptimizationBase.supports_opt_cache_interface(opt::CMAEvolutionStrategyOpt) = true
18-
end
13+
OptimizationBase.supports_opt_cache_interface(opt::CMAEvolutionStrategyOpt) = true
1914
SciMLBase.requiresgradient(::CMAEvolutionStrategyOpt) = false
2015
SciMLBase.requireshessian(::CMAEvolutionStrategyOpt) = false
2116
SciMLBase.requiresconsjac(::CMAEvolutionStrategyOpt) = false

‎lib/OptimizationEvolutionary/src/OptimizationEvolutionary.jl‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ using SciMLBase
66

77
SciMLBase.allowsbounds(opt::Evolutionary.AbstractOptimizer) = true
88
SciMLBase.allowsconstraints(opt::Evolutionary.AbstractOptimizer) = true
9-
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
10-
SciMLBase.supports_opt_cache_interface(opt::Evolutionary.AbstractOptimizer) = true
11-
end
12-
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
13-
OptimizationBase.supports_opt_cache_interface(opt::Evolutionary.AbstractOptimizer) = true
14-
end
9+
OptimizationBase.supports_opt_cache_interface(opt::Evolutionary.AbstractOptimizer) = true
1510
SciMLBase.requiresgradient(opt::Evolutionary.AbstractOptimizer) = false
1611
SciMLBase.requiresgradient(opt::Evolutionary.NSGA2) = false
1712
SciMLBase.requireshessian(opt::Evolutionary.AbstractOptimizer) = false

‎lib/OptimizationGCMAES/src/OptimizationGCMAES.jl‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@ struct GCMAESOpt end
1111
SciMLBase.requiresbounds(::GCMAESOpt) = true
1212
SciMLBase.allowsbounds(::GCMAESOpt) = true
1313
SciMLBase.allowscallback(::GCMAESOpt) = false
14-
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
15-
SciMLBase.supports_opt_cache_interface(opt::GCMAESOpt) = true
16-
end
17-
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
18-
OptimizationBase.supports_opt_cache_interface(opt::GCMAESOpt) = true
19-
end
14+
OptimizationBase.supports_opt_cache_interface(opt::GCMAESOpt) = true
2015
SciMLBase.requiresgradient(::GCMAESOpt) = true
2116
SciMLBase.requireshessian(::GCMAESOpt) = false
2217
SciMLBase.requiresconsjac(::GCMAESOpt) = false

‎lib/OptimizationIpopt/src/OptimizationIpopt.jl‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,15 +166,8 @@ https://coin-or.github.io/Ipopt/OPTIONS.html
166166
additional_options::Dict{String, Any} = Dict{String, Any}()
167167
end
168168

169-
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
170-
function SciMLBase.supports_opt_cache_interface(alg::IpoptOptimizer)
171-
true
172-
end
173-
end
174-
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
175-
function OptimizationBase.supports_opt_cache_interface(alg::IpoptOptimizer)
176-
true
177-
end
169+
function OptimizationBase.supports_opt_cache_interface(alg::IpoptOptimizer)
170+
true
178171
end
179172

180173
function SciMLBase.requiresgradient(opt::IpoptOptimizer)

‎lib/OptimizationLBFGSB/src/OptimizationLBFGSB.jl‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@ References
3131
ϵ = 1e-8
3232
end
3333

34-
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
35-
SciMLBase.supports_opt_cache_interface(::LBFGSB) = true
36-
end
37-
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
38-
OptimizationBase.supports_opt_cache_interface(::LBFGSB) = true
39-
end
34+
OptimizationBase.supports_opt_cache_interface(::LBFGSB) = true
4035
SciMLBase.allowsbounds(::LBFGSB) = true
4136
SciMLBase.requiresgradient(::LBFGSB) = true
4237
SciMLBase.allowsconstraints(::LBFGSB) = true

‎lib/OptimizationMOI/src/OptimizationMOI.jl‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -283,17 +283,9 @@ end
283283
include("nlp.jl")
284284
include("moi.jl")
285285

286-
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
287-
function SciMLBase.supports_opt_cache_interface(alg::Union{MOI.AbstractOptimizer,
288-
MOI.OptimizerWithAttributes})
289-
true
290-
end
291-
end
292-
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
293-
function OptimizationBase.supports_opt_cache_interface(alg::Union{MOI.AbstractOptimizer,
294-
MOI.OptimizerWithAttributes})
295-
true
296-
end
286+
function OptimizationBase.supports_opt_cache_interface(alg::Union{MOI.AbstractOptimizer,
287+
MOI.OptimizerWithAttributes})
288+
true
297289
end
298290

299291
function SciMLBase.__init(prob::OptimizationProblem,

‎lib/OptimizationManopt/src/OptimizationManopt.jl‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@ internal state.
1212
"""
1313
abstract type AbstractManoptOptimizer end
1414

15-
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
16-
SciMLBase.supports_opt_cache_interface(opt::AbstractManoptOptimizer) = true
17-
end
18-
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
19-
OptimizationBase.supports_opt_cache_interface(opt::AbstractManoptOptimizer) = true
20-
end
15+
OptimizationBase.supports_opt_cache_interface(opt::AbstractManoptOptimizer) = true
2116

2217
function __map_optimizer_args!(cache::OptimizationBase.OptimizationCache,
2318
opt::AbstractManoptOptimizer;

‎lib/OptimizationMetaheuristics/src/OptimizationMetaheuristics.jl‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ using SciMLBase
77
SciMLBase.requiresbounds(opt::Metaheuristics.AbstractAlgorithm) = true
88
SciMLBase.allowsbounds(opt::Metaheuristics.AbstractAlgorithm) = true
99
SciMLBase.allowscallback(opt::Metaheuristics.AbstractAlgorithm) = false
10-
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
11-
SciMLBase.supports_opt_cache_interface(opt::Metaheuristics.AbstractAlgorithm) = true
12-
end
13-
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
14-
OptimizationBase.supports_opt_cache_interface(opt::Metaheuristics.AbstractAlgorithm) = true
15-
end
10+
OptimizationBase.supports_opt_cache_interface(opt::Metaheuristics.AbstractAlgorithm) = true
1611

1712
function initial_population!(opt, cache, bounds, f)
1813
opt_init = deepcopy(opt)

0 commit comments

Comments
 (0)