Skip to content

Commit e832be5

Browse files
jClugstorjClugstor
committed
make verbose in to Union{LinearVerbosity, Bool}
1 parent 69dea93 commit e832be5

24 files changed

+167
-167
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::LinearVerbosity, assump::LinearSolve.OperatorAssumptions)
22+
verbose::Bool, 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::LinearVerbosity,
28+
maxiters::Int, abstol, reltol, verbose::Union{LinearVerbosity, Bool},
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::LinearVerbosity,
60+
maxiters::Int, abstol, reltol, verbose::Union{LinearVerbosity, Bool},
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
@@ -207,13 +207,13 @@ const PREALLOCATED_BLIS_LU = begin
207207
end
208208

209209
function LinearSolve.init_cacheval(alg::BLISLUFactorization, A::Matrix{Float64}, b, u, Pl, Pr,
210-
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
210+
maxiters::Int, abstol, reltol, verbose::Union{LinearVerbosity, Bool},
211211
assumptions::OperatorAssumptions)
212212
PREALLOCATED_BLIS_LU
213213
end
214214

215215
function LinearSolve.init_cacheval(alg::BLISLUFactorization, A::AbstractMatrix{<:Union{Float32,ComplexF32,ComplexF64}}, b, u, Pl, Pr,
216-
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
216+
maxiters::Int, abstol, reltol, verbose::Union{LinearVerbosity, Bool},
217217
assumptions::OperatorAssumptions)
218218
A = rand(eltype(A), 0, 0)
219219
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::LinearVerbosity, assumptions::OperatorAssumptions)
44+
abstol, reltol, verbose::Union{LinearVerbosity, Bool}, 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::LinearVerbosity, assumptions::OperatorAssumptions) where {T}
51+
abstol, reltol, verbose::Union{LinearVerbosity, Bool}, 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::LinearVerbosity,
64+
Pr, maxiters::Int, abstol, reltol, verbose::Union{LinearVerbosity, Bool},
6565
assumptions::OperatorAssumptions)
6666
return nothing
6767
end

‎ext/LinearSolveCUDAExt.jl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function SciMLBase.solve!(cache::LinearSolve.LinearCache, alg::CudaOffloadLUFact
5353
end
5454

5555
function LinearSolve.init_cacheval(alg::CudaOffloadLUFactorization, A::AbstractArray, b, u, Pl, Pr,
56-
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
56+
maxiters::Int, abstol, reltol, verbose::Union{LinearVerbosity, Bool},
5757
assumptions::OperatorAssumptions)
5858
# Check if CUDA is functional before creating CUDA arrays
5959
if !CUDA.functional()
@@ -81,7 +81,7 @@ function SciMLBase.solve!(cache::LinearSolve.LinearCache, alg::CudaOffloadQRFact
8181
end
8282

8383
function LinearSolve.init_cacheval(alg::CudaOffloadQRFactorization, A, b, u, Pl, Pr,
84-
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
84+
maxiters::Int, abstol, reltol, verbose::Union{LinearVerbosity, Bool},
8585
assumptions::OperatorAssumptions)
8686
# Check if CUDA is functional before creating CUDA arrays
8787
if !CUDA.functional()
@@ -105,26 +105,26 @@ function SciMLBase.solve!(cache::LinearSolve.LinearCache, alg::CudaOffloadFactor
105105
end
106106

107107
function LinearSolve.init_cacheval(alg::CudaOffloadFactorization, A::AbstractArray, b, u, Pl, Pr,
108-
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
108+
maxiters::Int, abstol, reltol, verbose::Union{LinearVerbosity, Bool},
109109
assumptions::OperatorAssumptions)
110110
qr(CUDA.CuArray(A))
111111
end
112112

113113
function LinearSolve.init_cacheval(
114114
::SparspakFactorization, A::CUDA.CUSPARSE.CuSparseMatrixCSR, b, u,
115-
Pl, Pr, maxiters::Int, abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
115+
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Union{LinearVerbosity, Bool}, assumptions::OperatorAssumptions)
116116
nothing
117117
end
118118

119119
function LinearSolve.init_cacheval(
120120
::KLUFactorization, A::CUDA.CUSPARSE.CuSparseMatrixCSR, b, u,
121-
Pl, Pr, maxiters::Int, abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
121+
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Union{LinearVerbosity, Bool}, assumptions::OperatorAssumptions)
122122
nothing
123123
end
124124

125125
function LinearSolve.init_cacheval(
126126
::UMFPACKFactorization, A::CUDA.CUSPARSE.CuSparseMatrixCSR, b, u,
127-
Pl, Pr, maxiters::Int, abstol, reltol, verbose::LinearVerbosity, assumptions::OperatorAssumptions)
127+
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Union{LinearVerbosity, Bool}, assumptions::OperatorAssumptions)
128128
nothing
129129
end
130130

@@ -158,7 +158,7 @@ function SciMLBase.solve!(cache::LinearSolve.LinearCache, alg::CUDAOffload32Mixe
158158
end
159159

160160
function LinearSolve.init_cacheval(alg::CUDAOffload32MixedLUFactorization, A, b, u, Pl, Pr,
161-
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
161+
maxiters::Int, abstol, reltol, verbose::Union{LinearVerbosity, Bool},
162162
assumptions::OperatorAssumptions)
163163
# Pre-allocate with Float32 arrays
164164
m, n = size(A)

‎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::LinearVerbosity, assumptions::OperatorAssumptions)
13+
verbose::Union{LinearVerbosity, Bool}, 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::LinearVerbosity, assumptions::OperatorAssumptions)
21+
verbose::Union{LinearVerbosity, Bool}, 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::LinearVerbosity, assumptions::OperatorAssumptions)
25+
reltol, verbose::Union{LinearVerbosity, Bool}, 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::LinearVerbosity, assumptions::OperatorAssumptions)
24+
abstol, reltol, verbose::Union{LinearVerbosity, Bool}, 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
@@ -10,7 +10,7 @@ struct WorkspaceAndFactors{W, F}
1010
end
1111

1212
function LinearSolve.init_cacheval(::FastLUFactorization, A, b, u, Pl, Pr,
13-
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
13+
maxiters::Int, abstol, reltol, verbose::Union{LinearVerbosity, Bool},
1414
assumptions::OperatorAssumptions)
1515
ws = LUWs(A)
1616
return WorkspaceAndFactors(
@@ -37,26 +37,26 @@ end
3737

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

5555
function LinearSolve.init_cacheval(alg::FastQRFactorization, A, b, u, Pl, Pr,
56-
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
56+
maxiters::Int, abstol, reltol, verbose::Union{LinearVerbosity, Bool},
5757
assumptions::OperatorAssumptions)
5858
return init_cacheval(alg, convert(AbstractMatrix, A), b, u, Pl, Pr,
59-
maxiters::Int, abstol, reltol, verbose::LinearVerbosity,
59+
maxiters::Int, abstol, reltol, verbose::Union{LinearVerbosity, Bool},
6060
assumptions::OperatorAssumptions)
6161
end
6262

‎ext/LinearSolveHYPREExt.jl‎

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

2424
function LinearSolve.init_cacheval(alg::HYPREAlgorithm, A, b, u, Pl, Pr, maxiters::Int,
2525
abstol, reltol,
26-
verbose::LinearVerbosity, assumptions::OperatorAssumptions)
26+
verbose::Union{LinearVerbosity, Bool}, assumptions::OperatorAssumptions)
2727
return HYPRECache(nothing, nothing, nothing, nothing, true, true, true)
2828
end
2929

0 commit comments

Comments
 (0)