Skip to content

Commit 5187b28

Browse files
ChrisRackauckasChrisRackauckas
committed
Try to fix type inference
1 parent 3240ae1 commit 5187b28

17 files changed

+331
-188
lines changed

‎ext/LinearSolveBandedMatricesExt.jl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module LinearSolveBandedMatricesExt
33
using BandedMatrices, LinearAlgebra, LinearSolve
44
import LinearSolve: defaultalg,
55
do_factorization, init_cacheval, DefaultLinearSolver,
6-
DefaultAlgorithmChoice
6+
DefaultAlgorithmChoice, AbstractOperatorAssumptions
77

88
# Defaults for BandedMatrices
99
function defaultalg(A::BandedMatrix, b, oa::OperatorAssumptions{Bool})
@@ -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::Bool, assumptions::AbstractOperatorAssumptions)
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::Bool, assumptions::AbstractOperatorAssumptions) where {T}
5252
(T <: BigFloat) && return qr(similar(A, 0, 0))
5353
return lu(similar(A, 0, 0))
5454
end
@@ -62,7 +62,7 @@ for alg in (:SVDFactorization, :MKLLUFactorization, :DiagonalFactorization,
6262
@eval begin
6363
function init_cacheval(::$(alg), ::Symmetric{<:Number, <:BandedMatrix}, b, u, Pl,
6464
Pr, maxiters::Int, abstol, reltol, verbose::Bool,
65-
assumptions::OperatorAssumptions)
65+
assumptions::AbstractOperatorAssumptions)
6666
return nothing
6767
end
6868
end

‎ext/LinearSolveCUDAExt.jl‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module LinearSolveCUDAExt
33
using CUDA
44
using LinearSolve
55
using LinearSolve.LinearAlgebra, LinearSolve.SciMLBase, LinearSolve.ArrayInterface
6+
using LinearSolve: AbstractOperatorAssumptions
67
using SciMLBase: AbstractSciMLOperator
78

89
function LinearSolve.defaultalg(A::CUDA.CUSPARSE.CuSparseMatrixCSR{Tv, Ti}, b,
@@ -39,25 +40,25 @@ end
3940

4041
function LinearSolve.init_cacheval(alg::CudaOffloadFactorization, A, b, u, Pl, Pr,
4142
maxiters::Int, abstol, reltol, verbose::Bool,
42-
assumptions::OperatorAssumptions)
43+
assumptions::AbstractOperatorAssumptions)
4344
qr(CUDA.CuArray(A))
4445
end
4546

4647
function LinearSolve.init_cacheval(
4748
::SparspakFactorization, A::CUDA.CUSPARSE.CuSparseMatrixCSR, b, u,
48-
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
49+
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Bool, assumptions::AbstractOperatorAssumptions)
4950
nothing
5051
end
5152

5253
function LinearSolve.init_cacheval(
5354
::KLUFactorization, A::CUDA.CUSPARSE.CuSparseMatrixCSR, b, u,
54-
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
55+
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Bool, assumptions::AbstractOperatorAssumptions)
5556
nothing
5657
end
5758

5859
function LinearSolve.init_cacheval(
5960
::UMFPACKFactorization, A::CUDA.CUSPARSE.CuSparseMatrixCSR, b, u,
60-
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
61+
Pl, Pr, maxiters::Int, abstol, reltol, verbose::Bool, assumptions::AbstractOperatorAssumptions)
6162
nothing
6263
end
6364

‎ext/LinearSolveFastAlmostBandedMatricesExt.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module LinearSolveFastAlmostBandedMatricesExt
33
using FastAlmostBandedMatrices, LinearAlgebra, LinearSolve
44
import LinearSolve: defaultalg,
55
do_factorization, init_cacheval, DefaultLinearSolver,
6-
DefaultAlgorithmChoice
6+
DefaultAlgorithmChoice, AbstractOperatorAssumptions
77

88
function defaultalg(A::AlmostBandedMatrix, b, oa::OperatorAssumptions{Bool})
99
if oa.issq
@@ -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::Bool, assumptions::AbstractOperatorAssumptions)
2525
return nothing
2626
end
2727
end

‎ext/LinearSolveFastLapackInterfaceExt.jl‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ module LinearSolveFastLapackInterfaceExt
22

33
using LinearSolve, LinearAlgebra
44
using FastLapackInterface
5+
using LinearSolve: AbstractOperatorAssumptions
56

67
struct WorkspaceAndFactors{W, F}
78
workspace::W
@@ -10,7 +11,7 @@ end
1011

