Skip to content

Commit 1fe420b

Browse files
🤖 Format .jl files (#313)
Co-authored-by: amontoison <amontoison@users.noreply.github.com>
1 parent 06d623f commit 1fe420b

File tree

5 files changed

+65
-57
lines changed

5 files changed

+65
-57
lines changed

src/sparsity_pattern.jl

Lines changed: 47 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -74,57 +74,65 @@ Supported backends include `SparseADJacobian`, `SparseADHessian`, and `SparseRev
7474
* `S`: A sparse matrix of type `SparseMatrixCSC{Bool,Int}` indicating the sparsity pattern of the requested derivative.
7575
"""
7676
function get_sparsity_pattern(model::ADModel, derivative::Symbol)
77-
get_sparsity_pattern(model, Val(derivative))
77+
get_sparsity_pattern(model, Val(derivative))
7878
end
7979

8080
function get_sparsity_pattern(model::ADModel, ::Val{:jacobian})
81-
backend = model.adbackend.jacobian_backend
82-
validate_sparse_backend(backend, SparseADJacobian, "Jacobian")
83-
m = model.meta.ncon
84-
n = model.meta.nvar
85-
colptr = backend.colptr
86-
rowval = backend.rowval
87-
nnzJ = length(rowval)
88-
nzval = ones(Bool, nnzJ)
89-
SparseMatrixCSC(m, n, colptr, rowval, nzval)
81+
backend = model.adbackend.jacobian_backend
82+
validate_sparse_backend(backend, SparseADJacobian, "Jacobian")
83+
m = model.meta.ncon
84+
n = model.meta.nvar
85+
colptr = backend.colptr
86+
rowval = backend.rowval
87+
nnzJ = length(rowval)
88+
nzval = ones(Bool, nnzJ)
89+
SparseMatrixCSC(m, n, colptr, rowval, nzval)
9090
end
9191

9292
function get_sparsity_pattern(model::ADModel, ::Val{:hessian})
93-
backend = model.adbackend.hessian_backend
94-
validate_sparse_backend(backend, Union{SparseADHessian, SparseReverseADHessian}, "Hessian")
95-
n = model.meta.nvar
96-
colptr = backend.colptr
97-
rowval = backend.rowval
98-
nnzH = length(rowval)
99-
nzval = ones(Bool, nnzH)
100-
SparseMatrixCSC(n, n, colptr, rowval, nzval)
93+
backend = model.adbackend.hessian_backend
94+
validate_sparse_backend(backend, Union{SparseADHessian, SparseReverseADHessian}, "Hessian")
95+
n = model.meta.nvar
96+
colptr = backend.colptr
97+
rowval = backend.rowval
98+
nnzH = length(rowval)
99+
nzval = ones(Bool, nnzH)
100+
SparseMatrixCSC(n, n, colptr, rowval, nzval)
101101
end
102102

103103
function get_sparsity_pattern(model::AbstractADNLSModel, ::Val{:jacobian_residual})
104-
backend = model.adbackend.jacobian_residual_backend
105-
validate_sparse_backend(backend, SparseADJacobian, "Jacobian of the residual")
106-
m = model.nls_meta.nequ
107-
n = model.meta.nvar
108-
colptr = backend.colptr
109-
rowval = backend.rowval
110-
nnzJ = length(rowval)
111-
nzval = ones(Bool, nnzJ)
112-
SparseMatrixCSC(m, n, colptr, rowval, nzval)
104+
backend = model.adbackend.jacobian_residual_backend
105+
validate_sparse_backend(backend, SparseADJacobian, "Jacobian of the residual")
106+
m = model.nls_meta.nequ
107+
n = model.meta.nvar
108+
colptr = backend.colptr
109+
rowval = backend.rowval
110+
nnzJ = length(rowval)
111+
nzval = ones(Bool, nnzJ)
112+
SparseMatrixCSC(m, n, colptr, rowval, nzval)
113113
end
114114

115115
function get_sparsity_pattern(model::AbstractADNLSModel, ::Val{:hessian_residual})
116-
backend = model.adbackend.hessian_residual_backend
117-
validate_sparse_backend(backend, Union{SparseADHessian, SparseReverseADHessian}, "Hessian of the residual")
118-
n = model.meta.nvar
119-
colptr = backend.colptr
120-
rowval = backend.rowval
121-
nnzH = length(rowval)
122-
nzval = ones(Bool, nnzH)
123-
SparseMatrixCSC(n, n, colptr, rowval, nzval)
116+
backend = model.adbackend.hessian_residual_backend
117+
validate_sparse_backend(
118+
backend,
119+
Union{SparseADHessian, SparseReverseADHessian},
120+
"Hessian of the residual",
121+
)
122+
n = model.meta.nvar
123+
colptr = backend.colptr
124+
rowval = backend.rowval
125+
nnzH = length(rowval)
126+
nzval = ones(Bool, nnzH)
127+
SparseMatrixCSC(n, n, colptr, rowval, nzval)
124128
end
125129

126-
function validate_sparse_backend(backend::B, expected_type, derivative_name::String) where {B <: ADBackend}
127-
if !(backend isa expected_type)
128-
error("The current backend $B doesn't compute a sparse $derivative_name.")
129-
end
130+
function validate_sparse_backend(
131+
backend::B,
132+
expected_type,
133+
derivative_name::String,
134+
) where {B <: ADBackend}
135+
if !(backend isa expected_type)
136+
error("The current backend $B doesn't compute a sparse $derivative_name.")
137+
end
130138
end

test/sparse_hessian.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ dt = (Float32, Float64)
6565

6666
if (backend == ADNLPModels.SparseADHessian) || (backend == ADNLPModels.SparseReverseADHessian)
6767
H_sp = get_sparsity_pattern(nlp, :hessian)
68-
@test H_sp == SparseMatrixCSC{Bool, Int}(
69-
[ 1 0 ;
70-
1 1 ]
71-
)
68+
@test H_sp == SparseMatrixCSC{Bool, Int}([
69+
1 0
70+
1 1
71+
])
7272
end
7373

7474
nlp = ADNLPModel!(

test/sparse_hessian_nls.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ dt = (Float32, Float64)
5252

5353
if (backend == ADNLPModels.SparseADHessian) || (backend == ADNLPModels.SparseReverseADHessian)
5454
H_sp = get_sparsity_pattern(nls, :hessian_residual)
55-
@test H_sp == SparseMatrixCSC{Bool, Int}(
56-
[ 1 0 ;
57-
0 0 ]
58-
)
55+
@test H_sp == SparseMatrixCSC{Bool, Int}([
56+
1 0
57+
0 0
58+
])
5959
end
6060

6161
nls = ADNLPModels.ADNLSModel!(F!, x0, 3, matrix_free = true; kw...)

test/sparse_jacobian.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ dt = (Float32, Float64)
5353

5454
if backend == ADNLPModels.SparseADJacobian
5555
J_sp = get_sparsity_pattern(nlp, :jacobian)
56-
@test J_sp == SparseMatrixCSC{Bool, Int}(
57-
[ 1 0 ;
58-
1 1 ;
59-
0 1 ]
60-
)
56+
@test J_sp == SparseMatrixCSC{Bool, Int}([
57+
1 0
58+
1 1
59+
0 1
60+
])
6161
end
6262

6363
nlp = ADNLPModel!(x -> sum(x), x0, c!, zeros(T, ncon), zeros(T, ncon), matrix_free = true; kw...)

test/sparse_jacobian_nls.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ dt = (Float32, Float64)
4545

4646
if backend == ADNLPModels.SparseADJacobian
4747
J_sp = get_sparsity_pattern(nls, :jacobian_residual)
48-
@test J_sp == SparseMatrixCSC{Bool, Int}(
49-
[ 1 0 ;
50-
1 1 ;
51-
0 1 ]
52-
)
48+
@test J_sp == SparseMatrixCSC{Bool, Int}([
49+
1 0
50+
1 1
51+
0 1
52+
])
5353
end
5454

5555
nls = ADNLPModels.ADNLSModel!(F!, x0, 3, matrix_free = true; kw...)

0 commit comments

Comments
 (0)