Skip to content

Commit e5e8543

Browse files
S to A for sparsity pattern
1 parent 4bda49a commit e5e8543

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

ext/OptimizationZygoteExt.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ function OptimizationBase.instantiate_function(
332332
function hess(res, θ)
333333
hessian!(f.f, res, prep_hess, soadtype, θ, Constant(p))
334334
end
335-
hess_sparsity = prep_hess.coloring_result.S
335+
hess_sparsity = prep_hess.coloring_result.A
336336
hess_colors = prep_hess.coloring_result.color
337337

338338
if p !== SciMLBase.NullParameters() && p !== nothing
@@ -415,7 +415,7 @@ function OptimizationBase.instantiate_function(
415415
J = vec(J)
416416
end
417417
end
418-
cons_jac_prototype = prep_jac.coloring_result.S
418+
cons_jac_prototype = prep_jac.coloring_result.A
419419
cons_jac_colorvec = prep_jac.coloring_result.color
420420
elseif cons !== nothing && cons_j == true
421421
cons_j! = (J, θ) -> f.cons_j(J, θ, p)
@@ -455,7 +455,7 @@ function OptimizationBase.instantiate_function(
455455
prep_cons_hess = [prepare_hessian(cons_oop, soadtype, x, Constant(i))
456456
for i in 1:num_cons]
457457
colores = getfield.(prep_cons_hess, :coloring_result)
458-
conshess_sparsity = getfield.(colores, :S)
458+
conshess_sparsity = getfield.(colores, :A)
459459
conshess_colors = getfield.(colores, :color)
460460
function cons_h!(H, θ)
461461
for i in 1:num_cons
@@ -474,7 +474,7 @@ function OptimizationBase.instantiate_function(
474474
lag_extras = prepare_hessian(
475475
lagrangian, soadtype, x, Constant(one(eltype(x))),
476476
Constant(ones(eltype(x), num_cons)), Constant(p))
477-
lag_hess_prototype = lag_extras.coloring_result.S
477+
lag_hess_prototype = lag_extras.coloring_result.A
478478
lag_hess_colors = lag_extras.coloring_result.color
479479

480480
function lag_h!(H::AbstractMatrix, θ, σ, λ)

src/OptimizationDISparseExt.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function instantiate_function(
6565
function hess(res, θ)
6666
hessian!(f.f, res, prep_hess, soadtype, θ, Constant(p))
6767
end
68-
hess_sparsity = prep_hess.coloring_result.S
68+
hess_sparsity = prep_hess.coloring_result.A
6969
hess_colors = prep_hess.coloring_result.color
7070

7171
if p !== SciMLBase.NullParameters() && p !== nothing
@@ -147,7 +147,7 @@ function instantiate_function(
147147
J = vec(J)
148148
end
149149
end
150-
cons_jac_prototype = prep_jac.coloring_result.S
150+
cons_jac_prototype = prep_jac.coloring_result.A
151151
cons_jac_colorvec = prep_jac.coloring_result.color
152152
elseif cons_j === true && f.cons !== nothing
153153
cons_j! = (J, θ) -> f.cons_j(J, θ, p)
@@ -185,7 +185,7 @@ function instantiate_function(
185185
prep_cons_hess = [prepare_hessian(cons_oop, soadtype, x, Constant(i))
186186
for i in 1:num_cons]
187187
colores = getfield.(prep_cons_hess, :coloring_result)
188-
conshess_sparsity = getfield.(colores, :S)
188+
conshess_sparsity = getfield.(colores, :A)
189189
conshess_colors = getfield.(colores, :color)
190190
function cons_h!(H, θ)
191191
for i in 1:num_cons
@@ -204,7 +204,7 @@ function instantiate_function(
204204
lag_prep = prepare_hessian(
205205
lagrangian, soadtype, x, Constant(one(eltype(x))),
206206
Constant(ones(eltype(x), num_cons)), Constant(p))
207-
lag_hess_prototype = lag_prep.coloring_result.S
207+
lag_hess_prototype = lag_prep.coloring_result.A
208208
lag_hess_colors = lag_prep.coloring_result.color
209209

210210
function lag_h!(H::AbstractMatrix, θ, σ, λ)
@@ -357,7 +357,7 @@ function instantiate_function(
357357
function hess(θ)
358358
hessian(f.f, prep_hess, soadtype, θ, Constant(p))
359359
end
360-
hess_sparsity = prep_hess.coloring_result.S
360+
hess_sparsity = prep_hess.coloring_result.A
361361
hess_colors = prep_hess.coloring_result.color
362362

363363
if p !== SciMLBase.NullParameters() && p !== nothing
@@ -410,7 +410,7 @@ function instantiate_function(
410410
end
411411
return J
412412
end
413-
cons_jac_prototype = prep_jac.coloring_result.S
413+
cons_jac_prototype = prep_jac.coloring_result.A
414414
cons_jac_colorvec = prep_jac.coloring_result.color
415415
elseif cons_j === true && f.cons !== nothing
416416
cons_j! = (θ) -> f.cons_j(θ, p)
@@ -459,7 +459,7 @@ function instantiate_function(
459459
return H
460460
end
461461
colores = getfield.(prep_cons_hess, :coloring_result)
462-
conshess_sparsity = getfield.(colores, :S)
462+
conshess_sparsity = getfield.(colores, :A)
463463
conshess_colors = getfield.(colores, :color)
464464
elseif cons_h == true && f.cons !== nothing
465465
cons_h! = (res, θ) -> f.cons_h(res, θ, p)
@@ -482,7 +482,7 @@ function instantiate_function(
482482
return hess
483483
end
484484
end
485-
lag_hess_prototype = lag_prep.coloring_result.S
485+
lag_hess_prototype = lag_prep.coloring_result.A
486486
lag_hess_colors = lag_prep.coloring_result.color
487487

488488
if p !== SciMLBase.NullParameters() && p !== nothing

0 commit comments

Comments
 (0)