Skip to content
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

Fix order of triangular and adjortrans wrappers #283

Merged
merged 4 commits into from
Nov 2, 2022
Merged

Fix order of triangular and adjortrans wrappers #283

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5cafe03
Fix order of triangular and adjortrans wrappers
dkarrasch Oct 27, 2022
fbd6948
fix oversights
dkarrasch Oct 30, 2022
3b25851
fix more oversights
dkarrasch Oct 30, 2022
aa7d4b8
yet another oversight
dkarrasch Oct 30, 2022
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
44 changes: 22 additions & 22 deletions src/linalg.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,20 +424,20 @@ const LowerTriangularPlain{T} = Union{
UnitLowerTriangular{T,<:SparseMatrixCSCUnion{T}}}

const LowerTriangularWrapped{T} = Union{
Adjoint{T,<:UpperTriangular{T,<:SparseMatrixCSCUnion{T}}},
Adjoint{T,<:UnitUpperTriangular{T,<:SparseMatrixCSCUnion{T}}},
Transpose{T,<:UpperTriangular{T,<:SparseMatrixCSCUnion{T}}},
Transpose{T,<:UnitUpperTriangular{T,<:SparseMatrixCSCUnion{T}}}} where T
LowerTriangular{T,<:Adjoint{T,<:SparseMatrixCSCUnion{T}}},
UnitLowerTriangular{T,<:Adjoint{T,<:SparseMatrixCSCUnion{T}}},
LowerTriangular{T,<:Transpose{T,<:SparseMatrixCSCUnion{T}}},
UnitLowerTriangular{T,<:Transpose{T,<:SparseMatrixCSCUnion{T}}}} where T

const UpperTriangularPlain{T} = Union{
UpperTriangular{T,<:SparseMatrixCSCUnion{T}},
UnitUpperTriangular{T,<:SparseMatrixCSCUnion{T}}}

const UpperTriangularWrapped{T} = Union{
Adjoint{T,<:LowerTriangular{T,<:SparseMatrixCSCUnion{T}}},
Adjoint{T,<:UnitLowerTriangular{T,<:SparseMatrixCSCUnion{T}}},
Transpose{T,<:LowerTriangular{T,<:SparseMatrixCSCUnion{T}}},
Transpose{T,<:UnitLowerTriangular{T,<:SparseMatrixCSCUnion{T}}}} where T
UpperTriangular{T,<:Adjoint{T,<:SparseMatrixCSCUnion{T}}},
UnitUpperTriangular{T,<:Adjoint{T,<:SparseMatrixCSCUnion{T}}},
UpperTriangular{T,<:Transpose{T,<:SparseMatrixCSCUnion{T}}},
UnitUpperTriangular{T,<:Transpose{T,<:SparseMatrixCSCUnion{T}}}} where T

const UpperTriangularSparse{T} = Union{
UpperTriangularWrapped{T}, UpperTriangularPlain{T}} where T
Expand Down Expand Up @@ -543,9 +543,9 @@ end

# forward multiplication for adjoint and transpose of LowerTriangular CSC matrices
function _lmul!(U::UpperTriangularWrapped, B::StridedVecOrMat)
A = U.parent.data
unit = U.parent isa UnitDiagonalTriangular
adj = U isa Adjoint
A = parent(parent(U))
unit = U isa UnitDiagonalTriangular
adj = parent(U) isa Adjoint

nrowB, ncolB = size(B, 1), size(B, 2)
aa = getnzval(A)
Expand Down Expand Up @@ -583,9 +583,9 @@ end

# backward multiplication with adjoint and transpose of LowerTriangular CSC matrices
function _lmul!(L::LowerTriangularWrapped, B::StridedVecOrMat)
A = L.parent.data
unit = L.parent isa UnitDiagonalTriangular
adj = L isa Adjoint
A = parent(parent(L))
unit = L isa UnitDiagonalTriangular
adj = parent(L) isa Adjoint

nrowB, ncolB = size(B, 1), size(B, 2)
aa = getnzval(A)
Expand Down Expand Up @@ -718,9 +718,9 @@ end

# forward substitution for adjoint and transpose of UpperTriangular CSC matrices
function _ldiv!(L::LowerTriangularWrapped, B::StridedVecOrMat)
A = L.parent.data
unit = L.parent isa UnitDiagonalTriangular
adj = L isa Adjoint
A = parent(parent(L))
unit = L isa UnitDiagonalTriangular
adj = parent(L) isa Adjoint

nrowB, ncolB = size(B, 1), size(B, 2)
aa = getnzval(A)
Expand Down Expand Up @@ -764,9 +764,9 @@ end

# backward substitution for adjoint and transpose of LowerTriangular CSC matrices
function _ldiv!(U::UpperTriangularWrapped, B::StridedVecOrMat)
A = U.parent.data
unit = U.parent isa UnitDiagonalTriangular
adj = U isa Adjoint
A = parent(parent(U))
unit = U isa UnitDiagonalTriangular
adj = parent(U) isa Adjoint

nrowB, ncolB = size(B, 1), size(B, 2)
aa = getnzval(A)
Expand Down Expand Up @@ -1582,10 +1582,10 @@ for (xformtype, xformop) in ((:Adjoint, :adjoint), (:Transpose, :transpose))
if istriu(A)
return \(Diagonal(($xformop.(diag(A)))), B)
else
return \($xformop(LowerTriangular(A)), B)
return \(UpperTriangular($xformop(A)), B)
end
elseif istriu(A)
return \($xformop(UpperTriangular(A)), B)
return \(LowerTriangular($xformop(A)), B)
end
if ishermitian(A)
return \($xformop(Hermitian(A)), B)
Expand Down