Skip to content

Commit 07c6afb

Browse files
github-actions[bot]amontoison
github-actions[bot]
and
amontoison
authored
🤖 Format .jl files (#254)
Co-authored-by: amontoison <[email protected]>
1 parent 4f55b76 commit 07c6afb

File tree

6 files changed

+19
-27
lines changed

6 files changed

+19
-27
lines changed

‎src/ad_api.jl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ end
139139

140140
function get_residual_nnzh(
141141
b::ADModelBackend{GB, HvB, JvB, JtvB, JB, HB, GHJ, HvBLS, JvBLS, JtvBLS, JBLS, HBLS},
142-
nvar) where {GB, HvB, JvB, JtvB, JB, HB, GHJ, HvBLS, JvBLS, JtvBLS, JBLS, HBLS <: AbstractNLPModel}
142+
nvar,
143+
) where {GB, HvB, JvB, JtvB, JB, HB, GHJ, HvBLS, JvBLS, JtvBLS, JBLS, HBLS <: AbstractNLPModel}
143144
nls = b.hessian_residual_backend
144145
nls.nls_meta.nnzh
145146
end

‎src/nls.jl‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,7 @@ function ADNLSModel!(
166166
meta = NLPModelMeta{T, S}(nvar, x0 = x0, nnzh = nnzh, name = name, minimize = minimize)
167167
nls_nnzj = get_residual_nnzj(adbackend, nvar, nequ)
168168
nls_nnzh = get_residual_nnzh(adbackend, nvar)
169-
nls_meta =
170-
NLSMeta{T, S}(nequ, nvar, nnzj = nls_nnzj, nnzh = nls_nnzh, lin = linequ)
169+
nls_meta = NLSMeta{T, S}(nequ, nvar, nnzj = nls_nnzj, nnzh = nls_nnzh, lin = linequ)
171170
return ADNLSModel(meta, nls_meta, NLSCounters(), adbackend, F!, (cx, x) -> cx)
172171
end
173172

@@ -212,8 +211,7 @@ function ADNLSModel!(
212211
)
213212
nls_nnzj = get_residual_nnzj(adbackend, nvar, nequ)
214213
nls_nnzh = get_residual_nnzh(adbackend, nvar)
215-
nls_meta =
216-
NLSMeta{T, S}(nequ, nvar, nnzj = nls_nnzj, nnzh = nls_nnzh, lin = linequ)
214+
nls_meta = NLSMeta{T, S}(nequ, nvar, nnzj = nls_nnzj, nnzh = nls_nnzh, lin = linequ)
217215
return ADNLSModel(meta, nls_meta, NLSCounters(), adbackend, F!, (cx, x) -> cx)
218216
end
219217

@@ -275,8 +273,7 @@ function ADNLSModel!(
275273
)
276274
nls_nnzj = get_residual_nnzj(adbackend, nvar, nequ)
277275
nls_nnzh = get_residual_nnzh(adbackend, nvar)
278-
nls_meta =
279-
NLSMeta{T, S}(nequ, nvar, nnzj = nls_nnzj, nnzh = nls_nnzh, lin = linequ)
276+
nls_meta = NLSMeta{T, S}(nequ, nvar, nnzj = nls_nnzj, nnzh = nls_nnzh, lin = linequ)
280277
return ADNLSModel(meta, nls_meta, NLSCounters(), adbackend, F!, c!)
281278
end
282279

@@ -426,8 +423,7 @@ function ADNLSModel!(
426423
)
427424
nls_nnzj = get_residual_nnzj(adbackend, nvar, nequ)
428425
nls_nnzh = get_residual_nnzh(adbackend, nvar)
429-
nls_meta =
430-
NLSMeta{T, S}(nequ, nvar, nnzj = nls_nnzj, nnzh = nls_nnzh, lin = linequ)
426+
nls_meta = NLSMeta{T, S}(nequ, nvar, nnzj = nls_nnzj, nnzh = nls_nnzh, lin = linequ)
431427
return ADNLSModel(meta, nls_meta, NLSCounters(), adbackend, F!, clinrows, clincols, clinvals, c!)
432428
end
433429

@@ -644,8 +640,7 @@ function ADNLSModel!(
644640
)
645641
nls_nnzj = get_residual_nnzj(adbackend, nvar, nequ)
646642
nls_nnzh = get_residual_nnzh(adbackend, nvar)
647-
nls_meta =
648-
NLSMeta{T, S}(nequ, nvar, nnzj = nls_nnzj, nnzh = nls_nnzh, lin = linequ)
643+
nls_meta = NLSMeta{T, S}(nequ, nvar, nnzj = nls_nnzj, nnzh = nls_nnzh, lin = linequ)
649644
return ADNLSModel(meta, nls_meta, NLSCounters(), adbackend, F!, c!)
650645
end
651646

@@ -750,8 +745,7 @@ function ADNLSModel!(
750745
)
751746
nls_nnzj = get_residual_nnzj(adbackend, nvar, nequ)
752747
nls_nnzh = get_residual_nnzh(adbackend, nvar)
753-
nls_meta =
754-
NLSMeta{T, S}(nequ, nvar, nnzj = nls_nnzj, nnzh = nls_nnzh, lin = linequ)
748+
nls_meta = NLSMeta{T, S}(nequ, nvar, nnzj = nls_nnzj, nnzh = nls_nnzh, lin = linequ)
755749
return ADNLSModel(meta, nls_meta, NLSCounters(), adbackend, F!, clinrows, clincols, clinvals, c!)
756750
end
757751

‎test/sparse_hessian.jl‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
list_sparse_hess_backend =
2-
((ADNLPModels.SparseADHessian, Dict()),
3-
(ADNLPModels.SparseReverseADHessian, Dict()),
4-
(ADNLPModels.ForwardDiffADHessian, Dict()))
1+
list_sparse_hess_backend = (
2+
(ADNLPModels.SparseADHessian, Dict()),
3+
(ADNLPModels.SparseReverseADHessian, Dict()),
4+
(ADNLPModels.ForwardDiffADHessian, Dict()),
5+
)
56

67
dt = (Float32, Float64)
78

‎test/sparse_hessian_nls.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dt = (Float32, Float64)
2828
hess_coord_residual!(nls, x, v, vals)
2929
@test eltype(vals) == T
3030
H = Symmetric(sparse(rows, cols, vals, nvar, nvar), :L)
31-
@test H == [-20 * v[2] 0; 0 0]
31+
@test H == [-20*v[2] 0; 0 0]
3232

3333
# Test also the implementation of the backends
3434
b = nls.adbackend.hessian_residual_backend
@@ -37,7 +37,7 @@ dt = (Float32, Float64)
3737
ADNLPModels.hess_coord_residual!(b, nls, x, v, vals)
3838
@test eltype(vals) == T
3939
H = Symmetric(sparse(rows, cols, vals, nvar, nvar), :L)
40-
@test H == [-20 * v[2] 0; 0 0]
40+
@test H == [-20*v[2] 0; 0 0]
4141

4242
nls = ADNLPModels.ADNLSModel!(F!, x0, 3, matrix_free = true; kw...)
4343
@test nls.adbackend.hessian_backend isa ADNLPModels.EmptyADbackend

‎test/sparse_jacobian.jl‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
list_sparse_jac_backend = (
2-
(ADNLPModels.SparseADJacobian, Dict()),
3-
(ADNLPModels.ForwardDiffADJacobian, Dict()),
4-
)
1+
list_sparse_jac_backend =
2+
((ADNLPModels.SparseADJacobian, Dict()), (ADNLPModels.ForwardDiffADJacobian, Dict()))
53

64
dt = (Float32, Float64)
75

‎test/sparse_jacobian_nls.jl‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
list_sparse_jac_backend = (
2-
(ADNLPModels.SparseADJacobian, Dict()),
3-
(ADNLPModels.ForwardDiffADJacobian, Dict()),
4-
)
1+
list_sparse_jac_backend =
2+
((ADNLPModels.SparseADJacobian, Dict()), (ADNLPModels.ForwardDiffADJacobian, Dict()))
53

64
dt = (Float32, Float64)
75

0 commit comments

Comments
 (0)