Merge 4a8b373 into 957f2af

Author: mtfishman

NDTensors/src/lib/BlockSparseArrays/src/blocksparsearrayinterface/blocksparsearrayinterface.jl

@@ -199,3 +199,7 @@ end
 function blocksparse_blocks(a::SubArray)
   return SparseSubArrayBlocks(a)
 end
+
+using BlockArrays: BlocksView
+# TODO: Is this correct in general?
+SparseArrayInterface.nstored(a::BlocksView) = 1

NDTensors/src/lib/BlockSparseArrays/test/runtests.jl

@@ -1,5 +1,5 @@
 @eval module $(gensym())
-include("basics.jl")
+include("test_basics.jl")
 include("../ext/BlockSparseArraysTensorAlgebraExt/test/runtests.jl")
 include("../ext/BlockSparseArraysGradedAxesExt/test/runtests.jl")
 end

NDTensors/src/lib/BlockSparseArrays/test/basics.jl renamed to NDTensors/src/lib/BlockSparseArrays/test/test_basics.jl

@@ -48,12 +48,39 @@ include("TestBlockSparseArraysUtils.jl")
     @test block_nstored(a) == 2
     @test nstored(a) == 2 * 4 + 3 * 3
 
+    b = similar(a, complex(elt))
+    @test eltype(b) == complex(eltype(a))
+    @test iszero(b)
+    @test block_nstored(b) == 0
+    @test nstored(b) == 0
+    @test size(b) == size(a)
+    @test blocksize(b) == blocksize(a)
+
+    b = copy(a)
+    b[1, 1] = 11
+    @test b[1, 1] == 11
+    @test a[1, 1] ≠ 11
+
+    b = copy(a)
+    b .*= 2
+    @test b ≈ 2a
+
+    b = copy(a)
+    b ./= 2
+    @test b ≈ a / 2
+
     b = 2 * a
     @test Array(b) ≈ 2 * Array(a)
     @test eltype(b) == elt
     @test block_nstored(b) == 2
     @test nstored(b) == 2 * 4 + 3 * 3
 
+    b = (2 + 3im) * a
+    @test Array(b) ≈ (2 + 3im) * Array(a)
+    @test eltype(b) == complex(elt)
+    @test block_nstored(b) == 2
+    @test nstored(b) == 2 * 4 + 3 * 3
+
     b = a + a
     @test Array(b) ≈ 2 * Array(a)
     @test eltype(b) == elt
@@ -78,8 +105,75 @@ include("TestBlockSparseArraysUtils.jl")
     b = map(x -> 2x, a)
     @test Array(b) ≈ 2 * Array(a)
     @test eltype(b) == elt
+    @test size(b) == size(a)
+    @test blocksize(b) == (2, 2)
     @test block_nstored(b) == 2
     @test nstored(b) == 2 * 4 + 3 * 3
+
+    b = a[[Block(2), Block(1)], [Block(2), Block(1)]]
+    @test b[Block(1, 1)] == a[Block(2, 2)]
+    @test b[Block(1, 2)] == a[Block(2, 1)]
+    @test b[Block(2, 1)] == a[Block(1, 2)]
+    @test b[Block(2, 2)] == a[Block(1, 1)]
+    @test size(b) == size(a)
+    @test blocksize(b) == (2, 2)
+    @test nstored(b) == nstored(a)
+    @test block_nstored(b) == 2
+
+    b = a[Block(1):Block(2), Block(1):Block(2)]
+    @test b == a
+    @test size(b) == size(a)
+    @test blocksize(b) == (2, 2)
+    @test nstored(b) == nstored(a)
+    @test block_nstored(b) == 2
+
+    b = a[Block(1):Block(1), Block(1):Block(2)]
+    @test b == Array(a)[1:2, 1:end]
+    @test b[Block(1, 1)] == a[Block(1, 1)]
+    @test b[Block(1, 2)] == a[Block(1, 2)]
+    @test size(b) == (2, 7)
+    @test blocksize(b) == (1, 2)
+    @test nstored(b) == nstored(a[Block(1, 2)])
+    @test block_nstored(b) == 1
+
+    b = a[2:4, 2:4]
+    @test b == Array(a)[2:4, 2:4]
+    @test size(b) == (3, 3)
+    @test blocksize(b) == (2, 2)
+    @test nstored(b) == 1 * 1 + 2 * 2
+    @test block_nstored(b) == 2
+
+    b = a[Block(2, 1)[1:2, 2:3]]
+    @test b == Array(a)[3:4, 2:3]
+    @test size(b) == (2, 2)
+    @test blocksize(b) == (1, 1)
+    @test nstored(b) == 2 * 2
+    @test block_nstored(b) == 1
+
+    ## Broken, need to fix.
+
+    @test_broken a[Block(1), Block(1):Block(2)]
+
+    # This is outputting only zero blocks.
+    b = a[Block(2):Block(2), Block(1):Block(2)]
+    @test_broken block_nstored(b) == 1
+    @test_broken b == Array(a)[3:5, 1:end]
+
+    b = a'
+    @test_broken block_nstored(b) == 2
+
+    b = transpose(a)
+    @test_broken block_nstored(b) == 2
+
+    b = copy(a)
+    x = randn(size(@view(a[Block(2, 2)])))
+    b[Block(2), Block(2)] = x
+    @test_broken b[Block(2, 2)] == x
+
+    # Doesnt' set the block
+    b = copy(a)
+    b[Block(1, 1)] .= 1
+    @test_broken b[1, 1] == trues(size(@view(b[1, 1])))
   end
   @testset "LinearAlgebra" begin
     a1 = BlockSparseArray{elt}([2, 3], [2, 3])