Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Optimization"
uuid = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
version = "4.6.0"
version = "4.7.0"

[deps]
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
Expand Down
2 changes: 1 addition & 1 deletion lib/OptimizationBBO/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimizationBBO"
uuid = "3e6eede4-6085-4f62-9a71-46d9bc1eb92b"
authors = ["Vaibhav Dixit <[email protected]> and contributors"]
version = "0.4.1"
version = "0.4.2"

[deps]
BlackBoxOptim = "a134a8b2-14d6-55f6-9291-3336d3ab0209"
Expand Down
7 changes: 6 additions & 1 deletion lib/OptimizationBBO/src/OptimizationBBO.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ abstract type BBO end

SciMLBase.requiresbounds(::BBO) = true
SciMLBase.allowsbounds(::BBO) = true
SciMLBase.supports_opt_cache_interface(opt::BBO) = true
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
SciMLBase.supports_opt_cache_interface(opt::BBO) = true
end
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
OptimizationBase.supports_opt_cache_interface(opt::BBO) = true
end

for j in string.(BlackBoxOptim.SingleObjectiveMethodNames)
eval(Meta.parse("Base.@kwdef struct BBO_" * j * " <: BBO method=:" * j * " end"))
Expand Down
2 changes: 1 addition & 1 deletion lib/OptimizationCMAEvolutionStrategy/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimizationCMAEvolutionStrategy"
uuid = "bd407f91-200f-4536-9381-e4ba712f53f8"
authors = ["Vaibhav Dixit <[email protected]> and contributors"]
version = "0.3.1"
version = "0.3.2"

[deps]
CMAEvolutionStrategy = "8d3b24bd-414e-49e0-94fb-163cc3a3e411"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ export CMAEvolutionStrategyOpt
struct CMAEvolutionStrategyOpt end

SciMLBase.allowsbounds(::CMAEvolutionStrategyOpt) = true
SciMLBase.supports_opt_cache_interface(opt::CMAEvolutionStrategyOpt) = true
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
SciMLBase.supports_opt_cache_interface(opt::CMAEvolutionStrategyOpt) = true
end
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
OptimizationBase.supports_opt_cache_interface(opt::CMAEvolutionStrategyOpt) = true
end
SciMLBase.requiresgradient(::CMAEvolutionStrategyOpt) = false
SciMLBase.requireshessian(::CMAEvolutionStrategyOpt) = false
SciMLBase.requiresconsjac(::CMAEvolutionStrategyOpt) = false
Expand Down
2 changes: 1 addition & 1 deletion lib/OptimizationEvolutionary/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimizationEvolutionary"
uuid = "cb963754-43f6-435e-8d4b-99009ff27753"
authors = ["Vaibhav Dixit <[email protected]> and contributors"]
version = "0.4.1"
version = "0.4.2"

[deps]
Evolutionary = "86b6b26d-c046-49b6-aa0b-5f0f74682bd6"
Expand Down
7 changes: 6 additions & 1 deletion lib/OptimizationEvolutionary/src/OptimizationEvolutionary.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ using Optimization.SciMLBase

SciMLBase.allowsbounds(opt::Evolutionary.AbstractOptimizer) = true
SciMLBase.allowsconstraints(opt::Evolutionary.AbstractOptimizer) = true
SciMLBase.supports_opt_cache_interface(opt::Evolutionary.AbstractOptimizer) = true
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
SciMLBase.supports_opt_cache_interface(opt::Evolutionary.AbstractOptimizer) = true
end
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
OptimizationBase.supports_opt_cache_interface(opt::Evolutionary.AbstractOptimizer) = true
end
SciMLBase.requiresgradient(opt::Evolutionary.AbstractOptimizer) = false
SciMLBase.requiresgradient(opt::Evolutionary.NSGA2) = false
SciMLBase.requireshessian(opt::Evolutionary.AbstractOptimizer) = false
Expand Down
2 changes: 1 addition & 1 deletion lib/OptimizationGCMAES/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimizationGCMAES"
uuid = "6f0a0517-dbc2-4a7a-8a20-99ae7f27e911"
authors = ["Vaibhav Dixit <[email protected]> and contributors"]
version = "0.3.0"
version = "0.3.1"

