Skip to content

Commit 29ca5e2

Browse files
jClugstorjClugstor
committed
replace verbose::Bool with verbose::LinearVerbosity
1 parent b50c13e commit 29ca5e2

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
@@ -44,26 +44,26 @@ function SciMLBase.solve!(cache::LinearSolve.LinearCache, alg::CudaOffloadFactor
4444
end
4545

4646
function LinearSolve.init_cacheval(alg::CudaOffloadFactorization, A, b, u, Pl, Pr,
47-
maxiters::Int, abstol, reltol, verbose::Bool,
47+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
4848
assumptions::OperatorAssumptions)
4949
qr(CUDA.CuArray(A))
5050
end
5151

5252
function LinearSolve.init_cacheval(
5353
::SparspakFactorization, 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
::KLUFactorization, 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

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

‎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
@@ -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
@@ -31,7 +31,7 @@ end
3131
function LinearSolve.init_cacheval(alg::RFLUFactorization,
3232
A::Union{AbstractSparseArray, LinearSolve.SciMLOperators.AbstractSciMLOperator}, b, u, Pl, Pr,
3333
maxiters::Int,
34-
abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
34+
abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
3535
nothing, nothing
3636
end
3737

@@ -62,7 +62,7 @@ end
6262
function LinearSolve.init_cacheval(alg::GenericFactorization,
6363
A::Union{Hermitian{T, <:SparseMatrixCSC},
6464
Symmetric{T, <:SparseMatrixCSC}}, b, u, Pl, Pr,
65-
maxiters::Int, abstol, reltol, verbose::Bool,
65+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
6666
assumptions::OperatorAssumptions) where {T}
6767
newA = copy(convert(AbstractMatrix, A))
6868
LinearSolve.do_factorization(alg, newA, b, u)
@@ -75,39 +75,39 @@ function LinearSolve.init_cacheval(
7575
alg::LUFactorization, 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::GenericLUFactorization, A::AbstractSparseArray{<:Number, <:Integer}, 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::UMFPACKFactorization, A::AbstractArray, b, u,
9292
Pl, Pr,
9393
maxiters::Int, abstol, reltol,
94-
verbose::Bool, assumptions::OperatorAssumptions)
94+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
9595
nothing
9696
end
9797

9898
function LinearSolve.init_cacheval(
9999
alg::LUFactorization, A::AbstractSparseArray{Float64, Int64}, b, u,
100100
Pl, Pr,
101101
maxiters::Int, abstol, reltol,
102-
verbose::Bool, assumptions::OperatorAssumptions)
102+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
103103
PREALLOCATED_UMFPACK
104104
end
105105

106106
function LinearSolve.init_cacheval(
107107
alg::LUFactorization, A::AbstractSparseArray{T, Int64}, 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
if LinearSolve.is_cusparse(A)
112112
ArrayInterface.lu_instance(A)
113113
else
@@ -119,7 +119,7 @@ function LinearSolve.init_cacheval(
119119
alg::LUFactorization, A::AbstractSparseArray{T, Int32}, b, u,
120120
Pl, Pr,
121121
maxiters::Int, abstol, reltol,
122-
verbose::Bool, assumptions::OperatorAssumptions) where {T<:BLASELTYPES}
122+
verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T<:BLASELTYPES}
123123
if LinearSolve.is_cusparse(A)
124124
ArrayInterface.lu_instance(A)
125125
else
@@ -139,7 +139,7 @@ function LinearSolve.init_cacheval(
139139
alg::UMFPACKFactorization, A::AbstractSparseArray{Float64, Int}, b, u, Pl, Pr,
140140
maxiters::Int, abstol,
141141
reltol,
142-
verbose::Bool, assumptions::OperatorAssumptions)
142+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
143143

144144
PREALLOCATED_UMFPACK
145145
end
@@ -156,15 +156,15 @@ function LinearSolve.init_cacheval(
156156
alg::UMFPACKFactorization, A::AbstractSparseArray{T, Int64}, b, u,
157157
Pl, Pr,
158158
maxiters::Int, abstol, reltol,
159-
verbose::Bool, assumptions::OperatorAssumptions) where {T<:BLASELTYPES}
159+
verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T<:BLASELTYPES}
160160
SparseArrays.UMFPACK.UmfpackLU(SparseMatrixCSC{T, Int64}(zero(Int64), zero(Int64), [Int64(1)], Int64[], T[]))
161161
end
162162

163163
function LinearSolve.init_cacheval(
164164
alg::UMFPACKFactorization, A::AbstractSparseArray{T, Int32}, b, u,
165165
Pl, Pr,
166166
maxiters::Int, abstol, reltol,
167-
verbose::Bool, assumptions::OperatorAssumptions) where {T<:BLASELTYPES}
167+
verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T<:BLASELTYPES}
168168
SparseArrays.UMFPACK.UmfpackLU(SparseMatrixCSC{T, Int32}(zero(Int32), zero(Int32), [Int32(1)], Int32[], T[]))
169169
end
170170

@@ -211,15 +211,15 @@ function LinearSolve.init_cacheval(
211211
alg::KLUFactorization, A::AbstractArray, b, u, Pl,
212212
Pr,
213213
maxiters::Int, abstol, reltol,
214-
verbose::Bool, assumptions::OperatorAssumptions)
214+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
215215
nothing
216216
end
217217

218218
function LinearSolve.init_cacheval(
219219
alg::KLUFactorization, A::AbstractSparseArray{Float64, Int64}, b, u, Pl, Pr,
220220
maxiters::Int, abstol,
221221
reltol,
222-
verbose::Bool, assumptions::OperatorAssumptions)
222+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
223223
PREALLOCATED_KLU
224224
end
225225

@@ -235,7 +235,7 @@ function LinearSolve.init_cacheval(
235235
alg::KLUFactorization, A::AbstractSparseArray{Float64, Int32}, b, u, Pl, Pr,
236236
maxiters::Int, abstol,
237237
reltol,
238-
verbose::Bool, assumptions::OperatorAssumptions)
238+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
239239
KLU.KLUFactorization(SparseMatrixCSC{Float64, Int32}(0, 0, [Int32(1)], Int32[], Float64[]))
240240
end
241241

@@ -279,7 +279,7 @@ function LinearSolve.init_cacheval(alg::CHOLMODFactorization,
279279
A::Union{SparseMatrixCSC{T, Int}, Symmetric{T, SparseMatrixCSC{T, Int}}}, b, u,
280280
Pl, Pr,
281281
maxiters::Int, abstol, reltol,
282-
verbose::Bool, assumptions::OperatorAssumptions) where {T <:
282+
verbose::LinearVerbosity, assumptions::OperatorAssumptions) where {T <:
283283
Float64}
284284
PREALLOCATED_CHOLMOD
285285
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
BLASELTYPES}
293293
cholesky(sparse(reshape([one(T)],1,1)))
294294
end
@@ -297,14 +297,14 @@ function LinearSolve.init_cacheval(alg::CHOLMODFactorization,
297297
A::AbstractArray, b, u,
298298
Pl, Pr,
299299
maxiters::Int, abstol, reltol,
300-
verbose::Bool, assumptions::OperatorAssumptions)
300+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
301301
nothing
302302
end
303303

