Skip to content

Commit

Permalink
Use CUTEst_jll.jl v2.2.2 (#373)
Browse files Browse the repository at this point in the history
* Use CUTEst_jll.jl v2.2.2

* The size of the vector time was modified in ureport and creport...
  • Loading branch information
amontoison authored Aug 22, 2024
1 parent 7e7e6fe commit df91b3c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SIFDecode_jll = "54dcf436-342f-53ea-8005-3708a1ae6c8c"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

[compat]
CUTEst_jll = "=2.0.7"
CUTEst_jll = "=2.2.2"
SIFDecode_jll = "2.6.0"
Combinatorics = "1.0"
DataStructures = "0.17, 0.18"
Expand Down
2 changes: 1 addition & 1 deletion gen/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"

[compat]
julia = "1.6"
CUTEst_jll = "2.2.0"
CUTEst_jll = "2.2.2"
2 changes: 1 addition & 1 deletion gen/wrapper.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using JuliaFormatter

function main()
cd(@__DIR__)
include_dir = "/home/alexis/Applications/CUTEst/include" # joinpath(CUTEst_jll.artifact_dir, "include")
include_dir = joinpath(CUTEst_jll.artifact_dir, "include")
headers = map(header -> joinpath(include_dir, header), ["cutest.h"])

options = load_options(joinpath(@__DIR__, "cutest.toml"))
Expand Down
6 changes: 4 additions & 2 deletions test/coverage.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ function coverage_increase(nlp::CUTEstModel{Float64})
varnames(Float64, status, Cint[n], vname)
if m == 0
unames(Float64, status, Cint[n], pname, vname)
calls, time = Vector{Float64}(undef, 4), Vector{Float64}(undef, 2)
calls = Vector{Float64}(undef, 4)
time = Vector{Float64}(undef, 4)
ureport(Float64, status, calls, time)
else
cname = Matrix{Cchar}(undef, 10, m)
connames(Float64, status, Cint[m], cname)
cnames(Float64, status, Cint[n], Cint[m], pname, vname, cname)
calls, time = Vector{Float64}(undef, 7), Vector{Float64}(undef, 2)
calls = Vector{Float64}(undef, 7)
time = Vector{Float64}(undef, 4)
creport(Float64, status, calls, time)
nvo, nvc, ec, lc = Cint[0], Cint[0], Cint[0], Cint[0]
cstats(Float64, status, nvo, nvc, ec, lc)
Expand Down

0 comments on commit df91b3c

Please sign in to comment.