[deps]
GCMAES = "4aa9d100-eb0f-11e8-15f1-25748831eb3b"
Expand Down
7 changes: 6 additions & 1 deletion lib/OptimizationGCMAES/src/OptimizationGCMAES.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ struct GCMAESOpt end
SciMLBase.requiresbounds(::GCMAESOpt) = true
SciMLBase.allowsbounds(::GCMAESOpt) = true
SciMLBase.allowscallback(::GCMAESOpt) = false
SciMLBase.supports_opt_cache_interface(opt::GCMAESOpt) = true
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
SciMLBase.supports_opt_cache_interface(opt::GCMAESOpt) = true
end
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
OptimizationBase.supports_opt_cache_interface(opt::GCMAESOpt) = true
end
SciMLBase.requiresgradient(::GCMAESOpt) = true
SciMLBase.requireshessian(::GCMAESOpt) = false
SciMLBase.requiresconsjac(::GCMAESOpt) = false
Expand Down
2 changes: 1 addition & 1 deletion lib/OptimizationIpopt/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimizationIpopt"
uuid = "43fad042-7963-4b32-ab19-e2a4f9a67124"
authors = ["Sebastian Micluța-Câmpeanu <[email protected]> and contributors"]
version = "0.1.1"
version = "0.1.2"

[deps]
Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
Expand Down
11 changes: 9 additions & 2 deletions lib/OptimizationIpopt/src/OptimizationIpopt.jl
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,15 @@ const DenseOrSparse{T} = Union{Matrix{T}, SparseMatrixCSC{T}}

struct IpoptOptimizer end

function SciMLBase.supports_opt_cache_interface(alg::IpoptOptimizer)
true
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
function SciMLBase.supports_opt_cache_interface(alg::IpoptOptimizer)
true
end
end
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
function OptimizationBase.supports_opt_cache_interface(alg::IpoptOptimizer)
true
end
end

function SciMLBase.requiresgradient(opt::IpoptOptimizer)
Expand Down
2 changes: 1 addition & 1 deletion lib/OptimizationMOI/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimizationMOI"
uuid = "fd9f6733-72f4-499f-8506-86b2bdd0dea1"
authors = ["Vaibhav Dixit <[email protected]> and contributors"]
version = "0.5.5"
version = "0.5.6"

[deps]
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Expand Down
14 changes: 11 additions & 3 deletions lib/OptimizationMOI/src/OptimizationMOI.jl
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,17 @@ end
include("nlp.jl")
include("moi.jl")

function SciMLBase.supports_opt_cache_interface(alg::Union{MOI.AbstractOptimizer,
MOI.OptimizerWithAttributes})
true
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
function SciMLBase.supports_opt_cache_interface(alg::Union{MOI.AbstractOptimizer,
MOI.OptimizerWithAttributes})
true
end
end
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
function OptimizationBase.supports_opt_cache_interface(alg::Union{MOI.AbstractOptimizer,
MOI.OptimizerWithAttributes})
true
end
end

