Skip to content

Commit 6cbc3e3

Browse files
jClugstorjClugstor
committed
replace verbose::Bool with verbose::LinearVerbosity
1 parent d9aa5da commit 6cbc3e3

23 files changed

+158
-158
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/LinearSolveAMDGPUExt.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function SciMLBase.solve!(cache::LinearSolve.LinearCache, alg::AMDGPUOffloadLUFa
2525
end
2626

2727
function LinearSolve.init_cacheval(alg::AMDGPUOffloadLUFactorization, A, b, u, Pl, Pr,
28-
maxiters::Int, abstol, reltol, verbose::Bool,
28+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
2929
assumptions::OperatorAssumptions)
3030
AMDGPU.rocSOLVER.getrf!(AMDGPU.ROCArray(A))
3131
end
@@ -57,7 +57,7 @@ function SciMLBase.solve!(cache::LinearSolve.LinearCache, alg::AMDGPUOffloadQRFa
5757
end
5858

5959
function LinearSolve.init_cacheval(alg::AMDGPUOffloadQRFactorization, A, b, u, Pl, Pr,
60-
maxiters::Int, abstol, reltol, verbose::Bool,
60+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
6161
assumptions::OperatorAssumptions)
6262
A_gpu = AMDGPU.ROCArray(A)
6363
tau = AMDGPU.ROCVector{eltype(A_gpu)}(undef, min(size(A_gpu)...))

‎ext/LinearSolveBLISExt.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,13 @@ const PREALLOCATED_BLIS_LU = begin
204204
end
205205

206206
function LinearSolve.init_cacheval(alg::BLISLUFactorization, A, b, u, Pl, Pr,
207-
maxiters::Int, abstol, reltol, verbose::Bool,
207+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
208208
assumptions::OperatorAssumptions)
209209
PREALLOCATED_BLIS_LU
210210
end
211211

212212
function LinearSolve.init_cacheval(alg::BLISLUFactorization, A::AbstractMatrix{<:Union{Float32,ComplexF32,ComplexF64}}, b, u, Pl, Pr,
213-
maxiters::Int, abstol, reltol, verbose::Bool,
213+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
214214
assumptions::OperatorAssumptions)
215215
A = rand(eltype(A), 0, 0)
216216
ArrayInterface.lu_instance(A), Ref{BlasInt}()

‎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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function SciMLBase.solve!(cache::LinearSolve.LinearCache, alg::CudaOffloadLUFact
4848
end
4949

5050
function LinearSolve.init_cacheval(alg::CudaOffloadLUFactorization, A, b, u, Pl, Pr,
51-
maxiters::Int, abstol, reltol, verbose::Bool,
51+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
5252
assumptions::OperatorAssumptions)
5353
T = eltype(A)
5454
noUnitT = typeof(zero(T))
@@ -71,7 +71,7 @@ function SciMLBase.solve!(cache::LinearSolve.LinearCache, alg::CudaOffloadQRFact
7171
end
7272

7373
function LinearSolve.init_cacheval(alg::CudaOffloadQRFactorization, A, b, u, Pl, Pr,
74-
maxiters::Int, abstol, reltol, verbose::Bool,
74+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
7575
assumptions::OperatorAssumptions)
7676
qr(CUDA.CuArray(A))
7777
end
@@ -90,26 +90,26 @@ function SciMLBase.solve!(cache::LinearSolve.LinearCache, alg::CudaOffloadFactor
9090
end
9191

9292
function LinearSolve.init_cacheval(alg::CudaOffloadFactorization, A, b, u, Pl, Pr,
93-
maxiters::Int, abstol, reltol, verbose::Bool,
93+
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
9494
assumptions::OperatorAssumptions)
9595
qr(CUDA.CuArray(A))
9696
end
9797

9898
function LinearSolve.init_cacheval(
9999
::SparspakFactorization, A::CUDA.CUSPARSE.CuSparseMatrixCSR, b, u,
100-
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
100+
Pl, Pr, maxiters::Int, abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
101101
nothing
102102
end
103103

104104
function LinearSolve.init_cacheval(
105105
::KLUFactorization, A::CUDA.CUSPARSE.CuSparseMatrixCSR, b, u,
106-
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
106+
Pl, Pr, maxiters::Int, abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
107107
nothing
108108
end
109109

110110
function LinearSolve.init_cacheval(
111111
::UMFPACKFactorization, A::CUDA.CUSPARSE.CuSparseMatrixCSR, b, u,
112-
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
112+
Pl, Pr, maxiters::Int, abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
113113
nothing
114114
end
115115

‎ext/LinearSolveCUSOLVERRFExt.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ using SciMLBase: SciMLBase, LinearProblem, ReturnCode
1010
function LinearSolve.init_cacheval(alg::LinearSolve.CUSOLVERRFFactorization,
1111
A, b, u, Pl, Pr,
1212
maxiters::Int, abstol, reltol,
13-
verbose::Bool, assumptions::OperatorAssumptions)
13+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
1414
nothing
1515
end
1616

1717
function LinearSolve.init_cacheval(alg::LinearSolve.CUSOLVERRFFactorization,
1818
A::Union{CuSparseMatrixCSR{Float64, Int32}, SparseMatrixCSC{Float64, <:Integer}},
1919
b, u, Pl, Pr,
2020
maxiters::Int, abstol, reltol,
21-
verbose::Bool, assumptions::OperatorAssumptions)
21+
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
2222
# Create initial factorization with appropriate options
2323
nrhs = b isa AbstractMatrix ? size(b, 2) : 1
2424
symbolic = alg.symbolic

‎ext/LinearSolveCliqueTreesExt.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ end
2222

2323
function LinearSolve.init_cacheval(
2424
alg::CliqueTreesFactorization, A::AbstractMatrix, b, u, Pl, Pr, maxiters::Int, abstol,
25-
reltol, verbose::Bool, assumptions::OperatorAssumptions)
25+
reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
2626
symbfact = _symbolic(A, alg)
2727
cholfact, cholwork = cholinit(A, symbfact)
2828
linwork = lininit(1, cholfact)

‎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/LinearSolveForwardDiffExt.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ function __dual_init(
136136
abstol = LinearSolve.default_tol(real(eltype(prob.b))),
137137
reltol = LinearSolve.default_tol(real(eltype(prob.b))),
138138
maxiters::Int = length(prob.b),
139-
verbose::Bool = false,
139+
verbose::LinearVerbosity = false,
140140
Pl = nothing,
141141
Pr = nothing,
142142
assumptions = OperatorAssumptions(issquare(prob.A)),

0 commit comments

Comments
 (0)