Skip to content

Commit 3b29d7f

Browse files
authored
Fix diff_optimizer with no bridge (#309)
* Fix diff_optimizer with no bridge * Remove outer cache * Fix * Fix format * Fix format * Fix format
1 parent 7953a55 commit 3b29d7f

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

src/moi_wrapper.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function diff_optimizer(
3737
add_poi =
3838
allow_parametric_opt_interface &&
3939
!MOI.supports_add_constrained_variable(
40-
optimizer.model,
40+
isnothing(with_bridge_type) ? optimizer : optimizer.model,
4141
MOI.Parameter{Float64},
4242
)
4343
# When we do `MOI.copy_to(diff, optimizer)` we need to efficiently `MOI.get`
@@ -48,7 +48,9 @@ function diff_optimizer(
4848
caching_opt = if with_outer_cache
4949
MOI.Utilities.CachingOptimizer(
5050
MOI.Utilities.UniversalFallback(
51-
MOI.Utilities.Model{with_bridge_type}(),
51+
MOI.Utilities.Model{
52+
something(with_bridge_type, with_cache_type),
53+
}(),
5254
),
5355
add_poi ? POI.Optimizer(optimizer) : optimizer,
5456
)

test/jump_wrapper.jl

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,15 @@ function test_jump_api()
4646
],
4747
ineq in [true, false],
4848
_min in [true, false],
49-
flip in [true, false]
49+
flip in [true, false],
50+
with_bridge_type in [Float64, nothing]
5051

51-
@testset "$(MODEL) with: $(SOLVER), $(ineq ? "ineqs" : "eqs"), $(_min ? "Min" : "Max"), $(flip ? "geq" : "leq")" begin
52-
model = MODEL(SOLVER)
52+
if isnothing(with_bridge_type) && SOLVER === SCS.Optimizer
53+
continue
54+
end
55+
56+
@testset "$(MODEL) with: $(SOLVER), $(ineq ? "ineqs" : "eqs"), $(_min ? "Min" : "Max"), $(flip ? "geq" : "leq") bridge:$with_bridge_type" begin
57+
model = MODEL(SOLVER; with_bridge_type)
5358
set_silent(model)
5459

5560
p_val = 4.0

0 commit comments

Comments
 (0)