304304
function LinearSolve.init_cacheval(alg::NormalCholeskyFactorization,
305305
A::Union{AbstractSparseArray{T}, LinearSolve.GPUArraysCore.AnyGPUArray,
306306
Symmetric{T, <:AbstractSparseArray{T}}}, b, u, Pl, Pr,
307-
maxiters::Int, abstol, reltol, verbose::Bool,
307+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
308308
assumptions::OperatorAssumptions) where {T <: BLASELTYPES}
309309
ArrayInterface.cholesky_instance(convert(AbstractMatrix, A))
310310
end
@@ -364,7 +364,7 @@ function LinearSolve.init_cacheval(
364364
alg::QRFactorization, A::AbstractSparseArray{<:Number, <:Integer}, b, u,
365365
Pl, Pr,
366366
maxiters::Int, abstol, reltol,
367-
verbose::Bool, assumptions::OperatorAssumptions)
367+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
368368
nothing
369369
end
370370

@@ -376,7 +376,7 @@ end
376376

377377
function LinearSolve.init_cacheval(
378378
alg::QRFactorization, A::Symmetric{<:Number, <:SparseMatrixCSC}, b, u, Pl, Pr,
379-
maxiters::Int, abstol, reltol, verbose::Bool,
379+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
380380
assumptions::OperatorAssumptions)
381381
return nothing
382382
end

0 commit comments

Comments
 (0)