Skip to content

Commit

Permalink
Use CUTEst.jl v1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
amontoison committed Aug 30, 2024
1 parent ee406df commit da8d5d3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 7 additions & 9 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit da8d5d3

Please sign in to comment.