Skip to content

Commit baec734

Browse files
jClugstorjClugstor
committed
replace verbose::Bool with verbose::LinearVerbosity
1 parent 207585b commit baec734

18 files changed

+143
-143
lines changed

‎docs/src/advanced/developing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ struct MyLUFactorization{P} <: LinearSolve.SciMLLinearSolveAlgorithm end
1919

2020
function LinearSolve.init_cacheval(
2121
alg::MyLUFactorization, A, b, u, Pl, Pr, maxiters::Int, abstol, reltol,
22-
verbose::Bool, assump::LinearSolve.OperatorAssumptions)
22+
verbose::LinearVerbosity, assump::LinearSolve.OperatorAssumptions)
2323
lu!(convert(AbstractMatrix, A))
2424
end
2525

‎ext/LinearSolveBandedMatricesExt.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ for alg in (:SVDFactorization, :MKLLUFactorization, :DiagonalFactorization,
4141
:AppleAccelerateLUFactorization, :CholeskyFactorization)
4242
@eval begin
4343
function init_cacheval(::$(alg), ::BandedMatrix, b, u, Pl, Pr, maxiters::Int,
44-
abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
44+
abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
4545
return nothing
4646
end
4747
end
4848
end
4949

5050
function init_cacheval(::LUFactorization, A::BandedMatrix{T}, b, u, Pl, Pr, maxiters::Int,
51-
abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions) where {T}
51+
abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T}
5252
(T <: BigFloat) && return qr(similar(A, 0, 0))
5353
return lu(similar(A, 0, 0))
5454
end
@@ -61,7 +61,7 @@ for alg in (:SVDFactorization, :MKLLUFactorization, :DiagonalFactorization,
6161
:AppleAccelerateLUFactorization, :QRFactorization, :LUFactorization)
6262
@eval begin
6363
function init_cacheval(::$(alg), ::Symmetric{<:Number, <:BandedMatrix}, b, u, Pl,
64-
Pr, maxiters::Int, abstol, reltol, verbose::Bool,
64+
Pr, maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
6565
assumptions::OperatorAssumptions)
6666
return nothing
6767
end

