Skip to content

Commit 4938914

Browse files
authored
Fix type ambiguity due to new BlockArrays (#86)
1 parent 5d69576 commit 4938914

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "BlockBandedMatrices"
22
uuid = "ffab5731-97b5-5995-9138-79e8c1846df0"
3-
version = "0.9.2"
3+
version = "0.9.3"
44

55
[deps]
66
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
@@ -18,7 +18,7 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
1818
[compat]
1919
ArrayLayouts = "0.4.1"
2020
BandedMatrices = "0.15.16"
21-
BlockArrays = "0.12.12"
21+
BlockArrays = "0.12.13"
2222
FillArrays = "0.9.2"
2323
MatrixFactorizations = "0.5.2, 0.6"
2424
julia = "1.5"

src/BandedBlockBandedMatrix.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,8 @@ sublayout(::AbstractBandedBlockBandedLayout, ::Type{<:Tuple{BlockSlice{BlockRang
461461

462462

463463
sub_materialize(::AbstractBandedBlockBandedLayout, V, _) = BandedBlockBandedMatrix(V)
464+
sub_materialize(::AbstractBandedBlockBandedLayout, V, ::Tuple{<:BlockedUnitRange,<:BlockedUnitRange}) = BandedBlockBandedMatrix(V)
465+
464466

465467
isbanded(A::SubArray{<:Any,2,<:BandedBlockBandedMatrix}) = MemoryLayout(typeof(A)) == BandedColumnMajor()
466468
isbandedblockbanded(A::SubArray{<:Any,2,<:BandedBlockBandedMatrix}) = MemoryLayout(typeof(A)) == BandedBlockBandedColumnMajor()

src/linalg.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ isblockbanded(V::SubArray{<:Any,2,<:Any,<:Tuple{<:BlockSlice{BlockRange1}, <:Blo
9797
isblockbanded(parent(V))
9898

9999
sub_materialize(::AbstractBlockBandedLayout, V, _) = BlockBandedMatrix(V)
100+
sub_materialize(::AbstractBlockBandedLayout, V, ::Tuple{<:BlockedUnitRange,<:BlockedUnitRange}) = BlockBandedMatrix(V)
100101
sub_materialize(::BlockLayout{<:AbstractBandedLayout}, V, _) = BlockBandedMatrix(V)
102+
sub_materialize(::BlockLayout{<:AbstractBandedLayout}, V, ::Tuple{<:BlockedUnitRange,<:BlockedUnitRange}) = BlockBandedMatrix(V)
101103

102104
strides(V::SubBlockSkylineMatrix{<:Any,LL,UU,<:Union{BlockRange1,Block1},Block1}) where {LL,UU} =
103105
(1,parent(V).block_sizes.block_strides[Int(parentindices(V)[2].block)])

0 commit comments

Comments
 (0)