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

Remove Ipopt from tests #247

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove Ipopt from tests #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c3f06c
Remove Ipopt from tests
odow Apr 13, 2023
072aa47
Fix
odow Apr 26, 2023
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
9 changes: 0 additions & 9 deletions test/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,14 @@
[deps]
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
DiffOpt = "930fe3bc-9c6b-11ea-2d94-6184641e85e7"
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
HiGHS = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
IterativeSolvers = "42fd0dbc-a981-5370-80f2-aaf504508153"
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
MLDatasets = "eb30cadb-4394-5ae3-aed4-317e484a6458"
MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
SCS = "c946c3f1-0d1f-5ce8-9dea-7daa1f7e2d13"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
HiGHS = "1"
Ipopt = "1.0.2"
SCS = "1"
4 changes: 2 additions & 2 deletions test/conic_program.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module TestConicProgram

using Test
import DiffOpt
import Ipopt
import HiGHS
import LinearAlgebra
import MathOptInterface as MOI
import SCS
Expand Down Expand Up @@ -848,7 +848,7 @@ function test_singular_exception()
q = [1.0, 1.0]
G = [1.0 1.0]
h = [-1.0]
model = DiffOpt.diff_optimizer(Ipopt.Optimizer)
model = DiffOpt.diff_optimizer(HiGHS.Optimizer)
MOI.set(model, MOI.Silent(), true)
x = MOI.add_variables(model, 2)
quad_terms = MOI.ScalarQuadraticTerm{Float64}[]
Expand Down
13 changes: 6 additions & 7 deletions test/jump.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ using JuMP
import DelimitedFiles
import DiffOpt
import HiGHS
import Ipopt
import IterativeSolvers
import LinearAlgebra
import MathOptInterface as MOI
Expand Down Expand Up @@ -44,7 +43,7 @@ function test_forward_on_trivial_qp()
0.0 -1.0
]
h = [1, 0.7, 0.7, -1, 0, 0]
model = JuMP.Model(() -> DiffOpt.diff_optimizer(Ipopt.Optimizer))
model = JuMP.Model(() -> DiffOpt.diff_optimizer(HiGHS.Optimizer))
MOI.set(model, MOI.Silent(), true)
@variable(model, x[1:2])
@objective(model, Min, x' * Q * x + q' * x)
Expand All @@ -59,7 +58,7 @@ function test_differentiating_trivial_qp_1()
q = [1.0, 1.0]
G = [1.0 1.0]
h = [-1.0]
model = JuMP.direct_model(DiffOpt.diff_optimizer(Ipopt.Optimizer))
model = JuMP.direct_model(DiffOpt.diff_optimizer(HiGHS.Optimizer))
MOI.set(model, MOI.Silent(), true)
x = @variable(model, [1:2])
@objective(model, Min, x' * Q * x + q' * x)
Expand Down Expand Up @@ -103,7 +102,7 @@ function test_differentiating_qp_with_inequality_and_equality_constraints()
h = [1.0, 1.0, 1.0, 0.0, 0.0, 0.0]
A = [1.0 1.0 1.0;]
b = [0.5]
model = Model(() -> DiffOpt.diff_optimizer(Ipopt.Optimizer))
model = Model(() -> DiffOpt.diff_optimizer(HiGHS.Optimizer))
MOI.set(model, MOI.Silent(), true)
@variable(model, x[1:3])
@objective(model, Min, x' * Q * x + q' * x)
Expand Down Expand Up @@ -147,7 +146,7 @@ function test_differentiating_MOI_examples_1()
# st x + 2y + 3z >= 4 (c1)
# x + y >= 1 (c2)
# x, y, z \in R
model = JuMP.direct_model(DiffOpt.diff_optimizer(Ipopt.Optimizer))
model = JuMP.direct_model(DiffOpt.diff_optimizer(HiGHS.Optimizer))
MOI.set(model, MOI.Silent(), true)
@variables(model, begin
x
Expand Down Expand Up @@ -191,7 +190,7 @@ function test_differentiating_moi_examples_2_non_trivial_backward_pass_vector()
# minimize 2 x^2 + y^2 + xy + x + y
# s.t. x, y >= 0
# x + y = 1 (c1)
model = JuMP.Model(() -> DiffOpt.diff_optimizer(Ipopt.Optimizer))
model = JuMP.Model(() -> DiffOpt.diff_optimizer(HiGHS.Optimizer))
MOI.set(model, MOI.Silent(), true)
@variable(model, x ≥ 0)
@variable(model, y ≥ 0)
Expand Down Expand Up @@ -245,7 +244,7 @@ function test_differentiating_non_trivial_convex_qp_jump()
q = vec(q)
h = vec(h)
b = vec(b)
model = JuMP.Model(() -> DiffOpt.diff_optimizer(Ipopt.Optimizer))
model = JuMP.Model(() -> DiffOpt.diff_optimizer(HiGHS.Optimizer))
MOI.set(model, MOI.Silent(), true)
@variable(model, x[1:nz])
@objective(model, Min, x' * Q * x + q' * x)
Expand Down
3 changes: 1 addition & 2 deletions test/linear_program.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ module TestLinearProgram
using Test
import DiffOpt
import HiGHS
import Ipopt
import MathOptInterface as MOI
import SCS

Expand Down Expand Up @@ -54,7 +53,7 @@ function test_differentiating_a_simple_LP_with_GreaterThan_constraint()
# s.t. x >= 3
nz = 1
qp_test_with_solutions(
Ipopt.Optimizer;
HiGHS.Optimizer;
q = ones(nz),
G = -ones(1, nz),
h = [-3.0],
Expand Down
17 changes: 8 additions & 9 deletions test/quadratic_program.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ using Test
import DelimitedFiles
import DiffOpt
import HiGHS
import Ipopt
import MathOptInterface as MOI
import SCS

Expand Down Expand Up @@ -43,7 +42,7 @@ function test_forward_on_trivial_QP()
]
h = [1, 0.7, 0.7, -1, 0, 0]
qp_test_with_solutions(
Ipopt.Optimizer;
HiGHS.Optimizer;
Q = Q,
q = q,
G = G,
Expand All @@ -68,12 +67,12 @@ function test_differentiating_trivial_qp_1()
G = [1.0 1.0]
h = [-1.0]

model = DiffOpt.diff_optimizer(Ipopt.Optimizer)
model = DiffOpt.diff_optimizer(HiGHS.Optimizer)
MOI.set(model, MOI.Silent(), true)
x = MOI.add_variables(model, 2)

qp_test_with_solutions(
Ipopt.Optimizer;
HiGHS.Optimizer;
Q = Q,
q = q,
G = G,
Expand All @@ -96,7 +95,7 @@ end
# G = [1.0 1.0;]
# h = [-1.0;]
#
# model = DiffOpt.diff_optimizer(Ipopt.Optimizer)
# model = DiffOpt.diff_optimizer(HiGHS.Optimizer)
# x = MOI.add_variables(model, 2)
#
# # define objective
Expand Down Expand Up @@ -149,7 +148,7 @@ function test_differentiating_qp_with_inequality_and_equality_constraints()
A = [1.0 1.0 1.0;]
b = [0.5]
qp_test_with_solutions(
Ipopt.Optimizer;
HiGHS.Optimizer;
Q = Q,
q = q,
G = G,
Expand Down Expand Up @@ -207,7 +206,7 @@ function test_differentiating_moi_examples_1()
]
dh = [-0.35714284; -0.4285714]
qp_test_with_solutions(
Ipopt.Optimizer;
HiGHS.Optimizer;
Q = Q,
q = q,
G = G,
Expand Down Expand Up @@ -256,7 +255,7 @@ function test_differentiating_moi_examples_2()
dA = [0.375 -1.075]
db = [0.7]
qp_test_with_solutions(
Ipopt.Optimizer;
HiGHS.Optimizer;
Q = Q,
q = q,
G = G,
Expand Down Expand Up @@ -321,7 +320,7 @@ function test_differentiating_non_trivial_convex_qp_moi()
dhb = vec(grads_actual[4])
dbb = vec(grads_actual[6])
qp_test(
Ipopt.Optimizer,
HiGHS.Optimizer,
DiffOpt.QuadraticProgram.Model,
true,
true,
Expand Down
Loading