Remove branches that depend on knitro_version (#347)

Author: odow

examples/nlp2noderivs.jl

@@ -140,8 +140,4 @@ function example_nlp2noderivs(; verbose=true)
     return KNITRO.KN_free(kc)
 end
 
-if KNITRO.knitro_version() >= v"12.4"
-    example_nlp2noderivs(; verbose=isdefined(Main, :KN_VERBOSE) ? KN_VERBOSE : true)
-else
-    println("Example `nlp2noderivs.jl` is only available with Knitro >= 12.4")
-end
+example_nlp2noderivs(; verbose=isdefined(Main, :KN_VERBOSE) ? KN_VERBOSE : true)

examples/nlp2resolve.jl

@@ -304,8 +304,4 @@ function example_nlp2resolve(; verbose=true)
     return KNITRO.KN_free(kc)
 end
 
-if KNITRO.knitro_version() >= v"12.4"
-    example_nlp2resolve(; verbose=isdefined(Main, :KN_VERBOSE) ? KN_VERBOSE : true)
-else
-    println("Example `nlp2resolve.jl` is only available with Knitro >= 12.4")
-end
+example_nlp2resolve(; verbose=isdefined(Main, :KN_VERBOSE) ? KN_VERBOSE : true)

examples/tuner.jl

@@ -189,11 +189,7 @@ function example_tuner(; verbose=true)
         println(
             "Force Knitro multistart to run in parallel with 1 threads (instead of $nThreads).",
         )
-        if KNITRO.knitro_version() >= v"13.0"
-            KNITRO.KN_set_int_param(kc, KNITRO.KN_PARAM_NUMTHREADS, 1)
-        else
-            KNITRO.KN_set_int_param(kc, KNITRO.KN_PARAM_PAR_NUMTHREADS, 1)
-        end
+        KNITRO.KN_set_int_param(kc, KNITRO.KN_PARAM_NUMTHREADS, 1)
     end
 
     # Solve the problem.

ext/KNITROMathOptInterfaceExt.jl

@@ -247,17 +247,7 @@ function MOI.set(model::Optimizer, ::MOI.TimeLimitSec, value)
     model.time_limit_sec = value
     # By default, maxtime is set to 1e8 in Knitro.
     limit = something(value, 1e8)
-    if KNITRO.knitro_version() >= v"15.0"
-        KNITRO.@_checked KNITRO.KN_set_double_param(model, KNITRO.KN_PARAM_MAXTIME, limit)
-    else
-        # KNITRO does not have a single option to control the global time limit,
-        # so we set various options.
-        # MAXTIME_REAL is the base option, which applies if the problem is a NLP.
-        # MIP_MAXTIME_REAL applies if the problem is a MINLP
-        for p in (KNITRO.KN_PARAM_MAXTIMEREAL, KNITRO.KN_PARAM_MIP_MAXTIMEREAL)
-            KNITRO.@_checked KNITRO.KN_set_double_param(model, p, limit)
-        end
-    end
+    KNITRO.@_checked KNITRO.KN_set_double_param(model, KNITRO.KN_PARAM_MAXTIME, limit)
     return
 end
 
@@ -1605,9 +1595,7 @@ end
 
 function MOI.get(model::Optimizer, ::MOI.SolveTimeSec)
     p = Ref{Cdouble}(NaN)
-    if KNITRO.knitro_version() >= v"12.0"
-        KNITRO.@_checked KNITRO.KN_get_solve_time_cpu(model, p)
-    end
+    KNITRO.@_checked KNITRO.KN_get_solve_time_cpu(model, p)
     return p[]
 end
 

src/C_wrapper.jl

@@ -157,14 +157,9 @@ function KN_solve(model::Model)
     # as we have trouble calling Julia code from multithreaded C
     # code. See issue #93 on https://github.com/jump-dev/KNITRO.jl.
     if !isempty(model.callbacks)
-        if knitro_version() >= v"13.0"
-            @_checked KN_set_int_param(model, KN_PARAM_MS_NUMTHREADS, 1)
-            @_checked KN_set_int_param(model, KN_PARAM_NUMTHREADS, 1)
-            @_checked KN_set_int_param(model, KN_PARAM_MIP_NUMTHREADS, 1)
-        else
-            @_checked KN_set_int_param_by_name(model, "par_numthreads", 1)
-            @_checked KN_set_int_param_by_name(model, "par_msnumthreads", 1)
-        end
+        @_checked KN_set_int_param(model, KN_PARAM_MS_NUMTHREADS, 1)
+        @_checked KN_set_int_param(model, KN_PARAM_NUMTHREADS, 1)
+        @_checked KN_set_int_param(model, KN_PARAM_MIP_NUMTHREADS, 1)
     end
     # For KN_solve, we do not return an error if ret is different of 0.
     return KN_solve(model.env)

test/C_wrapper.jl

@@ -95,35 +95,33 @@ function callback(name)
     return callbackFn
 end
 
-if KNITRO.knitro_version() >= v"12.1"
-    @testset "MPS reader/writer" begin
-        mps_name = joinpath(dirname(@__FILE__), "lp.mps")
-        mps_name_out = joinpath(dirname(@__FILE__), "lp2.mps")
-        open(mps_name, "w") do io
-            return write(io, MPS_PROBLEM)
-        end
-        kc = KN_new()
-        KN_load_mps_file(kc, mps_name)
-        KN_set_int_param_by_name(kc, "outlev", 0)
-        KN_write_mps_file(kc, mps_name_out)
-        status = KN_solve(kc)
-        obj = Ref{Cdouble}(0.0)
-        KN_get_solution(kc, Ref{Cint}(), obj, C_NULL, C_NULL)
-        KN_free(kc)
-        @test status == 0
-        @test isapprox(obj[], 250.0 / 3.0, rtol=1e-6)
-
-        # Resolve with dumped MPS file
-        kc = KN_new()
-        KN_load_mps_file(kc, mps_name_out)
-        KN_set_int_param_by_name(kc, "outlev", 0)
-        status = KN_solve(kc)
-        obj = Ref{Cdouble}(0.0)
-        KN_get_solution(kc, Ref{Cint}(), obj, C_NULL, C_NULL)
-        KN_free(kc)
-        @test status == 0
-        @test isapprox(obj[], 250.0 / 3.0, rtol=1e-6)
+@testset "MPS reader/writer" begin
+    mps_name = joinpath(dirname(@__FILE__), "lp.mps")
+    mps_name_out = joinpath(dirname(@__FILE__), "lp2.mps")
+    open(mps_name, "w") do io
+        return write(io, MPS_PROBLEM)
     end
+    kc = KN_new()
+    KN_load_mps_file(kc, mps_name)
+    KN_set_int_param_by_name(kc, "outlev", 0)
+    KN_write_mps_file(kc, mps_name_out)
+    status = KN_solve(kc)
+    obj = Ref{Cdouble}(0.0)
+    KN_get_solution(kc, Ref{Cint}(), obj, C_NULL, C_NULL)
+    KN_free(kc)
+    @test status == 0
+    @test isapprox(obj[], 250.0 / 3.0, rtol=1e-6)
+
+    # Resolve with dumped MPS file
+    kc = KN_new()
+    KN_load_mps_file(kc, mps_name_out)
+    KN_set_int_param_by_name(kc, "outlev", 0)
+    status = KN_solve(kc)
+    obj = Ref{Cdouble}(0.0)
+    KN_get_solution(kc, Ref{Cint}(), obj, C_NULL, C_NULL)
+    KN_free(kc)
+    @test status == 0
+    @test isapprox(obj[], 250.0 / 3.0, rtol=1e-6)
 end
 
 @testset "First problem" begin
@@ -137,11 +135,7 @@ end
     options = joinpath(dirname(@__FILE__), "..", "examples", "test_knitro.opt")
     tuner1 = joinpath(dirname(@__FILE__), "..", "examples", "tuner-fixed.opt")
     tuner2 = joinpath(dirname(@__FILE__), "..", "examples", "tuner-explore.opt")
-    param_alg_name = if KNITRO.knitro_version() >= v"15"
-        "nlp_algorithm"
-    else
-        "algorithm"
-    end
+    param_alg_name = "nlp_algorithm"
     KN_set_int_param_by_name(kc, param_alg_name, 0)
     KN_set_char_param_by_name(kc, "cplexlibname", ".")
     KN_set_double_param_by_name(kc, "xtol", 1e-15)
@@ -164,9 +158,7 @@ end
     _to_string(x) = GC.@preserve(x, unsafe_string(pointer(x)))
     @test _to_string(tmp) == "xtol"
     KN_get_param_doc(kc, KN_PARAM_XTOL, tmp, 1024)
-    header = KNITRO.knitro_version() >= v"15" ? "" : "# "
-    @test _to_string(tmp) ==
-          "$(header)Step size tolerance used for terminating the optimization.\n"
+    @test _to_string(tmp) == "Step size tolerance used for terminating the optimization.\n"
     KN_get_param_type(kc, KN_PARAM_XTOL, pCint)
     @test pCint[] == KN_PARAMTYPE_FLOAT
     KN_get_num_param_values(kc, KN_PARAM_XTOL, pCint)
@@ -212,21 +204,19 @@ end
     KN_set_con_upbnds_all(kc, [2 * 2 * 0.99])
 
     # Test getters.
-    if KNITRO.knitro_version() >= v"12.0"
-        xindex = Cint[0, 1, 2]
-        ret = zeros(Cdouble, 3)
-        KN_get_var_lobnds(kc, 3, xindex, ret)
-        @test ret == [0, 0.1, 0]
-        KN_get_var_upbnds(kc, 3, xindex, ret)
-        @test ret == [0.0, 2, 2]
-
-        cindex = Cint[0]
-        ret = zeros(Cdouble, 1)
-        KN_get_con_lobnds(kc, 1, cindex, ret)
-        @test ret == [0.1]
-        KN_get_con_upbnds(kc, 1, cindex, ret)
-        @test ret == [2 * 2 * 0.99]
-    end
+    xindex = Cint[0, 1, 2]
+    ret = zeros(Cdouble, 3)
+    KN_get_var_lobnds(kc, 3, xindex, ret)
+    @test ret == [0, 0.1, 0]
+    KN_get_var_upbnds(kc, 3, xindex, ret)
+    @test ret == [0.0, 2, 2]
+
+    cindex = Cint[0]
+    ret = zeros(Cdouble, 1)
+    KN_get_con_lobnds(kc, 1, cindex, ret)
+    @test ret == [0.1]
+    KN_get_con_upbnds(kc, 1, cindex, ret)
+    @test ret == [2 * 2 * 0.99]
 
     # Load quadratic structure x1*x2 for the constraint.
     KN_add_con_quadratic_struct(kc, 1, Cint[0], Cint[1], Cint[2], [1.0])
@@ -298,17 +288,15 @@ end
     @test objSol ≈ 31.363 atol = 1e-3
 
     # Test getters for primal and dual variables
-    if KNITRO.knitro_version() >= v"12.0"
-        xopt = zeros(Cdouble, 3)
-        KN_get_var_primal_values(kc, 3, Cint[0, 1, 2], xopt)
-        @test xopt == x
-        rc = zeros(Cdouble, 3)
-        KN_get_var_dual_values(kc, 3, Cint[0, 1, 2], rc)
-        @test rc == lambda_[2:4]
-        dual = zeros(Cdouble, 1)
-        KN_get_con_dual_values(kc, 1, Cint[0], dual)
-        @test dual == [lambda_[1]]
-    end
+    xopt = zeros(Cdouble, 3)
+    KN_get_var_primal_values(kc, 3, Cint[0, 1, 2], xopt)
+    @test xopt == x
+    rc = zeros(Cdouble, 3)
+    KN_get_var_dual_values(kc, 3, Cint[0, 1, 2], rc)
+    @test rc == lambda_[2:4]
+    dual = zeros(Cdouble, 1)
+    KN_get_con_dual_values(kc, 1, Cint[0], dual)
+    @test dual == [lambda_[1]]
 
     KN_free(kc)
 end
@@ -692,9 +680,6 @@ end
 end
 
 @testset "Knitro violation information" begin
-    if KNITRO.knitro_version() < v"12.4"
-        return 0
-    end
     #*------------------------------------------------------------------*
     #*     FUNCTION callbackEvalFC                                      *
     #*------------------------------------------------------------------*
@@ -790,9 +775,6 @@ end
 end
 
 @testset "Knitro structural manipulation" begin
-    if KNITRO.knitro_version() < v"12.4"
-        return 0
-    end
     #*------------------------------------------------------------------*
     #*     FUNCTION callbackEvalFC                                      *
     #*------------------------------------------------------------------*

test/MOI_wrapper.jl

@@ -296,11 +296,7 @@ function test_RawOptimizerParameter_tuner_file()
     @test MOI.supports(model, MOI.RawOptimizerAttribute("tuner_file"))
     dir = mktempdir()
     filename = joinpath(dir, "tuner_file")
-    if KNITRO.knitro_version() >= v"15"
-        write(filename, "nlp_algorithm")
-    else
-        write(filename, "algorithm")
-    end
+    write(filename, "nlp_algorithm")
     MOI.set(model, MOI.RawOptimizerAttribute("tuner_file"), filename)
     return
 end