Skip to content

Commit 9ddaaa3

Browse files
committed
Remove Ipopt from tests
1 parent 86a4cf1 commit 9ddaaa3

File tree

5 files changed

+19
-24
lines changed

5 files changed

+19
-24
lines changed

Project.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1717
[compat]
1818
BlockDiagonals = "0.1"
1919
ChainRulesCore = "1"
20-
HiGHS = "1"
21-
Ipopt = "1"
20+
HiGHS = "1.5.1"
2221
IterativeSolvers = "0.9"
2322
JuMP = "1"
2423
LazyArrays = "0.21, 0.22, 1"
@@ -30,9 +29,8 @@ julia = "1.6"
3029
[extras]
3130
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
3231
HiGHS = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
33-
Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
3432
SCS = "c946c3f1-0d1f-5ce8-9dea-7daa1f7e2d13"
3533
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
3634

3735
[targets]
38-
test = ["DelimitedFiles", "HiGHS", "Ipopt", "SCS", "Test"]
36+
test = ["DelimitedFiles", "HiGHS", "SCS", "Test"]

test/conic_program.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module TestConicProgram
77

88
using Test
99
import DiffOpt
10-
import Ipopt
10+
import HiGHS
1111
import LinearAlgebra
1212
import MathOptInterface as MOI
1313
import SCS
@@ -848,7 +848,7 @@ function test_singular_exception()
848848
q = [1.0, 1.0]
849849
G = [1.0 1.0]
850850
h = [-1.0]
851-
model = DiffOpt.diff_optimizer(Ipopt.Optimizer)
851+
model = DiffOpt.diff_optimizer(HiGHS.Optimizer)
852852
MOI.set(model, MOI.Silent(), true)
853853
x = MOI.add_variables(model, 2)
854854
quad_terms = MOI.ScalarQuadraticTerm{Float64}[]

