Skip to content

Commit b4cd7c4

Browse files
authored
Use KNITRO_jll in README and update MINLPTests/Project.toml (#203)
1 parent 7b6cbc1 commit b4cd7c4

3 files changed

Lines changed: 3 additions & 98 deletions

File tree

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,10 @@ Supported packages include:
6767
| [Bonmin](https://github.com/coin-or/Bonmin) | `Bonmin_jll.jl` | `Bomin_jll.amplexe` |
6868
| [Couenne](https://github.com/coin-or/Couenne) | `Couenne_jll.jl` | `Couenne_jll.amplexe` |
6969
| [Ipopt](https://github.com/coin-or/Ipopt) | `Ipopt_jll.jl` | `Ipopt_jll.amplexe` |
70-
| [KNITRO](https://github.com/jump-dev/KNITRO.jl)| `KNITRO.jl` | `KNITRO.amplexe` |
70+
| [KNITRO](https://github.com/jump-dev/KNITRO_jll.jl)| `KNITRO_jll.jl` | `KNITRO_jll.knitroampl` |
7171
| [SHOT](https://github.com/coin-or/SHOT) | `SHOT_jll.jl` | `SHOT_jll.amplexe` |
7272
| [Uno](https://github.com/cvanaret/Uno) | `Uno_jll.jl` | `Uno_jll.amplexe` |
7373

74-
**Bonmin and Couenne do not work on Apple M-series computers. For compatibility,
75-
install Julia via Rosetta.**
76-
7774
## MathOptInterface API
7875

7976
The AmplNLWriter optimizer supports the following constraints and attributes.

test/MINLPTests/Project.toml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@ Ipopt_jll = "9cc047cb-c261-5740-88fc-0cf96f7bdcc7"
55
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
66
MINLPTests = "ee0a3090-8ee9-5cdb-b8cb-8eeba3165522"
77
MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
8-
SHOT_jll = "c1ab834c-c4a5-50f5-9156-8f0fe7758b0e"
98
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
10-
Uno_jll = "396d5378-14f1-5ab1-981d-48acd51740ed"
119

1210
[compat]
13-
Bonmin_jll = "100.800.901"
11+
Bonmin_jll = "100.800.902"
1412
Couenne_jll = "0.500.802"
1513
Ipopt_jll = "300.1400.1900"
1614
JuMP = "1"
17-
MathOptInterface = "1.33"
1815
MINLPTests = "0.6"
19-
SHOT_jll = "100.100.0"
20-
Uno_jll = "1"
16+
MathOptInterface = "1.33"
2117
julia = "1.10"

test/MINLPTests/run_minlptests.jl

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import Couenne_jll
1111
import Ipopt_jll
1212
import MathOptInterface as MOI
1313
import MINLPTests
14-
import SHOT_jll
15-
import Uno_jll
1614

1715
const TERMINATION_TARGET = Dict(
1816
MINLPTests.FEASIBLE_PROBLEM => MOI.LOCALLY_SOLVED,
@@ -62,32 +60,6 @@ const CONFIG = Dict{String,Any}(
6260
"nlp_exclude" => ["007_010"],
6361
"nlpcvx_exclude" => ["109_010"],
6462
),
65-
# SHOT fails too many tests to recommend using it.
66-
# e.g., https://github.com/coin-or/SHOT/issues/134
67-
# Even problems such as `@variable(model, x); @objective(model, Min, (x-1)^2)`
68-
# "SHOT" => Dict(
69-
# "amplexe" => SHOT_jll.amplexe,
70-
# "options" => String[
71-
# "Output.Console.LogLevel=6",
72-
# "Output.File.LogLevel=6",
73-
# "Termination.ObjectiveGap.Absolute=1e-6",
74-
# "Termination.ObjectiveGap.Relative=1e-6",
75-
# ],
76-
# "tol" => 1e-2,
77-
# "dual_tol" => NaN,
78-
# "infeasible_point" => AmplNLWriter.MOI.UNKNOWN_RESULT_STATUS,
79-
# ),
80-
"Uno" => Dict(
81-
"mixed-integer" => false,
82-
"amplexe" => Uno_jll.amplexe,
83-
"options" => ["logger=SILENT"],
84-
"nlp_exclude" => [
85-
# See https://github.com/cvanaret/Uno/issues/39
86-
"005_010",
87-
# See https://github.com/cvanaret/Uno/issues/38
88-
"007_010",
89-
],
90-
),
9163
)
9264

9365
@testset "$k" for (k, config) in CONFIG
@@ -160,63 +132,3 @@ const CONFIG = Dict{String,Any}(
160132
end
161133
end
162134
end
163-
164-
function test_uno_runtests()
165-
optimizer = MOI.instantiate(
166-
() -> AmplNLWriter.Optimizer(Uno_jll.amplexe, ["logger=SILENT"]);
167-
with_cache_type = Float64,
168-
with_bridge_type = Float64,
169-
)
170-
MOI.Test.runtests(
171-
optimizer,
172-
MOI.Test.Config(
173-
atol = 1e-4,
174-
rtol = 1e-4,
175-
optimal_status = MOI.LOCALLY_SOLVED,
176-
infeasible_status = MOI.LOCALLY_INFEASIBLE,
177-
exclude = Any[
178-
MOI.VariableBasisStatus,
179-
MOI.ConstraintBasisStatus,
180-
MOI.ObjectiveBound,
181-
],
182-
);
183-
exclude = [
184-
# OTHER_LIMIT instead of LOCALLY_SOLVED
185-
r"^test_conic_linear_VectorOfVariables_2$",
186-
r"^test_nonlinear_expression_hs109$",
187-
r"^test_quadratic_constraint_GreaterThan$",
188-
r"^test_quadratic_constraint_LessThan$",
189-
r"^test_solve_VariableIndex_ConstraintDual_MAX_SENSE$",
190-
r"^test_solve_VariableIndex_ConstraintDual_MIN_SENSE$",
191-
# OTHER_ERROR instead of LOCALLY_SOLVED
192-
r"^test_linear_integration$",
193-
r"^test_linear_transform$",
194-
# OTHER_LIMIT instead of DUAL_INFEASIBLE
195-
r"^test_solve_TerminationStatus_DUAL_INFEASIBLE$",
196-
# OTHER_LIMIT instead of LOCALLY_INFEASIBLE
197-
r"^test_conic_NormInfinityCone_INFEASIBLE$",
198-
r"^test_conic_NormOneCone_INFEASIBLE$",
199-
r"^test_conic_linear_INFEASIBLE$",
200-
r"^test_conic_linear_INFEASIBLE_2$",
201-
r"^test_linear_INFEASIBLE$",
202-
r"^test_linear_INFEASIBLE_2$",
203-
r"^test_solve_DualStatus_INFEASIBILITY_CERTIFICATE_",
204-
# Uno does not support integrality
205-
"Indicator",
206-
r"[Ii]nteger",
207-
"Semicontinuous",
208-
"Semiinteger",
209-
"SOS1",
210-
"SOS2",
211-
"ZeroOne",
212-
r"^test_cpsat_",
213-
# Existing MOI issues
214-
r"^test_attribute_SolverVersion$",
215-
r"^test_nonlinear_invalid$",
216-
r"^test_basic_VectorNonlinearFunction_",
217-
],
218-
)
219-
return
220-
end
221-
222-
test_uno_runtests()

0 commit comments

Comments
 (0)