Skip to content

Commit 16472b5

Browse files
fix condition specifications
1 parent 80ba180 commit 16472b5

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/common.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ end
5454
Sets the operator `A` assumptions used as part of the default algorithm
5555
"""
5656
struct OperatorAssumptions{issq,condition} end
57-
function OperatorAssumptions(issquare = nothing; condition::OperatorCondition.T = IllConditioned)
57+
function OperatorAssumptions(issquare = nothing; condition::OperatorCondition.T = OperatorCondition.IllConditioned)
5858
issq = something(_unwrap_val(issquare), Nothing)
5959
condition = _unwrap_val(condition)
6060
OperatorAssumptions{issq,condition}()

src/default.jl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function defaultalg(A::GPUArraysCore.AbstractGPUArray, b, assump::OperatorAssump
7474
end
7575
end
7676

77-
function defaultalg(A::GPUArraysCore.AbstractGPUArray, b, assump::OperatorAssumptions{true,IllConditioned})
77+
function defaultalg(A::GPUArraysCore.AbstractGPUArray, b, assump::OperatorAssumptions{true,OperatorCondition.IllConditioned})
7878
QRFactorization()
7979
end
8080

@@ -86,7 +86,7 @@ function defaultalg(A, b::GPUArraysCore.AbstractGPUArray, assump::OperatorAssump
8686
end
8787
end
8888

89-
function defaultalg(A, b::GPUArraysCore.AbstractGPUArray, assump::OperatorAssumptions{true,IllConditioned})
89+
function defaultalg(A, b::GPUArraysCore.AbstractGPUArray, assump::OperatorAssumptions{true,OperatorCondition.IllConditioned})
9090
QRFactorization()
9191
end
9292

@@ -130,7 +130,7 @@ function defaultalg(A::GPUArraysCore.AbstractGPUArray, b::GPUArraysCore.Abstract
130130
end
131131

132132
function defaultalg(A::GPUArraysCore.AbstractGPUArray, b::GPUArraysCore.AbstractGPUArray,
133-
::OperatorAssumptions{true,IllConditioned})
133+
::OperatorAssumptions{true,OperatorCondition.IllConditioned})
134134
QRFactorization()
135135
end
136136

@@ -155,7 +155,7 @@ function defaultalg(A, b, assump::OperatorAssumptions{true})
155155
# whether MKL or OpenBLAS is being used
156156
if (A === nothing && !(b isa GPUArraysCore.AbstractGPUArray)) || A isa Matrix
157157
if (A === nothing || eltype(A) <: Union{Float32, Float64, ComplexF32, ComplexF64}) &&
158-
ArrayInterface.can_setindex(b) && __conditioning(assump) != IllConditioned
158+
ArrayInterface.can_setindex(b) && __conditioning(assump) != OperatorCondition.IllConditioned
159159
if length(b) <= 10
160160
alg = GenericLUFactorization()
161161
elseif (length(b) <= 100 || (isopenblas() && length(b) <= 500)) &&
@@ -167,9 +167,9 @@ function defaultalg(A, b, assump::OperatorAssumptions{true})
167167
else
168168
alg = LUFactorization()
169169
end
170-
elseif __conditioning(assump) === VeryIllConditioned
170+
elseif __conditioning(assump) === OperatorCondition.VeryIllConditioned
171171
alg = QRFactorization()
172-
elseif __conditioning(assump) === SuperIllConditioned
172+
elseif __conditioning(assump) === OperatorCondition.SuperIllConditioned
173173
alg = SVDFactorization(false, LinearAlgebra.QRIteration())
174174
else
175175
alg = LUFactorization()
@@ -187,15 +187,15 @@ function defaultalg(A, b, assump::OperatorAssumptions{true})
187187
alg
188188
end
189189

190-
function defaultalg(A, b, ::OperatorAssumptions{false,IllConditioned})
190+
function defaultalg(A, b, ::OperatorAssumptions{false,OperatorCondition.IllConditioned})
191191
QRFactorization()
192192
end
193193

194-
function defaultalg(A, b, ::OperatorAssumptions{false,VeryIllConditioned})
194+
function defaultalg(A, b, ::OperatorAssumptions{false,OperatorCondition.VeryIllConditioned})
195195
QRFactorization()
196196
end
197197

198-
function defaultalg(A, b, ::OperatorAssumptions{false,SuperIllConditioned})
198+
function defaultalg(A, b, ::OperatorAssumptions{false,OperatorCondition.SuperIllConditioned})
199199
SVDFactorization(false, LinearAlgebra.QRIteration())
200200
end
201201

0 commit comments

Comments
 (0)