‎ext/LinearSolveCUDAExt.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,26 @@ function SciMLBase.solve!(cache::LinearSolve.LinearCache, alg::CudaOffloadFactor
3838
end
3939

4040
function LinearSolve.init_cacheval(alg::CudaOffloadFactorization, A, b, u, Pl, Pr,
41-
maxiters::Int, abstol, reltol, verbose::Bool,
41+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
4242
assumptions::OperatorAssumptions)
4343
qr(CUDA.CuArray(A))
4444
end
4545

4646
function LinearSolve.init_cacheval(
4747
::SparspakFactorization, A::CUDA.CUSPARSE.CuSparseMatrixCSR, b, u,
48-
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
48+
Pl, Pr, maxiters::Int, abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
4949
nothing
5050
end
5151

5252
function LinearSolve.init_cacheval(
5353
::KLUFactorization, A::CUDA.CUSPARSE.CuSparseMatrixCSR, b, u,
54-
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
54+
Pl, Pr, maxiters::Int, abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
5555
nothing
5656
end
5757

5858
function LinearSolve.init_cacheval(
5959
::UMFPACKFactorization, A::CUDA.CUSPARSE.CuSparseMatrixCSR, b, u,
60-
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
60+
Pl, Pr, maxiters::Int, abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
6161
nothing
6262
end
6363

‎ext/LinearSolveFastAlmostBandedMatricesExt.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ for alg in (:SVDFactorization, :MKLLUFactorization, :DiagonalFactorization,
2121
:AppleAccelerateLUFactorization, :CholeskyFactorization, :LUFactorization)
2222
@eval begin
2323
function init_cacheval(::$(alg), ::AlmostBandedMatrix, b, u, Pl, Pr, maxiters::Int,
24-
abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
24+
abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
2525
return nothing
2626
end
2727
end

‎ext/LinearSolveFastLapackInterfaceExt.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ struct WorkspaceAndFactors{W, F}
99
end
1010

1111
function LinearSolve.init_cacheval(::FastLUFactorization, A, b, u, Pl, Pr,
12-
maxiters::Int, abstol, reltol, verbose::Bool,
12+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
1313
assumptions::OperatorAssumptions)
1414
ws = LUWs(A)
1515
return WorkspaceAndFactors(
@@ -36,26 +36,26 @@ end
3636

3737
function LinearSolve.init_cacheval(
3838
alg::FastQRFactorization{NoPivot}, A::AbstractMatrix, b, u, Pl, Pr,
39-
maxiters::Int, abstol, reltol, verbose::Bool,
39+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
4040
assumptions::OperatorAssumptions)
4141
ws = QRWYWs(A; blocksize = alg.blocksize)
4242
return WorkspaceAndFactors(ws,
4343
LinearSolve.ArrayInterface.qr_instance(convert(AbstractMatrix, A)))
4444
end
4545
function LinearSolve.init_cacheval(
4646
::FastQRFactorization{ColumnNorm}, A::AbstractMatrix, b, u, Pl, Pr,
47-
maxiters::Int, abstol, reltol, verbose::Bool,
47+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
4848
assumptions::OperatorAssumptions)
4949
ws = QRpWs(A)
5050
return WorkspaceAndFactors(ws,
5151
LinearSolve.ArrayInterface.qr_instance(convert(AbstractMatrix, A)))
5252
end
5353

5454
function LinearSolve.init_cacheval(alg::FastQRFactorization, A, b, u, Pl, Pr,
55-
maxiters::Int, abstol, reltol, verbose::Bool,
55+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
5656
assumptions::OperatorAssumptions)
5757
return init_cacheval(alg, convert(AbstractMatrix, A), b, u, Pl, Pr,
58-
maxiters::Int, abstol, reltol, verbose::Bool,
58+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
5959
assumptions::OperatorAssumptions)
6060
end
6161

‎ext/LinearSolveHYPREExt.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ end
2222

2323
function LinearSolve.init_cacheval(alg::HYPREAlgorithm, A, b, u, Pl, Pr, maxiters::Int,
2424
abstol, reltol,
25-
verbose::Bool, assumptions::OperatorAssumptions)
25+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
2626
return HYPRECache(nothing, nothing, nothing, nothing, true, true, true)
2727
end
2828

@@ -64,7 +64,7 @@ function SciMLBase.init(prob::LinearProblem, alg::HYPREAlgorithm,
6464
eltype(prob.A)),
6565
# TODO: Implement length() for HYPREVector in HYPRE.jl?
6666
maxiters::Int = prob.b isa HYPREVector ? 1000 : length(prob.b),
67-
verbose::Bool = false,
67+
verbose::LinearVerbosity = false,
6868
Pl = LinearAlgebra.I,
6969
Pr = LinearAlgebra.I,
7070
assumptions = OperatorAssumptions(),

‎ext/LinearSolveIterativeSolversExt.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ LinearSolve.default_alias_b(::IterativeSolversJL, ::Any, ::Any) = true
5151
function LinearSolve.init_cacheval(alg::IterativeSolversJL, A, b, u, Pl, Pr, maxiters::Int,
5252
abstol,
5353
reltol,
54-
verbose::Bool, assumptions::OperatorAssumptions)
54+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
5555
restart = (alg.gmres_restart == 0) ? min(20, size(A, 1)) : alg.gmres_restart
5656
s = :idrs_s in keys(alg.kwargs) ? alg.kwargs.idrs_s : 4 # shadow space
5757

‎ext/LinearSolveMetalExt.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ default_alias_A(::MetalLUFactorization, ::Any, ::Any) = false
99
default_alias_b(::MetalLUFactorization, ::Any, ::Any) = false
1010

1111
function LinearSolve.init_cacheval(alg::MetalLUFactorization, A, b, u, Pl, Pr,
12-
maxiters::Int, abstol, reltol, verbose::Bool,
12+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
1313
assumptions::OperatorAssumptions)
1414
ArrayInterface.lu_instance(convert(AbstractMatrix, A))
1515
end

‎ext/LinearSolvePardisoExt.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function LinearSolve.init_cacheval(alg::PardisoJL,
2121
maxiters::Int,
2222
abstol,
2323
reltol,
24-
verbose::Bool,
24+
verbose::LinearVerbosity,
2525
assumptions::LinearSolve.OperatorAssumptions)
2626
@unpack nprocs, solver_type, matrix_type, cache_analysis, iparm, dparm, vendor = alg
2727
A = convert(AbstractMatrix, A)

‎ext/LinearSolveSparseArraysExt.jl

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ end
2323
function LinearSolve.init_cacheval(alg::RFLUFactorization,
2424
A::Union{AbstractSparseArray, LinearSolve.SciMLOperators.AbstractSciMLOperator}, b, u, Pl, Pr,
2525
maxiters::Int,
26-
abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
26+
abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
2727
nothing, nothing
2828
end
2929

@@ -54,7 +54,7 @@ end
5454
function LinearSolve.init_cacheval(alg::GenericFactorization,
5555
A::Union{Hermitian{T, <:SparseMatrixCSC},
5656
Symmetric{T, <:SparseMatrixCSC}}, b, u, Pl, Pr,
57-
maxiters::Int, abstol, reltol, verbose::Bool,
57+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
5858
assumptions::OperatorAssumptions) where {T}
5959
newA = copy(convert(AbstractMatrix, A))
6060
LinearSolve.do_factorization(alg, newA, b, u)
@@ -67,55 +67,55 @@ function LinearSolve.init_cacheval(
6767
alg::LUFactorization, A::AbstractSparseArray{<:Number, <:Integer}, b, u,
6868
Pl, Pr,
6969
maxiters::Int, abstol, reltol,
70-
verbose::Bool, assumptions::OperatorAssumptions)
70+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
7171
nothing
7272
end
7373

7474
function LinearSolve.init_cacheval(
7575
alg::GenericLUFactorization, A::AbstractSparseArray{<:Number, <:Integer}, b, u,
7676
Pl, Pr,
7777
maxiters::Int, abstol, reltol,
78-
verbose::Bool, assumptions::OperatorAssumptions)
78+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
7979
nothing
8080
end
8181

8282
function LinearSolve.init_cacheval(
8383
alg::UMFPACKFactorization, A::AbstractArray, b, u,
8484
Pl, Pr,
8585
maxiters::Int, abstol, reltol,
86-
verbose::Bool, assumptions::OperatorAssumptions)
86+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
8787
nothing
8888
end
8989

9090
function LinearSolve.init_cacheval(
9191
alg::LUFactorization, A::AbstractSparseArray{Float64, Int64}, b, u,
9292
Pl, Pr,
9393
maxiters::Int, abstol, reltol,
94-
verbose::Bool, assumptions::OperatorAssumptions)
94+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
9595
PREALLOCATED_UMFPACK
9696
end
9797

9898
function LinearSolve.init_cacheval(
9999
alg::LUFactorization, A::AbstractSparseArray{T, Int64}, b, u,
100100
Pl, Pr,
101101
maxiters::Int, abstol, reltol,
102-
verbose::Bool, assumptions::OperatorAssumptions) where {T<:BLASELTYPES}
102+
verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T<:BLASELTYPES}
103103
SparseArrays.UMFPACK.UmfpackLU(SparseMatrixCSC{T, Int64}(zero(Int64), zero(Int64), [Int64(1)], Int64[], T[]))
104104
end
105105

106106
function LinearSolve.init_cacheval(
107107
alg::LUFactorization, A::AbstractSparseArray{T, Int32}, b, u,
108108
Pl, Pr,
109109
maxiters::Int, abstol, reltol,
110-
verbose::Bool, assumptions::OperatorAssumptions) where {T<:BLASELTYPES}
110+
verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T<:BLASELTYPES}
111111
SparseArrays.UMFPACK.UmfpackLU(SparseMatrixCSC{T, Int32}(zero(Int32), zero(Int32), [Int32(1)], Int32[], T[]))
112112
end
113113

114114
function LinearSolve.init_cacheval(
115115
alg::UMFPACKFactorization, A::AbstractSparseArray{Float64, Int}, b, u, Pl, Pr,
116116
maxiters::Int, abstol,
117117
reltol,
118-
verbose::Bool, assumptions::OperatorAssumptions)
118+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
119119

120120
PREALLOCATED_UMFPACK
121121
end
@@ -124,15 +124,15 @@ function LinearSolve.init_cacheval(
124124
alg::UMFPACKFactorization, A::AbstractSparseArray{T, Int64}, b, u,
125125
Pl, Pr,
126126
maxiters::Int, abstol, reltol,
127-
verbose::Bool, assumptions::OperatorAssumptions) where {T<:BLASELTYPES}
127+
verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T<:BLASELTYPES}
128128
SparseArrays.UMFPACK.UmfpackLU(SparseMatrixCSC{T, Int64}(zero(Int64), zero(Int64), [Int64(1)], Int64[], T[]))
129129
end
130130

131131
function LinearSolve.init_cacheval(
132132
alg::UMFPACKFactorization, A::AbstractSparseArray{T, Int32}, b, u,
133133
Pl, Pr,
134134
maxiters::Int, abstol, reltol,
135-
verbose::Bool, assumptions::OperatorAssumptions) where {T<:BLASELTYPES}
135+
verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T<:BLASELTYPES}
136136
SparseArrays.UMFPACK.UmfpackLU(SparseMatrixCSC{T, Int32}(zero(Int32), zero(Int32), [Int32(1)], Int32[], T[]))
137137
end
138138

@@ -179,23 +179,23 @@ function LinearSolve.init_cacheval(
179179
alg::KLUFactorization, A::AbstractArray, b, u, Pl,
180180
Pr,
181181
maxiters::Int, abstol, reltol,
182-
verbose::Bool, assumptions::OperatorAssumptions)
182+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
183183
nothing
184184
end
185185

186186
function LinearSolve.init_cacheval(
187187
alg::KLUFactorization, A::AbstractSparseArray{Float64, Int64}, b, u, Pl, Pr,
188188
maxiters::Int, abstol,
189189
reltol,
190-
verbose::Bool, assumptions::OperatorAssumptions)
190+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
191191
PREALLOCATED_KLU
192192
end
193193

194194
function LinearSolve.init_cacheval(
195195
alg::KLUFactorization, A::AbstractSparseArray{Float64, Int32}, b, u, Pl, Pr,
196196
maxiters::Int, abstol,
197197
reltol,
198-
verbose::Bool, assumptions::OperatorAssumptions)
198+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
199199
KLU.KLUFactorization(SparseMatrixCSC{Float64, Int32}(0, 0, [Int32(1)], Int32[], Float64[]))
200200
end
201201

@@ -239,7 +239,7 @@ function LinearSolve.init_cacheval(alg::CHOLMODFactorization,
239239
A::Union{SparseMatrixCSC{T, Int}, Symmetric{T, SparseMatrixCSC{T, Int}}}, b, u,
240240
Pl, Pr,
241241
maxiters::Int, abstol, reltol,
242-
verbose::Bool, assumptions::OperatorAssumptions) where {T <:
242+
verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T <:
243243
Float64}
244244
PREALLOCATED_CHOLMOD
245245
end
@@ -248,7 +248,7 @@ function LinearSolve.init_cacheval(alg::CHOLMODFactorization,
248248
A::Union{SparseMatrixCSC{T, Int}, Symmetric{T, SparseMatrixCSC{T, Int}}}, b, u,
249249
Pl, Pr,
250250
maxiters::Int, abstol, reltol,
251-
verbose::Bool, assumptions::OperatorAssumptions) where {T <:
251+
verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T <:
252252
BLASELTYPES}
253253
cholesky(sparse(reshape([one(T)],1,1)))
254254
end
@@ -257,14 +257,14 @@ function LinearSolve.init_cacheval(alg::CHOLMODFactorization,
257257
A::AbstractArray, b, u,
258258
Pl, Pr,
259259
maxiters::Int, abstol, reltol,
260-
verbose::Bool, assumptions::OperatorAssumptions)
260+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
261261
nothing
262262
end
263263

264264
function LinearSolve.init_cacheval(alg::NormalCholeskyFactorization,
265265
A::Union{AbstractSparseArray{T}, LinearSolve.GPUArraysCore.AnyGPUArray,
266266
Symmetric{T, <:AbstractSparseArray{T}}}, b, u, Pl, Pr,
267-
maxiters::Int, abstol, reltol, verbose::Bool,
267+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
268268
assumptions::OperatorAssumptions) where {T <: BLASELTYPES}
269269
LinearSolve.ArrayInterface.cholesky_instance(convert(AbstractMatrix, A))
270270
end
@@ -324,25 +324,25 @@ function LinearSolve.init_cacheval(
324324
alg::QRFactorization, A::AbstractSparseArray{<:Number, <:Integer}, b, u,
325325
Pl, Pr,
326326
maxiters::Int, abstol, reltol,
327-
verbose::Bool, assumptions::OperatorAssumptions)
327+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
328328
nothing
329329
end
330330

331331
function LinearSolve.init_cacheval(alg::QRFactorization, A::SparseMatrixCSC{Float64, Int}, b, u, Pl, Pr,
332-
maxiters::Int, abstol, reltol, verbose::Bool,
332+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
333333
assumptions::OperatorAssumptions)
334334
LinearSolve.ArrayInterface.qr_instance(convert(AbstractMatrix, A), alg.pivot)
335335
end
336336

337337
function LinearSolve.init_cacheval(alg::QRFactorization, A::SparseMatrixCSC{Float64, Int32}, b, u, Pl, Pr,
338-
maxiters::Int, abstol, reltol, verbose::Bool,
338+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
339339
assumptions::OperatorAssumptions)
340340
LinearSolve.ArrayInterface.qr_instance(convert(AbstractMatrix, A), alg.pivot)
341341
end
342342

343343
function LinearSolve.init_cacheval(
344344
alg::QRFactorization, A::Symmetric{<:Number, <:SparseMatrixCSC}, b, u, Pl, Pr,
345-
maxiters::Int, abstol, reltol, verbose::Bool,
345+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
346346
assumptions::OperatorAssumptions)
347347
return nothing
348348
end

0 commit comments

Comments
 (0)