From e94556294415330cdea82c8cdf6e4963a0a27029 Mon Sep 17 00:00:00 2001 From: Sungho Shin Date: Sun, 4 Aug 2024 20:08:50 +0000 Subject: [PATCH 1/4] nln_nnzj added --- src/nlp.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/nlp.jl b/src/nlp.jl index f62cab42..a265f5f4 100644 --- a/src/nlp.jl +++ b/src/nlp.jl @@ -232,6 +232,8 @@ function ExaModel(c::C; prod = nothing) where {C<:ExaCore} c.nvar, ncon = c.ncon, nnzj = c.nnzj, + lin_nnzj = 0, # fixes Issue #104 + nln_nnzj = c.nnzj, # fixes Issue #104 nnzh = c.nnzh, x0 = c.x0, lvar = c.lvar, From 27d4a8a3630e0072fc28ee13b83d1fb5220f10b5 Mon Sep 17 00:00:00 2001 From: Sungho Shin Date: Sun, 4 Aug 2024 20:18:20 +0000 Subject: [PATCH 2/4] utils fixed --- src/nlp.jl | 2 +- src/utils.jl | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/nlp.jl b/src/nlp.jl index a265f5f4..8e3dd3f8 100644 --- a/src/nlp.jl +++ b/src/nlp.jl @@ -233,7 +233,7 @@ function ExaModel(c::C; prod = nothing) where {C<:ExaCore} ncon = c.ncon, nnzj = c.nnzj, lin_nnzj = 0, # fixes Issue #104 - nln_nnzj = c.nnzj, # fixes Issue #104 + nln_nnzj = nnzj, # fixes Issue #104 nnzh = c.nnzh, x0 = c.x0, lvar = c.lvar, diff --git a/src/utils.jl b/src/utils.jl index 9185b06b..a8ff0d57 100644 --- a/src/utils.jl +++ b/src/utils.jl @@ -112,6 +112,8 @@ function WrapperNLPModel(VT, m) lcon = lcon, ucon = ucon, nnzj = nnzj, + lin_nnzj = 0, # fixes Issue #104 + nln_nnzj = nnzj, # fixes Issue #104 nnzh = nnzh, minimize = m.meta.minimize, ), From 7334d962f29c436fdb201a67576f61d1d7af8a28 Mon Sep 17 00:00:00 2001 From: Sungho Shin Date: Sun, 4 Aug 2024 20:25:49 +0000 Subject: [PATCH 3/4] KA fix --- ext/ExaModelsKernelAbstractions.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ext/ExaModelsKernelAbstractions.jl b/ext/ExaModelsKernelAbstractions.jl index 2a3885a7..fd00c6fc 100644 --- a/ext/ExaModelsKernelAbstractions.jl +++ b/ext/ExaModelsKernelAbstractions.jl @@ -117,6 +117,8 @@ function ExaModels.ExaModel( c.nvar, ncon = c.ncon, nnzj = c.nnzj, + lin_nnzj = 0, # fixes Issue #104 + nln_nnzj = nnzj, # fixes Issue #104 nnzh = c.nnzh, x0 = c.x0, lvar = c.lvar, From 9d0d86d0baacfd4ac17c67779be73df106a8620d Mon Sep 17 00:00:00 2001 From: Sungho Shin Date: Sun, 4 Aug 2024 20:33:47 +0000 Subject: [PATCH 4/4] nnzj var name --- ext/ExaModelsKernelAbstractions.jl | 2 +- src/nlp.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/ExaModelsKernelAbstractions.jl b/ext/ExaModelsKernelAbstractions.jl index fd00c6fc..0c96efb0 100644 --- a/ext/ExaModelsKernelAbstractions.jl +++ b/ext/ExaModelsKernelAbstractions.jl @@ -118,7 +118,7 @@ function ExaModels.ExaModel( ncon = c.ncon, nnzj = c.nnzj, lin_nnzj = 0, # fixes Issue #104 - nln_nnzj = nnzj, # fixes Issue #104 + nln_nnzj = c.nnzj, # fixes Issue #104 nnzh = c.nnzh, x0 = c.x0, lvar = c.lvar, diff --git a/src/nlp.jl b/src/nlp.jl index 8e3dd3f8..dd59e9b2 100644 --- a/src/nlp.jl +++ b/src/nlp.jl @@ -233,7 +233,7 @@ function ExaModel(c::C; prod = nothing) where {C<:ExaCore} ncon = c.ncon, nnzj = c.nnzj, lin_nnzj = 0, # fixes Issue #104 - nln_nnzj = nnzj, # fixes Issue #104 + nln_nnzj = c.nnzj, # fixes Issue #104 nnzh = c.nnzh, x0 = c.x0, lvar = c.lvar,