Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement MOI.default_cache #130

Merged
merged 5 commits into from
Mar 1, 2022
Merged

Implement MOI.default_cache #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7625a16
WIP: implement MOI.default_cache
odow Feb 22, 2022
5afb0c6
Update Project.toml
odow Mar 1, 2022
595de75
Fix tests
blegat Mar 1, 2022
118615d
Add test
blegat Mar 1, 2022
e4427a8
Update to MOI 1.1
odow Mar 1, 2022
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"

[compat]
Clp_jll = "=1.17.6, ~100.1700.600"
MathOptInterface = "1"
MathOptInterface = "1.1"
julia = "1.6"

[extras]
Expand Down
7 changes: 7 additions & 0 deletions src/MOI_wrapper/MOI_wrapper.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ const OptimizerCache = MOI.Utilities.GenericModel{
},
}

Base.show(io::IO, ::Type{OptimizerCache}) = print(io, "Clp.OptimizerCache")

const SCALAR_SETS = Union{
MOI.GreaterThan{Float64},
MOI.LessThan{Float64},
Expand Down Expand Up @@ -72,6 +74,10 @@ mutable struct Optimizer <: MOI.AbstractOptimizer
end
end

function MOI.default_cache(::Optimizer, ::Type{Float64})
return MOI.Utilities.UniversalFallback(OptimizerCache())
end

Base.cconvert(::Type{Ptr{Cvoid}}, model::Optimizer) = model
function Base.unsafe_convert(::Type{Ptr{Cvoid}}, model::Optimizer)
return model.inner::Ptr{Cvoid}
Expand Down Expand Up @@ -335,6 +341,7 @@ function MOI.copy_to(
dest::Optimizer,
src::MOI.Utilities.UniversalFallback{OptimizerCache},
)
MOI.Utilities.throw_unsupported(src)
return MOI.copy_to(dest, src.model)
end

Expand Down
24 changes: 14 additions & 10 deletions test/MOI_wrapper.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,17 @@ function test_supports_default_copy_to()
end

function test_runtests()
model = MOI.Bridges.full_bridge_optimizer(
MOI.Utilities.CachingOptimizer(
MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}()),
Clp.Optimizer(),
),
Float64,
# This is what JuMP would construct
model = MOI.Utilities.CachingOptimizer(
MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}()),
MOI.instantiate(Clp.Optimizer; with_bridge_type = Float64),
)
@test model.optimizer.model.model_cache isa
MOI.Utilities.UniversalFallback{Clp.OptimizerCache}
# `Variable.ZerosBridge` makes dual needed by some tests fail.
MOI.Bridges.remove_bridge(
model.optimizer,
MathOptInterface.Bridges.Variable.ZerosBridge{Float64},
)
MOI.set(model, MOI.Silent(), true)
MOI.Test.runtests(
Expand All @@ -50,10 +55,9 @@ function test_runtests()
end

function test_Nonexistant_unbounded_ray()
model = MOI.Utilities.CachingOptimizer(
MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}()),
Clp.Optimizer(),
)
inner = Clp.Optimizer()
model =
MOI.Utilities.CachingOptimizer(MOI.default_cache(inner, Float64), inner)
MOI.set(model, MOI.Silent(), true)
x = MOI.add_variables(model, 5)
MOI.set(
Expand Down