From da8d5d313f46aa2dc89b9f6845a22ff189424c68 Mon Sep 17 00:00:00 2001 From: Alexis Montoison Date: Thu, 29 Aug 2024 22:40:32 -0400 Subject: [PATCH] Use CUTEst.jl v1.0.0 --- .github/workflows/CI.yml | 2 +- Project.toml | 4 ++-- test/runtests.jl | 16 +++++++--------- 3 files changed, 10 insertions(+), 12 deletions(-) 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..f24e4f8 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.0" +NLPModels = "0.21.3" PRIMA_jll = "0.7.1" Requires = "1" TypeUtils = "0.3" diff --git a/test/runtests.jl b/test/runtests.jl index 76712d7..f91ce33 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,6 +1,6 @@ using PRIMA using Test, TypeUtils -Sys.WORD_SIZE > 32 && using CUTEst +using CUTEst optimizer_name(::typeof(PRIMA.uobyqa)) = "UOBYQA" optimizer_name(::typeof(PRIMA.newuoa)) = "NEWUOA" @@ -381,14 +381,12 @@ end end end - if Sys.WORD_SIZE > 32 - @testset "Unconstrained CUTEst problem $name" for name in ("TOINTQOR", "OSBORNEB", "LANCZOS1LS",) - x1, res1 = @inferred PRIMA.prima_CUTEst(name; maxfun=5000) - @test issuccess(res1) - x2, res2 = @inferred PRIMA.newuoa_CUTEst(name; maxfun=5000) - @test issuccess(res2) - @test x1 ≈ x2 - end + @testset "Unconstrained CUTEst problem $name" for name in ("TOINTQOR", "OSBORNEB", "LANCZOS1LS",) + x1, res1 = @inferred PRIMA.prima_CUTEst(name; maxfun=5000) + @test issuccess(res1) + x2, res2 = @inferred PRIMA.newuoa_CUTEst(name; maxfun=5000) + @test issuccess(res2) + @test x1 ≈ x2 end end