simplify sublayout

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "BlockBandedMatrices"
 uuid = "ffab5731-97b5-5995-9138-79e8c1846df0"
-version = "0.10"
+version = "0.10.0"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"

src/BandedBlockBandedMatrix.jl

@@ -391,23 +391,14 @@ const SubBandedBlockBandedMatrix{T,R1,R2} =
     SubArray{T,2,<:BandedBlockBandedMatrix{T},<:Tuple{BlockSlice{R1},BlockSlice{R2}}}
 
 
-sublayout(::BandedBlockBandedColumnMajor, ::Type{<:Tuple{BlockSlice1,BlockSlice1}}) = BandedColumnMajor()
-sublayout(::BandedBlockBandedColumnMajor, ::Type{<:Tuple{BlockSlice{<:BlockIndexRange1},BlockSlice{<:BlockIndexRange1}}}) = BandedColumnMajor()
-sublayout(::BandedBlockBandedColumnMajor, ::Type{<:Tuple{BlockSlice{<:BlockIndexRange1},BlockSlice1}}) = BandedColumnMajor()
-sublayout(::BandedBlockBandedColumnMajor, ::Type{<:Tuple{BlockSlice1,BlockSlice{<:BlockIndexRange1}}}) = BandedColumnMajor()
-sublayout(::BandedBlockBandedColumnMajor, ::Type{<:Tuple{BlockSlice{<:BlockRange1},BlockSlice{<:BlockRange1}}}) = BandedBlockBandedColumnMajor()
-sublayout(::BandedBlockBandedColumnMajor, ::Type{<:Tuple{BlockSlice1,BlockSlice{<:BlockRange1}}}) = BandedBlockBandedColumnMajor()
-sublayout(::BandedBlockBandedColumnMajor, ::Type{<:Tuple{BlockSlice{<:BlockRange1},BlockSlice1}}) = BandedBlockBandedColumnMajor()
-sublayout(::BandedBlockBandedColumnMajor, ::Type{<:Tuple{BlockSlice{<:BlockRange1},BlockSlice{<:BlockIndexRange1}}}) = BandedBlockBandedColumnMajor()
-
-sublayout(::BandedBlockBandedColumns, ::Type{<:Tuple{BlockSlice1,BlockSlice1}}) = BandedColumns{UnknownLayout}()
-sublayout(::BandedBlockBandedColumns, ::Type{<:Tuple{BlockSlice{<:BlockIndexRange1},BlockSlice{<:BlockIndexRange1}}}) = BandedColumns{UnknownLayout}()
-sublayout(::BandedBlockBandedColumns, ::Type{<:Tuple{BlockSlice{<:BlockIndexRange1},BlockSlice1}}) = BandedColumns{UnknownLayout}()
-sublayout(::BandedBlockBandedColumns, ::Type{<:Tuple{BlockSlice1,BlockSlice{<:BlockIndexRange1}}}) = BandedColumns{UnknownLayout}()
-sublayout(::BandedBlockBandedColumns, ::Type{<:Tuple{BlockSlice{<:BlockRange1},BlockSlice{<:BlockRange1}}}) = BandedBlockBandedColumns{UnknownLayout}()
-sublayout(::BandedBlockBandedColumns, ::Type{<:Tuple{BlockSlice1,BlockSlice{<:BlockRange1}}}) = BandedBlockBandedColumns{UnknownLayout}()
-sublayout(::BandedBlockBandedColumns, ::Type{<:Tuple{BlockSlice{<:BlockRange1},BlockSlice1}}) = BandedBlockBandedColumns{UnknownLayout}()
-sublayout(::BandedBlockBandedColumns, ::Type{<:Tuple{BlockSlice{<:BlockRange1},BlockSlice{<:BlockIndexRange1}}}) = BandedBlockBandedColumns{UnknownLayout}()
+sublayout(::BandedBlockBandedColumns{ML}, ::Type{II}) where {ML,II<:Tuple{BlockSlice1,BlockSlice1}} = bandedcolumns(sublayout(ML(), II))
+sublayout(::BandedBlockBandedColumns{ML}, ::Type{II}) where {ML,II<:Tuple{BlockSlice{<:BlockIndexRange1},BlockSlice{<:BlockIndexRange1}}} = bandedcolumns(sublayout(ML(), II))
+sublayout(::BandedBlockBandedColumns{ML}, ::Type{II}) where {ML,II<:Tuple{BlockSlice{<:BlockIndexRange1},BlockSlice1}} = bandedcolumns(sublayout(ML(), II))
+sublayout(::BandedBlockBandedColumns{ML}, ::Type{II}) where {ML,II<:Tuple{BlockSlice1,BlockSlice{<:BlockIndexRange1}}} = bandedcolumns(sublayout(ML(), II))
+sublayout(::BandedBlockBandedColumns{ML}, ::Type{II}) where {ML,II<:Tuple{BlockSlice{<:BlockRange1},BlockSlice{<:BlockRange1}}} = bandedblockbandedcolumns(sublayout(ML(), II))
+sublayout(::BandedBlockBandedColumns{ML}, ::Type{II}) where {ML,II<:Tuple{BlockSlice1,BlockSlice{<:BlockRange1}}} = bandedblockbandedcolumns(sublayout(ML(), II))
+sublayout(::BandedBlockBandedColumns{ML}, ::Type{II}) where {ML,II<:Tuple{BlockSlice{<:BlockRange1},BlockSlice1}} = bandedblockbandedcolumns(sublayout(ML(), II))
+sublayout(::BandedBlockBandedColumns{ML}, ::Type{II}) where {ML,II<:Tuple{BlockSlice{<:BlockRange1},BlockSlice{<:BlockIndexRange1}}} = bandedblockbandedcolumns(sublayout(ML(), II))
 
 blockbandshift(A::BlockSlice, B::BlockSlice) = BandedMatrices.bandshift(Int.(A.block), Int.(B.block))
 blockbandshift(S) = blockbandshift(parentindices(S)[1],parentindices(S)[2])
