Format

Author: mtfishman

src/blocksparsearrayinterface/blocksparsearrayinterface.jl

@@ -410,7 +410,9 @@ function SparseArraysBase.getunstoredindex(
     _perm(a.array),
   )
 end
-function SparseArraysBase.eachstoredindex(a::SparsePermutedDimsArrayBlocks)
+function SparseArraysBase.eachstoredindex(
+  ::IndexCartesian, a::SparsePermutedDimsArrayBlocks
+)
   return map(I -> _getindices(I, _perm(a.array)), eachstoredindex(blocks(parent(a.array))))
 end
 ## TODO: Define `storedvalues` instead.

src/blocksparsearrayinterface/getunstoredblock.jl

@@ -18,6 +18,7 @@ function Base.AbstractArray{A}(a::ZeroBlocks{N}) where {N,A}
 end
 
 @inline function Base.getindex(a::ZeroBlocks{N,A}, I::Vararg{Int,N}) where {N,A}
+  # TODO: Use `BlockArrays.eachblockaxes`.
   ax = ntuple(N) do d
     return only(axes(a.parentaxes[d][Block(I[d])]))
   end

test/Project.toml

@@ -8,6 +8,7 @@ DerivableInterfaces = "6c5e35bf-e59e-4898-b73c-732dcc4ba65f"
 DiagonalArrays = "74fd4be6-21e2-4f6f-823a-4360d37c7a77"
 GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527"
 JLArrays = "27aeb0d3-9eb9-45fb-866b-73c2ecf80fcb"
+KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MatrixAlgebraKit = "6c742aac-3347-4629-af66-fc926824e5e4"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

test/test_basics.jl

@@ -399,7 +399,7 @@ arrayts = (Array, JLArray)
     a_dest = a1 * a2
     @allowscalar @test Array(a_dest) ≈ Array(a1) * Array(a2)
     @test a_dest isa BlockSparseArray{elt}
-    @test_broken blockstoredlength(a_dest) == 1
+    @test blockstoredlength(a_dest) == 1
   end
   @testset "Matrix multiplication" begin
     a1 = dev(BlockSparseArray{elt}(undef, [2, 3], [2, 3]))
@@ -430,23 +430,23 @@ arrayts = (Array, JLArray)
     a2[Block(1, 2)] = dev(randn(elt, size(@view(a2[Block(1, 2)]))))
 
     a_dest = cat(a1, a2; dims=1)
-    @test_broken blockstoredlength(a_dest) == 2
+    @test blockstoredlength(a_dest) == 2
     @test blocklengths.(axes(a_dest)) == ([2, 3, 2, 3], [2, 3])
-    @test_broken issetequal(eachblockstoredindex(a_dest), [Block(2, 1), Block(3, 2)])
+    @test issetequal(eachblockstoredindex(a_dest), [Block(2, 1), Block(3, 2)])
     @test a_dest[Block(2, 1)] == a1[Block(2, 1)]
     @test a_dest[Block(3, 2)] == a2[Block(1, 2)]
 
     a_dest = cat(a1, a2; dims=2)
-    @test_broken blockstoredlength(a_dest) == 2
+    @test blockstoredlength(a_dest) == 2
     @test blocklengths.(axes(a_dest)) == ([2, 3], [2, 3, 2, 3])
-    @test_broken issetequal(eachblockstoredindex(a_dest), [Block(2, 1), Block(1, 4)])
+    @test issetequal(eachblockstoredindex(a_dest), [Block(2, 1), Block(1, 4)])
     @test a_dest[Block(2, 1)] == a1[Block(2, 1)]
     @test a_dest[Block(1, 4)] == a2[Block(1, 2)]
 
     a_dest = cat(a1, a2; dims=(1, 2))
-    @test_broken blockstoredlength(a_dest) == 2
+    @test blockstoredlength(a_dest) == 2
     @test blocklengths.(axes(a_dest)) == ([2, 3, 2, 3], [2, 3, 2, 3])
-    @test_broken issetequal(eachblockstoredindex(a_dest), [Block(2, 1), Block(3, 4)])
+    @test issetequal(eachblockstoredindex(a_dest), [Block(2, 1), Block(3, 4)])
     @test a_dest[Block(2, 1)] == a1[Block(2, 1)]
     @test a_dest[Block(3, 4)] == a2[Block(1, 2)]
   end