Fix tests

Author: mtfishman

Project.toml

@@ -1,7 +1,7 @@
 name = "BlockSparseArrays"
 uuid = "2c9a651f-6452-4ace-a6ac-809f4280fbb4"
 authors = ["ITensor developers <[email protected]> and contributors"]
-version = "0.2.9"
+version = "0.2.10"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
@@ -11,6 +11,7 @@ DerivableInterfaces = "6c5e35bf-e59e-4898-b73c-732dcc4ba65f"
 DiagonalArrays = "74fd4be6-21e2-4f6f-823a-4360d37c7a77"
 Dictionaries = "85a47980-9c8c-11e8-2b9f-f7ca1fa99fb4"
 FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
+GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527"
 GradedUnitRanges = "e2de450a-8a67-46c7-b59c-01d5a3d041c5"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"

src/blocksparsearrayinterface/blocksparsearrayinterface.jl

@@ -15,6 +15,7 @@ using BlockArrays:
   blocks,
   findblockindex
 using DerivableInterfaces: DerivableInterfaces, @interface, DefaultArrayInterface
+using GPUArraysCore: @allowscalar
 using LinearAlgebra: Adjoint, Transpose
 using SparseArraysBase:
   AbstractSparseArrayInterface,
@@ -65,9 +66,7 @@ end
 @interface ::AbstractBlockSparseArrayInterface function Base.getindex(
   a::AbstractArray{<:Any,0}
 )
-  # TODO: Use `Block()[]` once https://github.com/JuliaArrays/BlockArrays.jl/issues/430
-  # is fixed.
-  return a[BlockIndex()]
+  return @allowscalar a[Block()[]]
 end
 
 # a[1:2, 1:2]
@@ -158,7 +157,7 @@ end
 )
   a_b = blocks(a)[]
   # `value[]` handles scalars and 0-dimensional arrays.
-  a_b[] = value[]
+  @allowscalar a_b[] = value[]
   # Set the block, required if it is structurally zero.
   blocks(a)[] = a_b
   return a

test/basics/TestBlockSparseArraysUtils.jl renamed to test/TestBlockSparseArraysUtils.jl

@@ -183,30 +183,30 @@ arrayts = (Array, JLArray)
       @test blocksize(a) == ()
       @test blocksizes(a) == fill(())
       @test iszero(blockstoredlength(a))
-      @test iszero(@allowscalar(a[]))
-      @test iszero(@allowscalar(a[CartesianIndex()]))
+      @test iszero(a[])
+      @test iszero([CartesianIndex()])
       @test a[Block()] == dev(fill(0))
-      @test iszero(@allowscalar(a[Block()][]))
-      @test @allowscalar(a[Block()[]]) == 0
+      @test iszero(a[Block()][])
+      @test iszero(a[Block()[]])
       @test Array(a) isa Array{elt,0}
       @test Array(a) == fill(0)
       for b in (
-        (b = copy(a); @allowscalar b[] = 2; b),
-        (b = copy(a); @allowscalar b[CartesianIndex()] = 2; b),
-        (b = copy(a); @allowscalar b[CartesianIndex()] = 2; b),
+        (b = copy(a);  b[] = 2; b),
+        (b = copy(a); b[CartesianIndex()] = 2; b),
+        (b = copy(a); b[CartesianIndex()] = 2; b),
         # Regression test for https://github.com/ITensor/BlockSparseArrays.jl/issues/27.
-        (b = copy(a); @allowscalar b[Block()] = dev(fill(2)); b),
+        (b = copy(a); b[Block()] = dev(fill(2)); b),
       )
         @test size(b) == ()
         @test isone(length(b))
         @test blocksize(b) == ()
         @test blocksizes(b) == fill(())
         @test isone(blockstoredlength(b))
-        @test @allowscalar(b[]) == 2
-        @test @allowscalar(b[CartesianIndex()]) == 2
+        @test b[] == 2
+        @test b[CartesianIndex()] == 2
         @test b[Block()] == dev(fill(2))
-        @test @allowscalar(b[Block()][]) == 2
-        @test @allowscalar(b[Block()[]]) == 2
+        @test b[Block()][] == 2
+        @test b[Block()[]] == 2
         @test Array(b) isa Array{elt,0}
         @test Array(b) == fill(2)
       end