Skip to content

Commit 29066d3

Browse files
jClugstorjClugstor
committed
replace verbose::Bool with verbose::LinearVerbosity
1 parent 476f0da commit 29066d3

18 files changed

+141
-141
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
@@ -48,26 +48,26 @@ function SciMLBase.solve!(cache::LinearSolve.LinearCache, alg::CudaOffloadFactor
4848
end
4949

5050
function LinearSolve.init_cacheval(alg::CudaOffloadFactorization, A, b, u, Pl, Pr,
51-
maxiters::Int, abstol, reltol, verbose::Bool,
51+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
5252
assumptions::OperatorAssumptions)
5353
qr(CUDA.CuArray(A))
5454
end
5555

5656
function LinearSolve.init_cacheval(
5757
::SparspakFactorization, A::CUDA.CUSPARSE.CuSparseMatrixCSR, b, u,
58-
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
58+
Pl, Pr, maxiters::Int, abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
5959
nothing
6060
end
6161

6262
function LinearSolve.init_cacheval(
6363
::KLUFactorization, A::CUDA.CUSPARSE.CuSparseMatrixCSR, b, u,
64-
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
64+
Pl, Pr, maxiters::Int, abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
6565
nothing
6666
end
6767

6868
function LinearSolve.init_cacheval(
6969
::UMFPACKFactorization, A::CUDA.CUSPARSE.CuSparseMatrixCSR, b, u,
70-
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
70+
Pl, Pr, maxiters::Int, abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
7171
nothing
7272
end
7373

‎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
@@ -47,7 +47,7 @@ LinearSolve.default_alias_b(::IterativeSolversJL, ::Any, ::Any) = true
4747
function LinearSolve.init_cacheval(alg::IterativeSolversJL, A, b, u, Pl, Pr, maxiters::Int,
4848
abstol,
4949
reltol,
50-
verbose::Bool, assumptions::OperatorAssumptions)
50+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
5151
restart = (alg.gmres_restart == 0) ? min(20, size(A, 1)) : alg.gmres_restart
5252
s = :idrs_s in keys(alg.kwargs) ? alg.kwargs.idrs_s : 4 # shadow space
5353

‎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
@@ -20,7 +20,7 @@ function LinearSolve.init_cacheval(alg::PardisoJL,
2020
maxiters::Int,
2121
abstol,
2222
reltol,
23-
verbose::Bool,
23+
verbose::LinearVerbosity,
2424
assumptions::LinearSolve.OperatorAssumptions)
2525
@unpack nprocs, solver_type, matrix_type, cache_analysis, iparm, dparm, vendor = alg
2626
A = convert(AbstractMatrix, A)

‎ext/LinearSolveSparseArraysExt.jl

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ end
3434
function LinearSolve.init_cacheval(alg::RFLUFactorization,
3535
A::Union{AbstractSparseArray, LinearSolve.SciMLOperators.AbstractSciMLOperator}, b, u, Pl, Pr,
3636
maxiters::Int,
37-
abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
37+
abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
3838
nothing, nothing
3939
end
4040

@@ -65,7 +65,7 @@ end
6565
function LinearSolve.init_cacheval(alg::GenericFactorization,
6666
A::Union{Hermitian{T, <:SparseMatrixCSC},
6767
Symmetric{T, <:SparseMatrixCSC}}, b, u, Pl, Pr,
68-
maxiters::Int, abstol, reltol, verbose::Bool,
68+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
6969
assumptions::OperatorAssumptions) where {T}
7070
newA = copy(convert(AbstractMatrix, A))
7171
LinearSolve.do_factorization(alg, newA, b, u)
@@ -78,39 +78,39 @@ function LinearSolve.init_cacheval(
7878
alg::LUFactorization, A::AbstractSparseArray{<:Number, <:Integer}, b, u,
7979
Pl, Pr,
8080
maxiters::Int, abstol, reltol,
81-
verbose::Bool, assumptions::OperatorAssumptions)
81+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
8282
nothing
8383
end
8484

8585
function LinearSolve.init_cacheval(
8686
alg::GenericLUFactorization, A::AbstractSparseArray{<:Number, <:Integer}, b, u,
8787
Pl, Pr,
8888
maxiters::Int, abstol, reltol,
89-
verbose::Bool, assumptions::OperatorAssumptions)
89+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
9090
nothing
9191
end
9292

9393
function LinearSolve.init_cacheval(
9494
alg::UMFPACKFactorization, A::AbstractArray, b, u,
9595
Pl, Pr,
9696
maxiters::Int, abstol, reltol,
97-
verbose::Bool, assumptions::OperatorAssumptions)
97+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
9898
nothing
9999
end
100100

101101
function LinearSolve.init_cacheval(
102102
alg::LUFactorization, A::AbstractSparseArray{Float64, Int64}, b, u,
103103
Pl, Pr,
104104
maxiters::Int, abstol, reltol,
105-
verbose::Bool, assumptions::OperatorAssumptions)
105+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
106106
PREALLOCATED_UMFPACK
107107
end
108108

109109
function LinearSolve.init_cacheval(
110110
alg::LUFactorization, A::AbstractSparseArray{T, Int64}, b, u,
111111
Pl, Pr,
112112
maxiters::Int, abstol, reltol,
113-
verbose::Bool, assumptions::OperatorAssumptions) where {T <: BLASELTYPES}
113+
verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T <: BLASELTYPES}
114114
if LinearSolve.is_cusparse(A)
115115
ArrayInterface.lu_instance(A)
116116
else
@@ -123,7 +123,7 @@ function LinearSolve.init_cacheval(
123123
alg::LUFactorization, A::AbstractSparseArray{T, Int32}, b, u,
124124
Pl, Pr,
125125
maxiters::Int, abstol, reltol,
126-
verbose::Bool, assumptions::OperatorAssumptions) where {T <: BLASELTYPES}
126+
verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T <: BLASELTYPES}
127127
if LinearSolve.is_cusparse(A)
128128
ArrayInterface.lu_instance(A)
129129
else
@@ -144,7 +144,7 @@ function LinearSolve.init_cacheval(
144144
alg::UMFPACKFactorization, A::AbstractSparseArray{Float64, Int}, b, u, Pl, Pr,
145145
maxiters::Int, abstol,
146146
reltol,
147-
verbose::Bool, assumptions::OperatorAssumptions)
147+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
148148
PREALLOCATED_UMFPACK
149149
end
150150

@@ -160,7 +160,7 @@ function LinearSolve.init_cacheval(
160160
alg::UMFPACKFactorization, A::AbstractSparseArray{T, Int64}, b, u,
161161
Pl, Pr,
162162
maxiters::Int, abstol, reltol,
163-
verbose::Bool, assumptions::OperatorAssumptions) where {T <: BLASELTYPES}
163+
verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T <: BLASELTYPES}
164164
SparseArrays.UMFPACK.UmfpackLU(SparseMatrixCSC{T, Int64}(
165165
zero(Int64), zero(Int64), [Int64(1)], Int64[], T[]))
166166
end
@@ -169,7 +169,7 @@ function LinearSolve.init_cacheval(
169169
alg::UMFPACKFactorization, A::AbstractSparseArray{T, Int32}, b, u,
170170
Pl, Pr,
171171
maxiters::Int, abstol, reltol,
172-
verbose::Bool, assumptions::OperatorAssumptions) where {T <: BLASELTYPES}
172+
verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T <: BLASELTYPES}
173173
SparseArrays.UMFPACK.UmfpackLU(SparseMatrixCSC{T, Int32}(
174174
zero(Int32), zero(Int32), [Int32(1)], Int32[], T[]))
175175
end
@@ -218,15 +218,15 @@ function LinearSolve.init_cacheval(
218218
alg::KLUFactorization, A::AbstractArray, b, u, Pl,
219219
Pr,
220220
maxiters::Int, abstol, reltol,
221-
verbose::Bool, assumptions::OperatorAssumptions)
221+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
222222
nothing
223223
end
224224

225225
function LinearSolve.init_cacheval(
226226
alg::KLUFactorization, A::AbstractSparseArray{Float64, Int64}, b, u, Pl, Pr,
227227
maxiters::Int, abstol,
228228
reltol,
229-
verbose::Bool, assumptions::OperatorAssumptions)
229+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
230230
PREALLOCATED_KLU
231231
end
232232

@@ -242,7 +242,7 @@ function LinearSolve.init_cacheval(
242242
alg::KLUFactorization, A::AbstractSparseArray{Float64, Int32}, b, u, Pl, Pr,
243243
maxiters::Int, abstol,
244244
reltol,
245-
verbose::Bool, assumptions::OperatorAssumptions)
245+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
246246
KLU.KLUFactorization(SparseMatrixCSC{Float64, Int32}(
247247
0, 0, [Int32(1)], Int32[], Float64[]))
248248
end
@@ -288,7 +288,7 @@ function LinearSolve.init_cacheval(alg::CHOLMODFactorization,
288288
A::Union{SparseMatrixCSC{T, Int}, Symmetric{T, SparseMatrixCSC{T, Int}}}, b, u,
289289
Pl, Pr,
290290
maxiters::Int, abstol, reltol,
291-
verbose::Bool, assumptions::OperatorAssumptions) where {T <:
291+
verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T <:
292292
Float64}
293293
PREALLOCATED_CHOLMOD
294294
end
@@ -297,7 +297,7 @@ function LinearSolve.init_cacheval(alg::CHOLMODFactorization,
297297
A::Union{SparseMatrixCSC{T, Int}, Symmetric{T, SparseMatrixCSC{T, Int}}}, b, u,
298298
Pl, Pr,
299299
maxiters::Int, abstol, reltol,
300-
verbose::Bool, assumptions::OperatorAssumptions) where {T <:
300+
verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T <:
301301
BLASELTYPES}
302302
cholesky(sparse(reshape([one(T)], 1, 1)))
303303
end
@@ -306,14 +306,14 @@ function LinearSolve.init_cacheval(alg::CHOLMODFactorization,
306306
A::AbstractArray, b, u,
307307
Pl, Pr,
308308
maxiters::Int, abstol, reltol,
309-
verbose::Bool, assumptions::OperatorAssumptions)
309+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
310310
nothing
311311
end
312312

313313
function LinearSolve.init_cacheval(alg::NormalCholeskyFactorization,
314314
A::Union{AbstractSparseArray{T}, LinearSolve.GPUArraysCore.AnyGPUArray,
315315
Symmetric{T, <:AbstractSparseArray{T}}}, b, u, Pl, Pr,
316-
maxiters::Int, abstol, reltol, verbose::Bool,
316+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
317317
assumptions::OperatorAssumptions) where {T <: BLASELTYPES}
318318
ArrayInterface.cholesky_instance(convert(AbstractMatrix, A))
319319
end
@@ -373,7 +373,7 @@ function LinearSolve.init_cacheval(
373373
alg::QRFactorization, A::AbstractSparseArray{<:Number, <:Integer}, b, u,
374374
Pl, Pr,
375375
maxiters::Int, abstol, reltol,
376-
verbose::Bool, assumptions::OperatorAssumptions)
376+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
377377
nothing
378378
end
379379

@@ -386,7 +386,7 @@ end
386386

387387
function LinearSolve.init_cacheval(
388388
alg::QRFactorization, A::Symmetric{<:Number, <:SparseMatrixCSC}, b, u, Pl, Pr,
389-
maxiters::Int, abstol, reltol, verbose::Bool,
389+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
390390
assumptions::OperatorAssumptions)
391391
return nothing
392392
end

0 commit comments

Comments
 (0)