Skip to content

Commit 32e5ab8

Browse files
dkarraschararslan
andauthored
remove usage of 2-arg LA.AbstractTriangular (#146)
* remove usage of 2-arg `LA.AbstractTriangular` * fix * another fix * fix v1.9 * include review comments * Update Project.toml * Update src/ArrayLayouts.jl Co-authored-by: Alex Arslan <[email protected]> --------- Co-authored-by: Alex Arslan <[email protected]>
1 parent f69ac2a commit 32e5ab8

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

src/ArrayLayouts.jl

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,15 @@ else
5252
const CNoPivot = NoPivot
5353
end
5454

55+
if VERSION v"1.11.0-DEV.21"
56+
using LinearAlgebra: UpperOrLowerTriangular
57+
else
58+
const UpperOrLowerTriangular{T,S} = Union{LinearAlgebra.UpperTriangular{T,S},
59+
LinearAlgebra.UnitUpperTriangular{T,S},
60+
LinearAlgebra.LowerTriangular{T,S},
61+
LinearAlgebra.UnitLowerTriangular{T,S}}
62+
end
63+
5564
# Originally defined in FillArrays
5665
_copy_oftype(A::AbstractArray, ::Type{S}) where {S} = eltype(A) == S ? copy(A) : AbstractArray{S}(A)
5766
_copy_oftype(A::AbstractRange, ::Type{S}) where {S} = eltype(A) == S ? copy(A) : map(S, A)
@@ -151,7 +160,7 @@ end
151160
macro layoutgetindex(Typ)
152161
esc(quote
153162
ArrayLayouts.@_layoutgetindex $Typ
154-
ArrayLayouts.@_layoutgetindex LinearAlgebra.AbstractTriangular{<:Any,<:$Typ}
163+
ArrayLayouts.@_layoutgetindex ArrayLayouts.UpperOrLowerTriangular{<:Any,<:$Typ}
155164
ArrayLayouts.@_layoutgetindex LinearAlgebra.Symmetric{<:Any,<:$Typ}
156165
ArrayLayouts.@_layoutgetindex LinearAlgebra.Hermitian{<:Any,<:$Typ}
157166
ArrayLayouts.@_layoutgetindex LinearAlgebra.Adjoint{<:Any,<:$Typ}
@@ -361,7 +370,7 @@ Base.replace_in_print_matrix(A::Union{LayoutVector,
361370
Base.print_matrix_row(io::IO,
362371
X::Union{LayoutMatrix,
363372
LayoutVector,
364-
AbstractTriangular{<:Any,<:LayoutMatrix},
373+
UpperOrLowerTriangular{<:Any,<:LayoutMatrix},
365374
AdjOrTrans{<:Any,<:LayoutMatrix},
366375
AdjOrTrans{<:Any,<:LayoutVector},
367376
HermOrSym{<:Any,<:LayoutMatrix},

src/memorylayout.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,8 +716,8 @@ end
716716

717717
axes(A::HermOrSym{<:Any,<:LayoutMatrix}) = _sym_axes(A)
718718
axes(A::HermOrSym{<:Any,<:SubArray{<:Any,2,<:LayoutMatrix}}) = _sym_axes(A)
719-
axes(A::AbstractTriangular{<:Any,<:LayoutMatrix}) = axes(parent(A))
720-
axes(A::AbstractTriangular{<:Any,<:SubArray{<:Any,2,<:LayoutMatrix}}) = axes(parent(A))
719+
axes(A::UpperOrLowerTriangular{<:Any,<:LayoutMatrix}) = axes(parent(A))
720+
axes(A::UpperOrLowerTriangular{<:Any,<:SubArray{<:Any,2,<:LayoutMatrix}}) = axes(parent(A))
721721

722722
function axes(D::Diagonal{<:Any,<:LayoutVector})
723723
a = axes(parent(D),1)

0 commit comments

Comments
 (0)