Fix stack overflow w/ OneTo axes (#74)

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "BlockBandedMatrices"
 uuid = "ffab5731-97b5-5995-9138-79e8c1846df0"
-version = "0.8.5"
+version = "0.8.6"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
@@ -11,11 +11,9 @@ FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MatrixFactorizations = "a3b82374-2e81-5b9e-98ce-41277c0e4c87"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
-Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SharedArrays = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
 ArrayLayouts = "0.3.3"
@@ -24,3 +22,10 @@ BlockArrays = "0.12.7"
 FillArrays = "0.8.10"
 MatrixFactorizations = "0.4.1"
 julia = "1.2"
+
+[extras]
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Random", "Test"]

src/BandedBlockBandedMatrix.jl

@@ -310,7 +310,7 @@ end
     BI,BJ = findblockindex.(axes(A), (i,j))
     if -A.l ≤ Int(block(BJ)-block(BI)) ≤ A.u
         V = view(A, block(BI),block(BJ))
-        @inbounds V[blockindex(BI),blockindex(BJ)] = convert(T, v)::T
+         @inbounds V[blockindex(BI),blockindex(BJ)] = convert(T, v)::T
     elseif !iszero(v)
         throw(BandError(A))
     end
@@ -462,13 +462,13 @@ function blockbandwidths(V::SubArray{<:Any,2,<:Any,<:Tuple{<:BlockSlice{<:BlockR
 end
 
 
-const BandedBlockBandedBlock{T, BLOCKS, RAXIS} = SubArray{T,2,BandedBlockBandedMatrix{T, BLOCKS, RAXIS},<:Tuple{<:BlockSlice1,<:BlockSlice1},false}
+const BandedBlockBandedBlock{T, BLOCKS, RAXIS} = SubArray{T,2,BandedBlockBandedMatrix{T, BLOCKS, RAXIS},<:Tuple{<:BlockSlice{Block1},<:BlockSlice{Block1}},false}
 
 
 BroadcastStyle(::Type{<: BandedBlockBandedBlock}) = BandedStyle()
 
 
-function inblockbands(V::SubArray{<:Any,2,<:AbstractMatrix,<:Tuple{<:BlockSlice1,<:BlockSlice1},false})
+function inblockbands(V::SubArray{<:Any,2,<:AbstractMatrix,<:Tuple{<:BlockSlice{Block1},<:BlockSlice{Block1}},false})
     A = parent(V)
     K_sl, J_sl = parentindices(V)
     K, J = K_sl.block, J_sl.block
@@ -502,7 +502,7 @@ parentblocks2Int(V::BandedBlockBandedBlock)::Tuple{Int,Int} = Int(first(parentin
 ######################################
 # BandedMatrix interface  for Blocks #
 ######################################
-@inline function bandwidths(V::SubArray{T,2,<:AbstractMatrix,<:Tuple{BlockSlice1,BlockSlice1}}) where T
+@inline function bandwidths(V::SubArray{T,2,<:AbstractMatrix,<:Tuple{BlockSlice{Block1},BlockSlice{Block1}}}) where T
     inblockbands(V) && return subblockbandwidths(parent(V))
     (-720,-720)
 end

src/BlockBandedMatrices.jl

@@ -21,7 +21,7 @@ import LinearAlgebra.LAPACK: chktrans, chkdiag, liblapack, chklapackerror, check
 import MatrixFactorizations: ql, ql!, _ql, QLPackedQ, AdjQRPackedQLayout, AdjQLPackedQLayout, QR, QRPackedQ
 import SparseArrays: sparse
 
-import ArrayLayouts: BlasMatLmulVec,
+import ArrayLayouts: BlasMatLmulVec, MatLmulVec, MatLmulMat,
                     triangularlayout, UpperTriangularLayout, TriangularLayout, MatLdivVec,
                     triangulardata, sublayout, sub_materialize,
                     AbstractColumnMajor, DenseColumnMajor, ColumnMajor,

src/blockskylineqr.jl

@@ -73,7 +73,7 @@ _qr(lay::AbstractBlockBandedLayout, ax::Tuple{AbstractUnitRange{Int},AbstractUni
 _ql(::AbstractBlockBandedLayout, _, A) = ql!(BlockBandedMatrix(A, (blockbandwidth(A,1)+blockbandwidth(A,2),blockbandwidth(A,2))))
 _factorize(::AbstractBlockBandedLayout, _, A) = qr(A)
 
-function materialize!(Mul::Lmul{<:AdjQRPackedQLayout{<:AbstractBlockBandedLayout}})
+function materialize!(Mul::MatLmulVec{<:AdjQRPackedQLayout{<:AbstractBlockBandedLayout}})
     adjQ,Bin = Mul.A,Mul.B
     Q = parent(adjQ)
     A = Q.factors
@@ -91,7 +91,7 @@ function materialize!(Mul::Lmul{<:AdjQRPackedQLayout{<:AbstractBlockBandedLayout
     end
     Bin
 end
-function materialize!(Mul::Lmul{<:AdjQLPackedQLayout{<:AbstractBlockBandedLayout}})
+function materialize!(Mul::MatLmulVec{<:AdjQLPackedQLayout{<:AbstractBlockBandedLayout}})
     Q = parent(Mul.A)
     A = Q.factors
     l,u = blockbandwidths(A)
@@ -111,7 +111,7 @@ end
 
 # avoid LinearALgebra Strided obsession 
 
-for Typ in (:StridedVector, :StridedMatrix, :AbstractVector, :AbstractMatrix)
+for Typ in (:StridedVector, :StridedMatrix, :AbstractVector, :AbstractMatrix, :LayoutMatrix)
     @eval function ldiv!(A::QR{<:Any,<:BlockSkylineMatrix}, B::$Typ)
         lmul!(adjoint(A.Q), B)
         M,N = blocksize(A.factors)

test/test_bandedblockbanded.jl

@@ -470,6 +470,17 @@ import BlockBandedMatrices: _BandedBlockBandedMatrix, blockcolsupport, blockrows
         @test bandwidths(V2) == (-1,1)
         @test BandedMatrix(V2) == A[3:3,5:6]
     end
+
+    @testset "OneTo axes" begin
+        ret = BandedBlockBandedMatrix{Int}(undef, (Base.OneTo(5),Base.OneTo(5)), (0,0), (1,1))
+        V = view(ret, Block(1,1))
+        @test bandwidths(V) == (1,1)
+        A = brand(5,5,1,1)
+        B = BandedBlockBandedMatrix(A)
+        @test A == B
+        @test subblockbandwidths(B) == (1,1)
+        @test blockbandwidths(B) == (0,0)
+    end
 end
 
 if false # turned off since tests have check-bounds=yes

test/test_misc.jl

@@ -31,6 +31,4 @@ end
     @test_throws DimensionMismatch A+I
     A = BlockTridiagonal(fill([1 2; 1 2],3), fill([3 4; 3 4],4), fill([4 5; 4 5],3))
     @test A+I == I+A == mortar(Tridiagonal(fill([1 2; 1 2],3), fill([4 4; 3 5],4), fill([4 5; 4 5],3))) == Matrix(A) + I
-end
-
-
+end