From b7f00318db7d84af1ad1835ee1cf59ae7addfa7c Mon Sep 17 00:00:00 2001 From: "Klamkin, Michael" Date: Mon, 17 Nov 2025 18:33:52 -0500 Subject: [PATCH 1/2] update for latest NLPModels --- src/qpmodel.jl | 14 ++------------ test/Project.toml | 8 +++++++- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/qpmodel.jl b/src/qpmodel.jl index 0c80f7f..c211ec2 100644 --- a/src/qpmodel.jl +++ b/src/qpmodel.jl @@ -410,10 +410,8 @@ end function NLPModels.jac_lin_coord!( qp::QuadraticModel{T, S, M1, M2}, - x::AbstractVector, vals::AbstractVector, ) where {T, S, M1, M2 <: SparseMatrixCOO} - @lencheck qp.meta.nvar x @lencheck qp.meta.lin_nnzj vals NLPModels.increment!(qp, :neval_jac_lin) vals .= qp.data.A.vals @@ -422,10 +420,8 @@ end function NLPModels.jac_lin_coord!( qp::QuadraticModel{T, S, M1, M2}, - x::AbstractVector, vals::AbstractVector, ) where {T, S, M1, M2 <: SparseMatrixCSC} - @lencheck qp.meta.nvar x @lencheck qp.meta.lin_nnzj vals NLPModels.increment!(qp, :neval_jac_lin) fill_coord!(qp.data.A, vals, one(T)) @@ -434,10 +430,8 @@ end function NLPModels.jac_lin_coord!( qp::QuadraticModel{T, S, M1, M2}, - x::AbstractVector, vals::AbstractVector, ) where {T, S, M1, M2 <: Matrix} - @lencheck qp.meta.nvar x @lencheck qp.meta.lin_nnzj vals NLPModels.increment!(qp, :neval_jac_lin) count = 1 @@ -452,9 +446,7 @@ end function NLPModels.jac_lin( qp::QuadraticModel{T, S, M1, M2}, - x::AbstractVector, ) where {T, S, M1 <: AbstractLinearOperator, M2 <: AbstractLinearOperator} - @lencheck qp.meta.nvar x increment!(qp, :neval_jac_lin) return qp.data.A end @@ -493,11 +485,10 @@ NLPModels.hprod!( function NLPModels.jprod_lin!( qp::AbstractQuadraticModel, - x::AbstractVector, v::AbstractVector, Av::AbstractVector, ) - @lencheck qp.meta.nvar x v + @lencheck qp.meta.nvar v @lencheck qp.meta.nlin Av NLPModels.increment!(qp, :neval_jprod_lin) mul!(Av, qp.data.A, v) @@ -519,11 +510,10 @@ end function NLPModels.jtprod_lin!( qp::AbstractQuadraticModel, - x::AbstractVector, v::AbstractVector, Atv::AbstractVector, ) - @lencheck qp.meta.nvar x Atv + @lencheck qp.meta.nvar Atv @lencheck qp.meta.nlin v NLPModels.increment!(qp, :neval_jtprod_lin) mul!(Atv, transpose(qp.data.A), v) diff --git a/test/Project.toml b/test/Project.toml index 817d20b..11d3c57 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -21,5 +21,11 @@ NLPModelsModifiers = "0.7" NLPModelsTest = "0.10" QPSReader = "0.2" SolverCore = "0.3" -SparseConnectivityTracer = "0.6" +SparseConnectivityTracer = "1.0" SparseMatricesCOO = "0.2" + +[sources] +ADNLPModels = { path = "../../ADNLPModels.jl" } +NLPModelsTest = { path = "../../NLPModelsTest.jl" } +NLPModels = { path = "../../NLPModels.jl" } +NLPModelsModifiers = { path = "../../NLPModelsModifiers.jl" } \ No newline at end of file From 3c4d91313e76b9204d2119e5383c81ccfaebe1cc Mon Sep 17 00:00:00 2001 From: "Klamkin, Michael" Date: Thu, 20 Nov 2025 10:28:08 -0500 Subject: [PATCH 2/2] bump compat --- Project.toml | 4 ++-- test/Project.toml | 14 ++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Project.toml b/Project.toml index 6669031..7cbd971 100644 --- a/Project.toml +++ b/Project.toml @@ -20,8 +20,8 @@ QuadraticModelsQPSReaderExt = "QPSReader" [compat] LinearAlgebra = "1.10" LinearOperators = "2.3" -NLPModels = "0.21.5" -NLPModelsModifiers = "0.7" +NLPModels = "0.22" +NLPModelsModifiers = "0.8" QPSReader = "0.2.1" SolverCore = "0.3" SparseArrays = "1.10" diff --git a/test/Project.toml b/test/Project.toml index 11d3c57..0ef33c2 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -14,18 +14,12 @@ SparseMatricesCOO = "fa32481b-f100-4b48-8dc8-c62f61b13870" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [compat] -ADNLPModels = "0.8" +ADNLPModels = "0.9" LinearOperators = "2" -NLPModels = "0.21.5" -NLPModelsModifiers = "0.7" -NLPModelsTest = "0.10" +NLPModels = "0.22" +NLPModelsModifiers = "0.8" +NLPModelsTest = "0.11" QPSReader = "0.2" SolverCore = "0.3" SparseConnectivityTracer = "1.0" SparseMatricesCOO = "0.2" - -[sources] -ADNLPModels = { path = "../../ADNLPModels.jl" } -NLPModelsTest = { path = "../../NLPModelsTest.jl" } -NLPModels = { path = "../../NLPModels.jl" } -NLPModelsModifiers = { path = "../../NLPModelsModifiers.jl" } \ No newline at end of file