Skip to content

Fix diff_optimizer with no bridge #309

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

Merged
blegat merged 6 commits into from
Sep 7, 2025
Merged

Fix diff_optimizer with no bridge #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b8d4b18
Fix diff_optimizer with no bridge
blegat Sep 6, 2025
2b355ee
Remove outer cache
blegat Sep 6, 2025
d3508f4
Fix
blegat Sep 6, 2025
a9fe346
Fix format
blegat Sep 6, 2025
9c115e2
Fix format
blegat Sep 6, 2025
35f399e
Fix format
blegat Sep 6, 2025
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
6 changes: 4 additions & 2 deletions src/moi_wrapper.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function diff_optimizer(
add_poi =
allow_parametric_opt_interface &&
!MOI.supports_add_constrained_variable(
optimizer.model,
isnothing(with_bridge_type) ? optimizer : optimizer.model,
MOI.Parameter{Float64},
)
# When we do `MOI.copy_to(diff, optimizer)` we need to efficiently `MOI.get`
Expand All @@ -48,7 +48,9 @@ function diff_optimizer(
caching_opt = if with_outer_cache
MOI.Utilities.CachingOptimizer(
MOI.Utilities.UniversalFallback(
MOI.Utilities.Model{with_bridge_type}(),
MOI.Utilities.Model{
something(with_bridge_type, with_cache_type),
}(),
),
add_poi ? POI.Optimizer(optimizer) : optimizer,
)
Expand Down
11 changes: 8 additions & 3 deletions test/jump_wrapper.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,15 @@ function test_jump_api()
],
ineq in [true, false],
_min in [true, false],
flip in [true, false]
flip in [true, false],
with_bridge_type in [Float64, nothing]

@testset "$(MODEL) with: $(SOLVER), $(ineq ? "ineqs" : "eqs"), $(_min ? "Min" : "Max"), $(flip ? "geq" : "leq")" begin
model = MODEL(SOLVER)
if isnothing(with_bridge_type) && SOLVER === SCS.Optimizer
continue
end

@testset "$(MODEL) with: $(SOLVER), $(ineq ? "ineqs" : "eqs"), $(_min ? "Min" : "Max"), $(flip ? "geq" : "leq") bridge:$with_bridge_type" begin
model = MODEL(SOLVER; with_bridge_type)
set_silent(model)

p_val = 4.0
Expand Down
Loading