Skip to content

Fix TypeError for nonsquare linear systems with QR factorization #675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −5
Open

Fix TypeError for nonsquare linear systems with QR factorization #675

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions src/factorization.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,18 @@ function QRFactorization(pivot::LinearAlgebra.PivotingStrategy, inplace::Bool =
QRFactorization(pivot, 16, inplace)
end

# Helper function to ensure QRPivoted has Int64 pivot indices
function _ensure_int64_pivot(fact::LinearAlgebra.QRPivoted)
if eltype(fact.p) !== Int64
# Convert to Int64 if needed
return LinearAlgebra.QRPivoted(fact.factors, fact.τ, convert(Vector{Int64}, fact.p))
end
return fact
end

# For non-pivoted QR, just return as-is
_ensure_int64_pivot(fact) = fact

function do_factorization(alg::QRFactorization, A, b, u)
A = convert(AbstractMatrix, A)
if ArrayInterface.can_setindex(typeof(A))
Expand All @@ -296,22 +308,26 @@ function do_factorization(alg::QRFactorization, A, b, u)
else
fact = qr(A, alg.pivot)
end
return fact
# Ensure Int64 pivot indices for QRPivoted
return _ensure_int64_pivot(fact)
end

function init_cacheval(alg::QRFactorization, A, b, u, Pl, Pr,
maxiters::Int, abstol, reltol, verbose::Bool,
assumptions::OperatorAssumptions)
ArrayInterface.qr_instance(convert(AbstractMatrix, A), alg.pivot)
fact = ArrayInterface.qr_instance(convert(AbstractMatrix, A), alg.pivot)
return _ensure_int64_pivot(fact)
end

function init_cacheval(alg::QRFactorization, A::Symmetric{<:Number, <:Array}, b, u, Pl, Pr,
maxiters::Int, abstol, reltol, verbose::Bool,
assumptions::OperatorAssumptions)
return qr(convert(AbstractMatrix, A), alg.pivot)
fact = qr(convert(AbstractMatrix, A), alg.pivot)
return _ensure_int64_pivot(fact)
end

const PREALLOCATED_QR_ColumnNorm = ArrayInterface.qr_instance(rand(1, 1), ColumnNorm())
# Create with Int64 pivot indices from the start
const PREALLOCATED_QR_ColumnNorm = _ensure_int64_pivot(ArrayInterface.qr_instance(rand(1, 1), ColumnNorm()))

function init_cacheval(alg::QRFactorization{ColumnNorm}, A::Matrix{Float64}, b, u, Pl, Pr,
maxiters::Int, abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
Expand All @@ -322,7 +338,8 @@ function init_cacheval(
alg::QRFactorization, A::Union{<:Adjoint, <:Transpose}, b, u, Pl, Pr,
maxiters::Int, abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
A isa GPUArraysCore.AnyGPUArray && return qr(A)
return qr(A, alg.pivot)
fact = qr(A, alg.pivot)
return _ensure_int64_pivot(fact)
end

const PREALLOCATED_QR_NoPivot = ArrayInterface.qr_instance(rand(1, 1))
Expand Down
Loading