Update for new LazyArrays (#43)

* Update for new LazyArrays

* Support BlockArrays 0.10

* BandedMatrices v0.11

* v0.5

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "BlockBandedMatrices"
 uuid = "ffab5731-97b5-5995-9138-79e8c1846df0"
-version = "0.4.6"
+version = "0.5"
 
 [deps]
 BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
@@ -19,9 +19,9 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
-BandedMatrices = "0.10"
-BlockArrays = "0.9.1"
-FillArrays = "0.6.4, 0.7"
-LazyArrays = "0.10"
+BandedMatrices = "0.11"
+BlockArrays = "0.10"
+FillArrays = "0.7"
+LazyArrays = "0.11"
 MatrixFactorizations = "0.1"
 julia = "1"

src/BlockBandedMatrices.jl

@@ -26,7 +26,7 @@ import LazyArrays: AbstractStridedLayout, ColumnMajor, @lazymul, MatMulMatAdd, M
                     triangularlayout, UpperTriangularLayout, TriangularLayout, MatLdivVec,
                     triangulardata, subarraylayout, @lazyldiv, @lazylmul,
                     AbstractColumnMajor, DenseColumnMajor, ColumnMajor,
-                    DiagonalLayout, apply!, materialize!, AbstractMulAddStyle, mulapplystyle
+                    DiagonalLayout, apply!, materialize!, MulAdd
 
 import BlockArrays: BlockSizes, nblocks, blocksize, blockcheckbounds, global2blockindex,
                         Block, BlockSlice, getblock, unblock, setblock!, globalrange,

src/interfaceimpl.jl

@@ -18,12 +18,12 @@ BroadcastStyle(::Type{<:SubArray{<:Any,2,<:PseudoBlockMatrix{<:Any,<:Diagonal},
                                 NTuple{2,BlockSlice1}}}) = BandedStyle()
 
 
-isblockbanded(K::Kron{<:Any,2}) = isbanded(first(K.arrays))
-isbandedblockbanded(K::Kron{<:Any,2}) = all(isbanded, K.arrays)
-blockbandwidths(K::Kron{<:Any,2}) = bandwidths(first(K.arrays))
-subblockbandwidths(K::Kron{<:Any,2}) = bandwidths(last(K.arrays))
+isblockbanded(K::Kron{<:Any,2}) = isbanded(first(K.args))
+isbandedblockbanded(K::Kron{<:Any,2}) = all(isbanded, K.args)
+blockbandwidths(K::Kron{<:Any,2}) = bandwidths(first(K.args))
+subblockbandwidths(K::Kron{<:Any,2}) = bandwidths(last(K.args))
 function blocksizes(K::Kron{<:Any,2})
-    A,B = K.arrays
+    A,B = K.args
     BlockSizes(Fill(size(B,1), size(A,1)), Fill(size(B,2), size(A,2)))
 end
 

src/linalg.jl

@@ -118,18 +118,8 @@ function add_bandwidths(A::BlockBandedMatrix,B::BlockBandedMatrix)
     Fill(l,nblocks(B,2)), Fill(u,nblocks(B,2))
 end
 
-struct BlockBandedMulAddStyle <: AbstractMulAddStyle end
-struct BandedBlockBandedMulAddStyle <: AbstractMulAddStyle end
-
-mulapplystyle(A::AbstractBlockBandedLayout, B::AbstractBlockBandedLayout) = BlockBandedMulAddStyle()
-mulapplystyle(A::AbstractBlockBandedLayout, B::DiagonalLayout) = mulapplystyle(A,A)
-mulapplystyle(A::DiagonalLayout, B::AbstractBlockBandedLayout) = mulapplystyle(B,B)
-mulapplystyle(A::BandedBlockBandedColumnMajor, B::BandedBlockBandedColumnMajor) = BandedBlockBandedMulAddStyle()
-
-function similar(M::Mul{BlockBandedMulAddStyle}, ::Type{T}) where T
-    A,B = M.args
-    A isa Diagonal && return similar(B,T)
-    B isa Diagonal && return similar(A,T)
+function similar(M::MulAdd{<:AbstractBlockBandedLayout,<:AbstractBlockBandedLayout}, ::Type{T}) where T
+    A,B = M.A, M.B
 
     Arows, Acols = A.block_sizes.block_sizes.cumul_sizes
     Brows, Bcols = B.block_sizes.block_sizes.cumul_sizes
@@ -149,10 +139,8 @@ function similar(M::Mul{BlockBandedMulAddStyle}, ::Type{T}) where T
     BlockSkylineMatrix{T}(undef, BlockSkylineSizes(BlockSizes((Arows,Bcols)), l, u))
 end
 
-function similar(M::Mul{BandedBlockBandedMulAddStyle}, ::Type{T}) where T
-    A,B = M.args
-    A isa Diagonal && return similar(B,T)
-    B isa Diagonal && return similar(A,T)
+function similar(M::MulAdd{BandedBlockBandedColumnMajor,BandedBlockBandedColumnMajor}, ::Type{T}) where T
+    A,B = M.A, M.B
 
     Arows, Acols = A.block_sizes.block_sizes.cumul_sizes
     Brows, Bcols = B.block_sizes.block_sizes.cumul_sizes
@@ -174,6 +162,10 @@ function similar(M::Mul{BandedBlockBandedMulAddStyle}, ::Type{T}) where T
     BandedBlockBandedMatrix{T}(undef, bs)
 end
 
+similar(M::MulAdd{<:DiagonalLayout,<:AbstractBlockBandedLayout}, ::Type{T}) where T = similar(M.B,T)
+similar(M::MulAdd{<:AbstractBlockBandedLayout,<:DiagonalLayout}, ::Type{T}) where T = similar(M.A,T)
+
+