Skip to content

Commit 208b306

Browse files
committed
replace AbstractTriangular by UpperOrLowerTriangular
1 parent e41fce4 commit 208b306

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "BlockArrays"
22
uuid = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
3-
version = "0.16.35"
3+
version = "0.16.36"
44

55
[deps]
66
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"

src/BlockArrays.jl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ import ArrayLayouts: _fill_lmul!, MatMulVecAdd, MatMulMatAdd, MatLmulVec, MatLdi
4444
triangularlayout, triangulardata, _inv, _copyto!, axes_print_matrix_row,
4545
colsupport, rowsupport, sub_materialize, sub_materialize_axes, zero!
4646

47+
if VERSION v"1.11.0-DEV.21"
48+
using LinearAlgebra: UpperOrLowerTriangular
49+
else
50+
const UpperOrLowerTriangular{T,S} = Union{LinearAlgebra.UpperTriangular{T,S},
51+
LinearAlgebra.UnitUpperTriangular{T,S},
52+
LinearAlgebra.LowerTriangular{T,S},
53+
LinearAlgebra.UnitLowerTriangular{T,S}}
54+
end
55+
4756
include("blockindices.jl")
4857
include("blockaxis.jl")
4958
include("abstractblockarray.jl")

src/abstractblockarray.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ end
222222
@inline getindex(A::AbstractMatrix, kr::AbstractVector, jr::Block) = ArrayLayouts.layout_getindex(A, kr, jr)
223223
@inline getindex(A::AbstractMatrix, kr::BlockRange{1}, jr::BlockRange{1}) = ArrayLayouts.layout_getindex(A, kr, jr)
224224
@inline getindex(A::LayoutMatrix, kr::BlockRange{1}, jr::BlockRange{1}) = ArrayLayouts.layout_getindex(A, kr, jr)
225-
for Typ in (:AbstractTriangular, :Adjoint, :Transpose, :Symmetric, :Hermitian)
225+
for Typ in (:UpperOrLowerTriangular, :Adjoint, :Transpose, :Symmetric, :Hermitian)
226226
@eval @inline getindex(A::$Typ{<:Any,<:LayoutMatrix}, kr::BlockRange{1}, jr::BlockRange{1}) = ArrayLayouts.layout_getindex(A, kr, jr)
227227
end
228228

src/blockarrayinterface.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ end
99
# Symmetric and Triangular should inherit blocks from parent
1010
axes(A::HermOrSym{<:Any,<:AbstractBlockMatrix}) = _sym_axes(A)
1111
axes(A::HermOrSym{<:Any,<:SubArray{<:Any,2,<:AbstractBlockMatrix}}) = _sym_axes(A)
12-
axes(A::AbstractTriangular{<:Any,<:AbstractBlockMatrix}) = axes(parent(A))
13-
axes(A::AbstractTriangular{<:Any,<:SubArray{<:Any,2,<:AbstractBlockMatrix}}) = axes(parent(A))
12+
axes(A::UpperOrLowerTriangular{<:Any,<:AbstractBlockMatrix}) = axes(parent(A))
13+
axes(A::UpperOrLowerTriangular{<:Any,<:SubArray{<:Any,2,<:AbstractBlockMatrix}}) = axes(parent(A))
1414
function axes(D::Diagonal{<:Any,<:AbstractBlockVector})
1515
a = axes(parent(D),1)
1616
(a,a)

0 commit comments

Comments
 (0)