@@ -434,8 +425,8 @@ sub_materialize(::AbstractBandedBlockBandedLayout, V, ::Tuple{<:AbstractUnitRang
 sub_materialize(::AbstractBandedBlockBandedLayout, V, ::Tuple{<:BlockedUnitRange,<:AbstractUnitRange}) = PseudoBlockArray(V)
 
 
-isbanded(A::SubArray{<:Any,2,<:BandedBlockBandedMatrix}) = MemoryLayout(typeof(A)) == BandedColumnMajor()
-isbandedblockbanded(A::SubArray{<:Any,2,<:BandedBlockBandedMatrix}) = MemoryLayout(typeof(A)) == BandedBlockBandedColumnMajor()
+isbanded(A::SubArray{<:Any,2,<:BandedBlockBandedMatrix}) = MemoryLayout(A) isa AbstractBandedLayout
+isbandedblockbanded(A::SubArray{<:Any,2,<:BandedBlockBandedMatrix}) = MemoryLayout(A) isa AbstractBandedBlockBandedLayout
 
 
 subblockbandwidths(V::SubArray{<:Any,2,<:Any,<:Tuple{<:BlockSlice{<:BlockRange1},<:BlockSlice{<:BlockRange1}}}) =

src/BlockBandedMatrices.jl

@@ -38,7 +38,7 @@ import BandedMatrices: isbanded, bandwidths, bandwidth, banded_getindex, colrang
                         inbands_setindex!, inbands_getindex, banded_setindex!,
                         banded_generic_axpy!,
                         BlasFloat, banded_dense_axpy!, MemoryLayout,
-                        BandedLayout, BandedColumnMajor, BandedColumns,
+                        BandedLayout, BandedColumnMajor, BandedColumns, bandedcolumns,
                         BandedSubBandedMatrix, bandeddata,
                         _BandedMatrix, colstart, colstop, rowstart, rowstop,
                         BandedStyle, _fill_lmul!, bandshift,

test/test_bandedblockbanded.jl

@@ -455,20 +455,20 @@ import ArrayLayouts: RangeCumsum
         A = BandedBlockBandedMatrix{Float64}(undef, 1:2, 1:5,(-1,1), (-1,1))
         A.data .= randn.()
         V = view(A, Block(2,3))
-        @test MemoryLayout(typeof(V)) == BandedMatrices.BandedColumnMajor()
+        @test MemoryLayout(typeof(V)) == BandedMatrices.BandedColumns{ColumnMajor}()
         @test isbanded(V)
         @test bandwidths(V) == (-1,1)
         @test BandedMatrix(V) == A[2:3,4:6]
         V2 = view(V, :, 2:3)
-        @test MemoryLayout(typeof(V2)) == BandedMatrices.BandedColumnMajor()
+        @test MemoryLayout(typeof(V2)) == BandedMatrices.BandedColumns{ColumnMajor}()
         @test bandwidths(V2) == (0,0)
         @test BandedMatrix(V2) == A[2:3,5:6]
         V2 = view(V, 2:2, :)
-        @test MemoryLayout(typeof(V2)) == BandedMatrices.BandedColumnMajor()
+        @test MemoryLayout(typeof(V2)) == BandedMatrices.BandedColumns{ColumnMajor}()
         @test bandwidths(V2) == (-2,2)
         @test BandedMatrix(V2) == A[3:3,4:6]
         V2 = view(V, 2:2, 2:3)
-        @test MemoryLayout(typeof(V2)) == BandedMatrices.BandedColumnMajor()
+        @test MemoryLayout(typeof(V2)) == BandedMatrices.BandedColumns{ColumnMajor}()
         @test bandwidths(V2) == (-1,1)
         @test BandedMatrix(V2) == A[3:3,5:6]
     end

test/test_triblockbanded.jl

@@ -57,7 +57,7 @@ import BlockArrays: BlockedUnitRange, blockisequal
 
         @test blocksize(V) == (3,1)
         V2 = view(V, Block(1), Block(1))
-        @test MemoryLayout(typeof(V2)) == BandedColumnMajor()
+        @test MemoryLayout(V2) isa BandedMatrices.BandedColumns{ColumnMajor}
 
         b = rand(size(V,2))
         @test (similar(b, size(V,1)) .= MulAdd(V, b)) ≈ V*b