function SciMLBase.__init(prob::OptimizationProblem,
Expand Down
2 changes: 1 addition & 1 deletion lib/OptimizationManopt/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimizationManopt"
uuid = "e57b7fff-7ee7-4550-b4f0-90e9476e9fb6"
authors = ["Mateusz Baran <[email protected]>"]
version = "0.0.4"
version = "0.0.5"

[deps]
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Expand Down
7 changes: 6 additions & 1 deletion lib/OptimizationManopt/src/OptimizationManopt.jl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ internal state.
"""
abstract type AbstractManoptOptimizer end

SciMLBase.supports_opt_cache_interface(opt::AbstractManoptOptimizer) = true
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
SciMLBase.supports_opt_cache_interface(opt::AbstractManoptOptimizer) = true
end
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
OptimizationBase.supports_opt_cache_interface(opt::AbstractManoptOptimizer) = true
end

function __map_optimizer_args!(cache::OptimizationCache,
opt::AbstractManoptOptimizer;
Expand Down
2 changes: 1 addition & 1 deletion lib/OptimizationMetaheuristics/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimizationMetaheuristics"
uuid = "3aafef2f-86ae-4776-b337-85a36adf0b55"
authors = ["Vaibhav Dixit <[email protected]> and contributors"]
version = "0.3.0"
version = "0.3.1"

[deps]
Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ using Optimization.SciMLBase
SciMLBase.requiresbounds(opt::Metaheuristics.AbstractAlgorithm) = true
SciMLBase.allowsbounds(opt::Metaheuristics.AbstractAlgorithm) = true
SciMLBase.allowscallback(opt::Metaheuristics.AbstractAlgorithm) = false
SciMLBase.supports_opt_cache_interface(opt::Metaheuristics.AbstractAlgorithm) = true
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
SciMLBase.supports_opt_cache_interface(opt::Metaheuristics.AbstractAlgorithm) = true
end
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
OptimizationBase.supports_opt_cache_interface(opt::Metaheuristics.AbstractAlgorithm) = true
end

function initial_population!(opt, cache, bounds, f)
opt_init = deepcopy(opt)
Expand Down
2 changes: 1 addition & 1 deletion lib/OptimizationMultistartOptimization/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimizationMultistartOptimization"
uuid = "e4316d97-8bbb-4fd3-a7d8-3851d2a72823"
authors = ["Vaibhav Dixit <[email protected]> and contributors"]
version = "0.3.0"
version = "0.3.1"

[deps]
Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ using Optimization.SciMLBase
SciMLBase.requiresbounds(opt::MultistartOptimization.TikTak) = true
SciMLBase.allowsbounds(opt::MultistartOptimization.TikTak) = true
SciMLBase.allowscallback(opt::MultistartOptimization.TikTak) = false
SciMLBase.supports_opt_cache_interface(opt::MultistartOptimization.TikTak) = true
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
SciMLBase.supports_opt_cache_interface(opt::MultistartOptimization.TikTak) = true
end
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
OptimizationBase.supports_opt_cache_interface(opt::MultistartOptimization.TikTak) = true
end

function SciMLBase.__init(prob::SciMLBase.OptimizationProblem,
opt::MultistartOptimization.TikTak,
Expand Down
2 changes: 1 addition & 1 deletion lib/OptimizationNLopt/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimizationNLopt"
uuid = "4e6fcdb7-1186-4e1f-a706-475e75c168bb"
authors = ["Vaibhav Dixit <[email protected]> and contributors"]
version = "0.3.2"
version = "0.3.3"

[deps]
NLopt = "76087f3c-5699-56af-9a33-bf431cd00edd"
Expand Down
7 changes: 6 additions & 1 deletion lib/OptimizationNLopt/src/OptimizationNLopt.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ using Optimization: deduce_retcode
(f::NLopt.Algorithm)() = f

SciMLBase.allowsbounds(opt::Union{NLopt.Algorithm, NLopt.Opt}) = true
SciMLBase.supports_opt_cache_interface(opt::Union{NLopt.Algorithm, NLopt.Opt}) = true
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
SciMLBase.supports_opt_cache_interface(opt::Union{NLopt.Algorithm, NLopt.Opt}) = true
end
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
OptimizationBase.supports_opt_cache_interface(opt::Union{NLopt.Algorithm, NLopt.Opt}) = true
end

function SciMLBase.requiresgradient(opt::Union{NLopt.Algorithm, NLopt.Opt})
# https://github.com/JuliaOpt/NLopt.jl/blob/master/src/NLopt.jl#L18C7-L18C16
Expand Down
2 changes: 1 addition & 1 deletion lib/OptimizationODE/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimizationODE"
uuid = "dfa73e59-e644-4d8a-bf84-188d7ecb34e4"
authors = ["Paras Puneet Singh <[email protected]>"]
version = "0.1.0"
version = "0.1.1"

[deps]
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
Expand Down
7 changes: 6 additions & 1 deletion lib/OptimizationODE/src/OptimizationODE.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ HighOrderDescent() = ODEOptimizer(Vern7())
SciMLBase.requiresbounds(::ODEOptimizer) = false
SciMLBase.allowsbounds(::ODEOptimizer) = false
SciMLBase.allowscallback(::ODEOptimizer) = true
SciMLBase.supports_opt_cache_interface(::ODEOptimizer) = true
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
SciMLBase.supports_opt_cache_interface(::ODEOptimizer) = true
end
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
OptimizationBase.supports_opt_cache_interface(::ODEOptimizer) = true
end
SciMLBase.requiresgradient(::ODEOptimizer) = true
SciMLBase.requireshessian(::ODEOptimizer) = false
SciMLBase.requiresconsjac(::ODEOptimizer) = false
Expand Down
2 changes: 1 addition & 1 deletion lib/OptimizationOptimJL/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimizationOptimJL"
uuid = "36348300-93cb-4f02-beb5-3c3902f8871e"
authors = ["Vaibhav Dixit <[email protected]> and contributors"]
version = "0.4.3"
version = "0.4.4"

[deps]
Optim = "429524aa-4258-5aef-a3af-852621145aeb"
Expand Down
13 changes: 10 additions & 3 deletions lib/OptimizationOptimJL/src/OptimizationOptimJL.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,16 @@ SciMLBase.allowsbounds(opt::Optim.AbstractOptimizer) = true
SciMLBase.allowsbounds(opt::Optim.SimulatedAnnealing) = false
SciMLBase.requiresbounds(opt::Optim.Fminbox) = true
SciMLBase.requiresbounds(opt::Optim.SAMIN) = true
SciMLBase.supports_opt_cache_interface(opt::Optim.AbstractOptimizer) = true
SciMLBase.supports_opt_cache_interface(opt::Union{Optim.Fminbox, Optim.SAMIN}) = true
SciMLBase.supports_opt_cache_interface(opt::Optim.ConstrainedOptimizer) = true
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
SciMLBase.supports_opt_cache_interface(opt::Optim.AbstractOptimizer) = true
SciMLBase.supports_opt_cache_interface(opt::Union{Optim.Fminbox, Optim.SAMIN}) = true
SciMLBase.supports_opt_cache_interface(opt::Optim.ConstrainedOptimizer) = true
end
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
OptimizationBase.supports_opt_cache_interface(opt::Optim.AbstractOptimizer) = true
OptimizationBase.supports_opt_cache_interface(opt::Union{Optim.Fminbox, Optim.SAMIN}) = true
OptimizationBase.supports_opt_cache_interface(opt::Optim.ConstrainedOptimizer) = true
end
function SciMLBase.requiresgradient(opt::Optim.AbstractOptimizer)
!(opt isa Optim.ZerothOrderOptimizer)
end
Expand Down
2 changes: 1 addition & 1 deletion lib/OptimizationOptimisers/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimizationOptimisers"
uuid = "42dfb2eb-d2b4-4451-abcd-913932933ac1"
authors = ["Vaibhav Dixit <[email protected]> and contributors"]
version = "0.3.9"
version = "0.3.10"

[deps]
Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2"
Expand Down
7 changes: 6 additions & 1 deletion lib/OptimizationOptimisers/src/OptimizationOptimisers.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ using Reexport, Printf, ProgressLogging
@reexport using Optimisers, Optimization
using Optimization.SciMLBase, Optimization.OptimizationBase

SciMLBase.supports_opt_cache_interface(opt::AbstractRule) = true
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
SciMLBase.supports_opt_cache_interface(opt::AbstractRule) = true
end
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
OptimizationBase.supports_opt_cache_interface(opt::AbstractRule) = true
end
SciMLBase.requiresgradient(opt::AbstractRule) = true
SciMLBase.allowsfg(opt::AbstractRule) = true

Expand Down
2 changes: 1 addition & 1 deletion lib/OptimizationPRIMA/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimizationPRIMA"
uuid = "72f8369c-a2ea-4298-9126-56167ce9cbc2"
authors = ["Vaibhav Dixit <[email protected]> and contributors"]
version = "0.3.0"
version = "0.3.1"

[deps]
Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
Expand Down
7 changes: 6 additions & 1 deletion lib/OptimizationPRIMA/src/OptimizationPRIMA.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ struct BOBYQA <: PRIMASolvers end
struct LINCOA <: PRIMASolvers end
struct COBYLA <: PRIMASolvers end

SciMLBase.supports_opt_cache_interface(::PRIMASolvers) = true
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
SciMLBase.supports_opt_cache_interface(::PRIMASolvers) = true
end
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
OptimizationBase.supports_opt_cache_interface(::PRIMASolvers) = true
end
SciMLBase.allowsconstraints(::Union{LINCOA, COBYLA}) = true
SciMLBase.allowsbounds(opt::Union{BOBYQA, LINCOA, COBYLA}) = true
SciMLBase.requiresconstraints(opt::COBYLA) = true
Expand Down
2 changes: 1 addition & 1 deletion lib/OptimizationPyCMA/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimizationPyCMA"
uuid = "fb0822aa-1fe5-41d8-99a6-e7bf6c238d3b"
authors = ["Maximilian Pochapski <[email protected]>"]
version = "1.0.0"
version = "1.1.0"

[deps]
CondaPkg = "992eb4ea-22a4-4c89-a5bb-47a3300528ab"
Expand Down
7 changes: 6 additions & 1 deletion lib/OptimizationPyCMA/src/OptimizationPyCMA.jl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ end

# Defining the SciMLBase interface for PyCMAOpt
SciMLBase.allowsbounds(::PyCMAOpt) = true
SciMLBase.supports_opt_cache_interface(opt::PyCMAOpt) = true
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
SciMLBase.supports_opt_cache_interface(opt::PyCMAOpt) = true
end
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
OptimizationBase.supports_opt_cache_interface(opt::PyCMAOpt) = true
end
SciMLBase.allowscallback(::PyCMAOpt) = true
SciMLBase.requiresgradient(::PyCMAOpt) = false
SciMLBase.requireshessian(::PyCMAOpt) = false
Expand Down
2 changes: 1 addition & 1 deletion lib/OptimizationSciPy/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimizationSciPy"
uuid = "cce07bd8-c79b-4b00-aee8-8db9cce22837"
authors = ["Aditya Pandey <[email protected]> and contributors"]
version = "0.4.1"
version = "0.4.2"

[deps]
Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
Expand Down
Loading
Loading