diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8b55ac6..c86c018 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -30,7 +30,7 @@ jobs: - x86 steps: - uses: actions/checkout@v3 - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} diff --git a/Project.toml b/Project.toml index f083c34..8c3da37 100644 --- a/Project.toml +++ b/Project.toml @@ -18,8 +18,8 @@ PRIMACUTEstExt = "CUTEst" PRIMANLPModelsExt = "NLPModels" [compat] -CUTEst = "0.13" -NLPModels = "0.20" +CUTEst = "1.0.1" +NLPModels = "0.21.3" PRIMA_jll = "0.7.1" Requires = "1" TypeUtils = "0.3" diff --git a/ext/PRIMACUTEstExt.jl b/ext/PRIMACUTEstExt.jl index 9f6e2f5..487e310 100644 --- a/ext/PRIMACUTEstExt.jl +++ b/ext/PRIMACUTEstExt.jl @@ -7,10 +7,10 @@ else end for func in (:uobyqa, :newuoa, :bobyqa, :lincoa, :cobyla, :prima) - @eval function PRIMA.$(Symbol(func,"_CUTEst"))(name::AbstractString; kwds...) - nlp = CUTEstModel(name) + @eval function PRIMA.$(Symbol(func,"_CUTEst"))(name::AbstractString; kwargs...) + nlp = CUTEstModel{Float64}(name) try - return $func(nlp; kwds...) + return $func(nlp; kwargs...) finally finalize(nlp) end diff --git a/test/runtests.jl b/test/runtests.jl index 76712d7..9fee61c 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,6 +1,8 @@ using PRIMA using Test, TypeUtils -Sys.WORD_SIZE > 32 && using CUTEst +if Sys.WORD_SIZE > 32 || Sys.iswindows() + using CUTEst +end optimizer_name(::typeof(PRIMA.uobyqa)) = "UOBYQA" optimizer_name(::typeof(PRIMA.newuoa)) = "NEWUOA" @@ -247,7 +249,7 @@ end f2(x, cx) = f2(x) n = 2 rhobeg = 1.0 - rhoend = 1e-6 + rhoend = 1e-5 ftarget = -Inf maxfun = 3000n npt = 2n + 1 @@ -381,7 +383,7 @@ end end end - if Sys.WORD_SIZE > 32 + if Sys.WORD_SIZE > 32 || Sys.iswindows() @testset "Unconstrained CUTEst problem $name" for name in ("TOINTQOR", "OSBORNEB", "LANCZOS1LS",) x1, res1 = @inferred PRIMA.prima_CUTEst(name; maxfun=5000) @test issuccess(res1)