Skip to content

Commit dfb8513

Browse files
authored
Move out BlockVec (#149)
* Move out BlockVec * Update blockconcat.jl
1 parent 8d98411 commit dfb8513

File tree

3 files changed

+3
-37
lines changed

3 files changed

+3
-37
lines changed

src/LazyBandedMatrices.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import ArrayLayouts: MemoryLayout, bidiagonallayout, bidiagonaluplo, diagonaldat
1717
materialize!, MulAdd, MatMulVecAdd
1818
import LazyArrays: ApplyLayout, AbstractPaddedLayout, PaddedLayout, PaddedColumns, BroadcastLayout, LazyArrayStyle, LazyLayout,
1919
arguments, call, tuple_type_memorylayouts, paddeddata, _broadcast_sub_arguments, resizedata!,
20-
_cumsum, convexunion, applylayout, AbstractLazyBandedLayout, ApplyBandedLayout, BroadcastBandedLayout, LazyBandedLayout
20+
_cumsum, convexunion, applylayout, AbstractLazyBandedLayout, ApplyBandedLayout, BroadcastBandedLayout, LazyBandedLayout, applied_eltype
2121
import BandedMatrices: AbstractBandedMatrix, BandedStyle, bandwidths, isbanded
2222
import BlockBandedMatrices: AbstractBlockBandedLayout, AbstractBandedBlockBandedLayout, BlockRange1, Block1, blockbandwidths, subblockbandwidths,
2323
BlockBandedStyle, BandedBlockBandedStyle, isblockbanded, isbandedblockbanded
@@ -35,6 +35,8 @@ const AbstractLazyBandedBlockBandedLayout = LazyArraysBlockBandedMatricesExt.Abs
3535
const ApplyBandedBlockBandedLayout = LazyArraysBlockBandedMatricesExt.ApplyBandedBlockBandedLayout
3636
const LazyBlockBandedLayouts = LazyArraysBlockBandedMatricesExt.LazyBlockBandedLayouts
3737

38+
const BlockVec = LazyArraysBlockArraysExt.BlockVec
39+
3840

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

src/blockconcat.jl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -488,11 +488,6 @@ MemoryLayout(::Type{BlockBroadcastArray{T,N,FF,Args}}) where {T,N,FF,Args} = blo
488488

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

491-
####
492-
# BlockVec
493-
####
494-
495-
const BlockVec = LazyBandedMatrices.LazyArraysBlockArraysExt.BlockVec
496491

497492
####
498493
# summary

test/test_blockconcat.jl

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -421,35 +421,4 @@ end
421421
end
422422
end
423423

424-
@testset "BlockVec" begin
425-
X = randn(5,4)
426-
b = BlockVec(X)
427-
@test size(b) == (20,)
428-
@test length(b) == 20
429-
@test MemoryLayout(b) isa ApplyLayout{typeof(blockvec)}
430-
@test b == vec(X)
431-
@test view(b, Block(3)) view(X, :, 3)
432-
@test b[Block(3)] isa Vector
433-
b[5] = 6
434-
@test X[5] == 6
435-
@test resize!(b, Block(2)) == b[Block.(1:2)]
436-
437-
c = BlockVec(X')
438-
@test c == vec(X')
439-
@test view(c, Block(3)) view(X', :, 3)
440-
@test resize!(c, Block(2)) == c[Block.(1:2)]
441-
442-
c = BlockVec(transpose(X))
443-
@test c == vec(transpose(X))
444-
@test view(c, Block(3)) view(transpose(X), :, 3)
445-
@test resize!(c, Block(2)) == c[Block.(1:2)]
446-
447-
X = cache(Zeros(5,6));
448-
X[1,1] = 2
449-
c = BlockVec(X);
450-
@test MemoryLayout(c) isa PaddedColumns
451-
@test paddeddata(c) isa BlockVec
452-
@test paddeddata(c) == [2]
453-
end
454-
455424
end # module

0 commit comments

Comments
 (0)