Skip to content

Update for NLPModels 0.22 #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update for NLPModels 0.22 #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92d9572
update for latest NLPModels
klamike Nov 17, 2025
8da8f4d
bump compat
klamike Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SparseMatrixColorings = "0a514795-09f3-496d-8182-132a7b665d35"
[compat]
ADTypes = "1.2.1"
ForwardDiff = "0.9, 0.10, 1"
NLPModels = "0.21.5"
NLPModels = "0.22"
Requires = "1"
ReverseDiff = "1"
SparseConnectivityTracer = "1.0"
Expand Down
8 changes: 4 additions & 4 deletions src/ADNLPModels.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function ADNLPModel!(model::AbstractNLPModel; kwargs...)
model.meta.x0,
model.meta.lvar,
model.meta.uvar,
jac_lin(model, model.meta.x0),
jac_lin(model),
(cx, x) -> cons!(model, x, cx),
model.meta.lcon,
model.meta.ucon;
Expand Down Expand Up @@ -71,7 +71,7 @@ function ADNLPModel(model::AbstractNLPModel; kwargs...)
model.meta.x0,
model.meta.lvar,
model.meta.uvar,
jac_lin(model, model.meta.x0),
jac_lin(model),
model_c,
model.meta.lcon,
model.meta.ucon;
Expand Down Expand Up @@ -110,7 +110,7 @@ function ADNLSModel(model::AbstractNLSModel; kwargs...)
model.nls_meta.nequ,
model.meta.lvar,
model.meta.uvar,
jac_lin(model, model.meta.x0),
jac_lin(model),
model_c,
model.meta.lcon,
model.meta.ucon;
Expand Down Expand Up @@ -139,7 +139,7 @@ function ADNLSModel!(model::AbstractNLSModel; kwargs...)
model.nls_meta.nequ,
model.meta.lvar,
model.meta.uvar,
jac_lin(model, model.meta.x0),
jac_lin(model),
(cx, x) -> cons!(model, x, cx),
model.meta.lcon,
model.meta.ucon;
Expand Down
17 changes: 7 additions & 10 deletions src/nlp.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,8 +581,7 @@ function NLPModels.jac_nln_structure!(
return jac_structure!(nlp.adbackend.jacobian_backend, nlp, rows, cols)
end

function NLPModels.jac_lin_coord!(nlp::ADModel, x::AbstractVector, vals::AbstractVector)
@lencheck nlp.meta.nvar x
function NLPModels.jac_lin_coord!(nlp::ADModel, vals::AbstractVector)
@lencheck nlp.meta.lin_nnzj vals
increment!(nlp, :neval_jac_lin)
vals .= nlp.clinvals
Expand All @@ -598,11 +597,10 @@ end

function NLPModels.jprod_lin!(
nlp::ADModel,
x::AbstractVector,
v::AbstractVector,
Jv::AbstractVector{T},
) where {T}
@lencheck nlp.meta.nvar x v
Jv::AbstractVector,
)
@lencheck nlp.meta.nvar v
@lencheck nlp.meta.nlin Jv
increment!(nlp, :neval_jprod_lin)
coo_prod!(nlp.clinrows, nlp.clincols, nlp.clinvals, v, Jv)
Expand Down Expand Up @@ -646,11 +644,10 @@ end

function NLPModels.jtprod_lin!(
nlp::ADModel,
x::AbstractVector,
v::AbstractVector,
Jtv::AbstractVector{T},
) where {T}
@lencheck nlp.meta.nvar x Jtv
Jtv::AbstractVector,
)
@lencheck nlp.meta.nvar Jtv
@lencheck nlp.meta.nlin v
increment!(nlp, :neval_jtprod_lin)
coo_prod!(nlp.clincols, nlp.clinrows, nlp.clinvals, v, Jtv)
Expand Down
8 changes: 4 additions & 4 deletions test/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
[compat]
ForwardDiff = "0.10"
ManualNLPModels = "0.1"
NLPModels = "0.21"
NLPModelsModifiers = "0.7"
NLPModelsTest = "0.10"
NLPModels = "0.22"
NLPModelsModifiers = "0.8"
NLPModelsTest = "0.11"
ReverseDiff = "1"
SparseMatrixColorings = "0.4.0"
SparseMatrixColorings = "0.4.0"
Loading