revert AbstractTriangular -> UpperLowerTriangular on released versions

JuliaLinearAlgebra · Jul 13, 2023 · 7d48ee4 · 7d48ee4
1 parent a9892a6
commit 7d48ee4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
@@ -34,6 +34,8 @@ jobs:
           - {repo: BandedMatrices.jl, group: JuliaLinearAlgebra}
           - {repo: BlockBandedMatrices.jl, group: JuliaLinearAlgebra}
           - {repo: InfiniteArrays.jl, group: JuliaArrays}
+          - {repo: LazyArrays.jl, group: JuliaArrays}
+          - {repo: InfiniteLinearAlgebra.jl, group: JuliaLinearAlgebra}
 
     steps:
       - uses: actions/checkout@v3

diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "ArrayLayouts"
 uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
 authors = ["Sheehan Olver <solver@mac.com>"]
-version = "1.0.11"
+version = "1.0.12"
 
 [deps]
 FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"

diff --git a/src/ArrayLayouts.jl b/src/ArrayLayouts.jl
@@ -52,13 +52,10 @@ else
     const CNoPivot = NoPivot
 end
 
-if VERSION ≥ v"1.11.0-DEV.21"
-    using LinearAlgebra: UpperOrLowerTriangular
+@static if VERSION ≥ v"1.11.0-DEV.21"
+    const AbsTriangular = LinearAlgebra.UpperOrLowerTriangular
 else
-    const UpperOrLowerTriangular{T,S} = Union{LinearAlgebra.UpperTriangular{T,S},
-                                              LinearAlgebra.UnitUpperTriangular{T,S},
-                                              LinearAlgebra.LowerTriangular{T,S},
-                                              LinearAlgebra.UnitLowerTriangular{T,S}}
+    const AbsTriangular = LinearAlgebra.AbstractTriangular
 end
 
 # Originally defined in FillArrays
@@ -160,7 +157,7 @@ end
 macro layoutgetindex(Typ)
     esc(quote
         ArrayLayouts.@_layoutgetindex $Typ
-        ArrayLayouts.@_layoutgetindex ArrayLayouts.UpperOrLowerTriangular{<:Any,<:$Typ}
+        ArrayLayouts.@_layoutgetindex ArrayLayouts.AbsTriangular{<:Any,<:$Typ}
         ArrayLayouts.@_layoutgetindex LinearAlgebra.Symmetric{<:Any,<:$Typ}
         ArrayLayouts.@_layoutgetindex LinearAlgebra.Hermitian{<:Any,<:$Typ}
         ArrayLayouts.@_layoutgetindex LinearAlgebra.Adjoint{<:Any,<:$Typ}
@@ -370,7 +367,7 @@ Base.replace_in_print_matrix(A::Union{LayoutVector,
 Base.print_matrix_row(io::IO,
         X::Union{LayoutMatrix,
         LayoutVector,
-        UpperOrLowerTriangular{<:Any,<:LayoutMatrix},
+        AbsTriangular{<:Any,<:LayoutMatrix},
         AdjOrTrans{<:Any,<:LayoutMatrix},
         AdjOrTrans{<:Any,<:LayoutVector},
         HermOrSym{<:Any,<:LayoutMatrix},

diff --git a/src/memorylayout.jl b/src/memorylayout.jl
@@ -716,8 +716,8 @@ end
 
 axes(A::HermOrSym{<:Any,<:LayoutMatrix}) = _sym_axes(A)
 axes(A::HermOrSym{<:Any,<:SubArray{<:Any,2,<:LayoutMatrix}}) = _sym_axes(A)
-axes(A::UpperOrLowerTriangular{<:Any,<:LayoutMatrix}) = axes(parent(A))
-axes(A::UpperOrLowerTriangular{<:Any,<:SubArray{<:Any,2,<:LayoutMatrix}}) = axes(parent(A))
+axes(A::AbsTriangular{<:Any,<:LayoutMatrix}) = axes(parent(A))
+axes(A::AbsTriangular{<:Any,<:SubArray{<:Any,2,<:LayoutMatrix}}) = axes(parent(A))
 
 function axes(D::Diagonal{<:Any,<:LayoutVector})
     a = axes(parent(D),1)