Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/LazyBandedMatrices.jl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import ArrayLayouts: MemoryLayout, bidiagonallayout, bidiagonaluplo, diagonaldat
materialize!, MulAdd, MatMulVecAdd
import LazyArrays: ApplyLayout, AbstractPaddedLayout, PaddedLayout, PaddedColumns, BroadcastLayout, LazyArrayStyle, LazyLayout,
arguments, call, tuple_type_memorylayouts, paddeddata, _broadcast_sub_arguments, resizedata!,
_cumsum, convexunion, applylayout, AbstractLazyBandedLayout, ApplyBandedLayout, BroadcastBandedLayout, LazyBandedLayout
_cumsum, convexunion, applylayout, AbstractLazyBandedLayout, ApplyBandedLayout, BroadcastBandedLayout, LazyBandedLayout, applied_eltype
import BandedMatrices: AbstractBandedMatrix, BandedStyle, bandwidths, isbanded
import BlockBandedMatrices: AbstractBlockBandedLayout, AbstractBandedBlockBandedLayout, BlockRange1, Block1, blockbandwidths, subblockbandwidths,
BlockBandedStyle, BandedBlockBandedStyle, isblockbanded, isbandedblockbanded
Expand All @@ -35,6 +35,8 @@ const AbstractLazyBandedBlockBandedLayout = LazyArraysBlockBandedMatricesExt.Abs
const ApplyBandedBlockBandedLayout = LazyArraysBlockBandedMatricesExt.ApplyBandedBlockBandedLayout
const LazyBlockBandedLayouts = LazyArraysBlockBandedMatricesExt.LazyBlockBandedLayouts

const BlockVec = LazyArraysBlockArraysExt.BlockVec


export DiagTrav, KronTrav, blockkron, BlockKron, BlockBroadcastArray, BlockVcat, BlockHcat, BlockHvcat, unitblocks

Expand Down
5 changes: 0 additions & 5 deletions src/blockconcat.jl
Original file line number Diff line number Diff line change
Expand Up @@ -488,11 +488,6 @@ MemoryLayout(::Type{BlockBroadcastArray{T,N,FF,Args}}) where {T,N,FF,Args} = blo

resize!(c::BlockBroadcastVector{T,typeof(vcat)}, N::Block{1}) where T = BlockBroadcastVector{T}(vcat, resize!.(c.args, N)...)

####
# BlockVec
####

const BlockVec = LazyBandedMatrices.LazyArraysBlockArraysExt.BlockVec

####
# summary
Expand Down
31 changes: 0 additions & 31 deletions test/test_blockconcat.jl
Original file line number Diff line number Diff line change
Expand Up @@ -421,35 +421,4 @@ end
end
end

@testset "BlockVec" begin
X = randn(5,4)
b = BlockVec(X)
@test size(b) == (20,)
@test length(b) == 20
@test MemoryLayout(b) isa ApplyLayout{typeof(blockvec)}
@test b == vec(X)
@test view(b, Block(3)) ≡ view(X, :, 3)
@test b[Block(3)] isa Vector
b[5] = 6
@test X[5] == 6
@test resize!(b, Block(2)) == b[Block.(1:2)]

c = BlockVec(X')
@test c == vec(X')
@test view(c, Block(3)) ≡ view(X', :, 3)
@test resize!(c, Block(2)) == c[Block.(1:2)]

c = BlockVec(transpose(X))
@test c == vec(transpose(X))
@test view(c, Block(3)) ≡ view(transpose(X), :, 3)
@test resize!(c, Block(2)) == c[Block.(1:2)]

X = cache(Zeros(5,6));
X[1,1] = 2
c = BlockVec(X);
@test MemoryLayout(c) isa PaddedColumns
@test paddeddata(c) isa BlockVec
@test paddeddata(c) == [2]
end

end # module
Loading