test/jump.jl

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ using JuMP
1111
import DelimitedFiles
1212
import DiffOpt
1313
import HiGHS
14-
import Ipopt
1514
import IterativeSolvers
1615
import LinearAlgebra
1716
import MathOptInterface as MOI
@@ -44,7 +43,7 @@ function test_forward_on_trivial_qp()
4443
0.0 -1.0
4544
]
4645
h = [1, 0.7, 0.7, -1, 0, 0]
47-
model = JuMP.Model(() -> DiffOpt.diff_optimizer(Ipopt.Optimizer))
46+
model = JuMP.Model(() -> DiffOpt.diff_optimizer(HiGHS.Optimizer))
4847
MOI.set(model, MOI.Silent(), true)
4948
@variable(model, x[1:2])
5049
@objective(model, Min, x' * Q * x + q' * x)
@@ -59,7 +58,7 @@ function test_differentiating_trivial_qp_1()
5958
q = [1.0, 1.0]
6059
G = [1.0 1.0]
6160
h = [-1.0]
62-
model = JuMP.direct_model(DiffOpt.diff_optimizer(Ipopt.Optimizer))
61+
model = JuMP.direct_model(DiffOpt.diff_optimizer(HiGHS.Optimizer))
6362
MOI.set(model, MOI.Silent(), true)
6463
x = @variable(model, [1:2])
6564
@objective(model, Min, x' * Q * x + q' * x)
@@ -103,7 +102,7 @@ function test_differentiating_qp_with_inequality_and_equality_constraints()
103102
h = [1.0, 1.0, 1.0, 0.0, 0.0, 0.0]
104103
A = [1.0 1.0 1.0;]
105104
b = [0.5]
106-
model = Model(() -> DiffOpt.diff_optimizer(Ipopt.Optimizer))
105+
model = Model(() -> DiffOpt.diff_optimizer(HiGHS.Optimizer))
107106
MOI.set(model, MOI.Silent(), true)
108107
@variable(model, x[1:3])
109108
@objective(model, Min, x' * Q * x + q' * x)
@@ -147,7 +146,7 @@ function test_differentiating_MOI_examples_1()
147146
# st x + 2y + 3z >= 4 (c1)
148147
# x + y >= 1 (c2)
149148
# x, y, z \in R
150-
model = JuMP.direct_model(DiffOpt.diff_optimizer(Ipopt.Optimizer))
149+
model = JuMP.direct_model(DiffOpt.diff_optimizer(HiGHS.Optimizer))
151150
MOI.set(model, MOI.Silent(), true)
152151
@variables(model, begin
153152
x
@@ -191,7 +190,7 @@ function test_differentiating_moi_examples_2_non_trivial_backward_pass_vector()
191190
# minimize 2 x^2 + y^2 + xy + x + y
192191
# s.t. x, y >= 0
193192
# x + y = 1 (c1)
194-
model = JuMP.Model(() -> DiffOpt.diff_optimizer(Ipopt.Optimizer))
193+
model = JuMP.Model(() -> DiffOpt.diff_optimizer(HiGHS.Optimizer))
195194
MOI.set(model, MOI.Silent(), true)
196195
@variable(model, x 0)
197196
@variable(model, y 0)
@@ -245,7 +244,7 @@ function test_differentiating_non_trivial_convex_qp_jump()
245244
q = vec(q)
246245
h = vec(h)
247246
b = vec(b)
248-
model = JuMP.Model(() -> DiffOpt.diff_optimizer(Ipopt.Optimizer))
247+
model = JuMP.Model(() -> DiffOpt.diff_optimizer(HiGHS.Optimizer))
249248
MOI.set(model, MOI.Silent(), true)
250249
@variable(model, x[1:nz])
251250
@objective(model, Min, x' * Q * x + q' * x)

test/linear_program.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ module TestLinearProgram
88
using Test
99
import DiffOpt
1010
import HiGHS
11-
import Ipopt
1211
import MathOptInterface as MOI
1312
import SCS
1413

@@ -54,7 +53,7 @@ function test_differentiating_a_simple_LP_with_GreaterThan_constraint()
5453
# s.t. x >= 3
5554
nz = 1
5655
qp_test_with_solutions(
57-
Ipopt.Optimizer;
56+
HiGHS.Optimizer;
5857
q = ones(nz),
5958
G = -ones(1, nz),
6059
h = [-3.0],

test/quadratic_program.jl

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ using Test
99
import DelimitedFiles
1010
import DiffOpt
1111
import HiGHS
12-
import Ipopt
1312
import MathOptInterface as MOI
1413
import SCS
1514

@@ -43,7 +42,7 @@ function test_forward_on_trivial_QP()
4342
]
4443
h = [1, 0.7, 0.7, -1, 0, 0]
4544
qp_test_with_solutions(
46-
Ipopt.Optimizer;
45+
HiGHS.Optimizer;
4746
Q = Q,
4847
q = q,
4948
G = G,
@@ -68,12 +67,12 @@ function test_differentiating_trivial_qp_1()
6867
G = [1.0 1.0]
6968
h = [-1.0]
7069

71-
model = DiffOpt.diff_optimizer(Ipopt.Optimizer)
70+
model = DiffOpt.diff_optimizer(HiGHS.Optimizer)
7271
MOI.set(model, MOI.Silent(), true)
7372
x = MOI.add_variables(model, 2)
7473

7574
qp_test_with_solutions(
76-
Ipopt.Optimizer;
75+
HiGHS.Optimizer;
7776
Q = Q,
7877
q = q,
7978
G = G,
@@ -96,7 +95,7 @@ end
9695
# G = [1.0 1.0;]
9796
# h = [-1.0;]
9897
#
99-
# model = DiffOpt.diff_optimizer(Ipopt.Optimizer)
98+
# model = DiffOpt.diff_optimizer(HiGHS.Optimizer)
10099
# x = MOI.add_variables(model, 2)
101100
#
102101
# # define objective
@@ -149,7 +148,7 @@ function test_differentiating_qp_with_inequality_and_equality_constraints()
149148
A = [1.0 1.0 1.0;]
150149
b = [0.5]
151150
qp_test_with_solutions(
152-
Ipopt.Optimizer;
151+
HiGHS.Optimizer;
153152
Q = Q,
154153
q = q,
155154
G = G,
@@ -207,7 +206,7 @@ function test_differentiating_moi_examples_1()
207206
]
208207
dh = [-0.35714284; -0.4285714]
209208
qp_test_with_solutions(
210-
Ipopt.Optimizer;
209+
HiGHS.Optimizer;
211210
Q = Q,
212211
q = q,
213212
G = G,
@@ -256,7 +255,7 @@ function test_differentiating_moi_examples_2()
256255
dA = [0.375 -1.075]
257256
db = [0.7]
258257
qp_test_with_solutions(
259-
Ipopt.Optimizer;
258+
HiGHS.Optimizer;
260259
Q = Q,
261260
q = q,
262261
G = G,
@@ -321,7 +320,7 @@ function test_differentiating_non_trivial_convex_qp_moi()
321320
dhb = vec(grads_actual[4])
322321
dbb = vec(grads_actual[6])
323322
qp_test(
324-
Ipopt.Optimizer,
323+
HiGHS.Optimizer,
325324
true,
326325
true,
327326
true;

0 commit comments

Comments
 (0)