1112
function LinearSolve.init_cacheval(::FastLUFactorization, A, b, u, Pl, Pr,
1213
maxiters::Int, abstol, reltol, verbose::Bool,
13-
assumptions::OperatorAssumptions)
14+
assumptions::AbstractOperatorAssumptions)
1415
ws = LUWs(A)
1516
return WorkspaceAndFactors(
1617
ws, LinearSolve.ArrayInterface.lu_instance(convert(AbstractMatrix, A)))
@@ -37,26 +38,26 @@ end
3738
function LinearSolve.init_cacheval(
3839
alg::FastQRFactorization{NoPivot}, A::AbstractMatrix, b, u, Pl, Pr,
3940
maxiters::Int, abstol, reltol, verbose::Bool,
40-
assumptions::OperatorAssumptions)
41+
assumptions::AbstractOperatorAssumptions)
4142
ws = QRWYWs(A; blocksize = alg.blocksize)
4243
return WorkspaceAndFactors(ws,
4344
LinearSolve.ArrayInterface.qr_instance(convert(AbstractMatrix, A)))
4445
end
4546
function LinearSolve.init_cacheval(
4647
::FastQRFactorization{ColumnNorm}, A::AbstractMatrix, b, u, Pl, Pr,
4748
maxiters::Int, abstol, reltol, verbose::Bool,
48-
assumptions::OperatorAssumptions)
49+
assumptions::AbstractOperatorAssumptions)
4950
ws = QRpWs(A)
5051
return WorkspaceAndFactors(ws,
5152
LinearSolve.ArrayInterface.qr_instance(convert(AbstractMatrix, A)))
5253
end
5354

5455
function LinearSolve.init_cacheval(alg::FastQRFactorization, A, b, u, Pl, Pr,
5556
maxiters::Int, abstol, reltol, verbose::Bool,
56-
assumptions::OperatorAssumptions)
57+
assumptions::AbstractOperatorAssumptions)
5758
return init_cacheval(alg, convert(AbstractMatrix, A), b, u, Pl, Pr,
5859
maxiters::Int, abstol, reltol, verbose::Bool,
59-
assumptions::OperatorAssumptions)
60+
assumptions::AbstractOperatorAssumptions)
6061
end
6162

6263
function SciMLBase.solve!(cache::LinearSolve.LinearCache, alg::FastQRFactorization{P};

‎ext/LinearSolveHYPREExt.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ using HYPRE.LibHYPRE: HYPRE_Complex
55
using HYPRE: HYPRE, HYPREMatrix, HYPRESolver, HYPREVector
66
using LinearSolve: HYPREAlgorithm, LinearCache, LinearProblem, LinearSolve,
77
OperatorAssumptions, default_tol, init_cacheval, __issquare,
8-
__conditioning, LinearSolveAdjoint
8+
__conditioning, LinearSolveAdjoint, AbstractOperatorAssumptions
99
using SciMLBase: LinearProblem, LinearAliasSpecifier, SciMLBase
1010
using UnPack: @unpack
1111
using Setfield: @set!
@@ -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::Bool, assumptions::AbstractOperatorAssumptions)
2626
return HYPRECache(nothing, nothing, nothing, nothing, true, true, true)
2727
end
2828

‎ext/LinearSolveIterativeSolversExt.jl‎

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

33
using LinearSolve, LinearAlgebra
44
using LinearSolve: LinearCache, DEFAULT_PRECS
5-
import LinearSolve: IterativeSolversJL
5+
import LinearSolve: IterativeSolversJL, AbstractOperatorAssumptions
66

77
if isdefined(Base, :get_extension)
88
using IterativeSolvers
@@ -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::Bool, assumptions::AbstractOperatorAssumptions)
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ module LinearSolveMetalExt
33
using Metal, LinearSolve
44
using LinearAlgebra, SciMLBase
55
using SciMLBase: AbstractSciMLOperator
6-
using LinearSolve: ArrayInterface, MKLLUFactorization, @get_cacheval, LinearCache, SciMLBase
6+
using LinearSolve: ArrayInterface, MKLLUFactorization, @get_cacheval, LinearCache, SciMLBase, AbstractOperatorAssumptions
77

88
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,
1212
maxiters::Int, abstol, reltol, verbose::Bool,
13-
assumptions::OperatorAssumptions)
13+
assumptions::AbstractOperatorAssumptions)
1414
ArrayInterface.lu_instance(convert(AbstractMatrix, A))
1515
end
1616

0 commit comments

Comments
 (0)