Mark broken noncontiguous slicing test

Author: mtfishman

src/abstractblocksparsearray/wrappedabstractblocksparsearray.jl

@@ -286,13 +286,11 @@ function Base.similar(
   elt::Type,
   axes::Tuple{Vararg{AbstractUnitRange{<:Integer}}},
 )
-  # TODO: Use `@interface interface(a) similar(...)`.
   return @interface interface(a) similar(a, elt, axes)
 end
 
 # Fixes ambiguity error.
 function Base.similar(a::AnyAbstractBlockSparseArray, elt::Type, axes::Tuple{})
-  # TODO: Use `@interface interface(a) similar(...)`.
   return @interface interface(a) similar(a, elt, axes)
 end
 
@@ -304,7 +302,6 @@ function Base.similar(
     AbstractBlockedUnitRange{<:Integer},Vararg{AbstractBlockedUnitRange{<:Integer}}
   },
 )
-  # TODO: Use `@interface interface(a) similar(...)`.
   return @interface interface(a) similar(a, elt, axes)
 end
 
@@ -314,7 +311,6 @@ function Base.similar(
   elt::Type,
   axes::Tuple{AbstractUnitRange{<:Integer},Vararg{AbstractUnitRange{<:Integer}}},
 )
-  # TODO: Use `@interface interface(a) similar(...)`.
   return @interface interface(a) similar(a, elt, axes)
 end
 
@@ -324,9 +320,17 @@ function Base.similar(
   elt::Type,
   axes::Tuple{AbstractBlockedUnitRange{<:Integer},Vararg{AbstractUnitRange{<:Integer}}},
 )
-  # TODO: Use `@interface interface(a) similar(...)`.
   return @interface interface(a) similar(a, elt, axes)
 end
+function Base.similar(a::AnyAbstractBlockSparseArray, elt::Type)
+  return @interface interface(a) similar(a, elt, axes(a))
+end
+function Base.similar(
+  a::AnyAbstractBlockSparseArray,
+  axes::Tuple{AbstractBlockedUnitRange{<:Integer},Vararg{AbstractUnitRange{<:Integer}}},
+)
+  return @interface interface(a) similar(a, eltype(a), axes)
+end
 
 # Fixes ambiguity errors with BlockArrays.
 function Base.similar(
@@ -346,7 +350,6 @@ end
 function Base.similar(
   a::AnyAbstractBlockSparseArray, elt::Type, axes::Tuple{Base.OneTo,Vararg{Base.OneTo}}
 )
-  # TODO: Use `@interface interface(a) similar(...)`.
   return @interface interface(a) similar(a, elt, axes)
 end
 

test/test_map.jl

@@ -6,9 +6,10 @@ using JLArrays: JLArray
 using SparseArraysBase: storedlength
 using Test: @test, @test_broken, @test_throws, @testset
 
+elts = (Float32, Float64, ComplexF32)
 arrayts = (Array, JLArray)
 @testset "map and slicing (arraytype=$arrayt, eltype=$elt)" for arrayt in arrayts,
-  elt in (Float32, Float64, ComplexF32)
+  elt in elts
 
   dev = adapt(arrayt)
 
@@ -407,7 +408,12 @@ arrayts = (Array, JLArray)
   a[Block(1, 1)] = dev(randn(elt, 2, 2))
   a[Block(2, 2)] = dev(randn(elt, 3, 3))
   I = (:, [2, 4])
-  @test Array(a[I...]) == Array(a)[I...]
+  if arrayt === Array
+    @test Array(a[I...]) == Array(a)[I...]
+  else
+    # TODO: Broken on GPU, fix this.
+    @test_broken a[I...]
+  end
 
   a = BlockSparseArray{elt}(undef, [2, 3], [2, 3])
   @views for b in [Block(1, 1), Block(2, 2)]
@@ -715,67 +721,3 @@ arrayts = (Array, JLArray)
   # TODO: Fix this.
   @test_broken a[4, 2:4] == Array(a)[4, 2:4]
 end
-@testset "view!" begin
-  for blk in ((Block(2, 2),), (Block(2), Block(2)))
-    a = BlockSparseArray{elt}(undef, [2, 3], [2, 3])
-    b = view!(a, blk...)
-    x = randn(elt, 3, 3)
-    b .= x
-    @test b == x
-    @test a[blk...] == x
-    @test @view(a[blk...]) == x
-    @test view!(a, blk...) == x
-    @test @view!(a[blk...]) == x
-  end
-  for blk in ((Block(2, 2),), (Block(2), Block(2)))
-    a = BlockSparseArray{elt}(undef, [2, 3], [2, 3])
-    b = @view! a[blk...]
-    x = randn(elt, 3, 3)
-    b .= x
-    @test b == x
-    @test a[blk...] == x
-    @test @view(a[blk...]) == x
-    @test view!(a, blk...) == x
-    @test @view!(a[blk...]) == x
-  end
-  for blk in ((Block(2, 2)[2:3, 1:2],), (Block(2)[2:3], Block(2)[1:2]))
-    a = BlockSparseArray{elt}(undef, [2, 3], [2, 3])
-    b = view!(a, blk...)
-    x = randn(elt, 2, 2)
-    b .= x
-    @test b == x
-    @test a[blk...] == x
-    @test @view(a[blk...]) == x
-    @test view!(a, blk...) == x
-    @test @view!(a[blk...]) == x
-  end
-  for blk in ((Block(2, 2)[2:3, 1:2],), (Block(2)[2:3], Block(2)[1:2]))
-    a = BlockSparseArray{elt}(undef, [2, 3], [2, 3])
-    b = @view! a[blk...]
-    x = randn(elt, 2, 2)
-    b .= x
-    @test b == x
-    @test a[blk...] == x
-    @test @view(a[blk...]) == x
-    @test view!(a, blk...) == x
-    @test @view!(a[blk...]) == x
-  end
-  # 0-dim case
-  # Regression test for https://github.com/ITensor/BlockSparseArrays.jl/issues/148
-  for I in ((), (Block(),))
-    a = dev(BlockSparseArray{elt}(undef))
-    @test !isstored(a)
-    @test iszero(blockstoredlength(a))
-    @test isempty(eachblockstoredindex(a))
-    @test iszero(a)
-    b = @view! a[I...]
-    @test isstored(a)
-    @test isone(blockstoredlength(a))
-    @test issetequal(eachblockstoredindex(a), [Block()])
-    @test iszero(adapt(Array)(a))
-    @test b isa arrayt{elt,0}
-    @test size(b) == ()
-    # Converting to `Array` works around a bug in `iszero(JLArray{Float64}(undef))`.
-    @test iszero(adapt(Array)(b))
-  end
-end

test/test_view_bang.jl

@@ -0,0 +1,76 @@
+using Adapt: adapt
+using BlockArrays: Block
+using BlockSparseArrays:
+  BlockSparseArray, @view!, blockstoredlength, eachblockstoredindex, view!
+using JLArrays: JLArray
+using SparseArraysBase: isstored
+using Test: @test, @testset
+
+elts = (Float32, Float64, ComplexF32)
+arrayts = (Array, JLArray)
+@testset "view! (arraytype=$arrayt, eltype=$elt)" for arrayt in arrayts, elt in elts
+  dev = adapt(arrayt)
+
+  for blk in ((Block(2, 2),), (Block(2), Block(2)))
+    a = BlockSparseArray{elt}(undef, [2, 3], [2, 3])
+    b = view!(a, blk...)
+    x = randn(elt, 3, 3)
+    b .= x
+    @test b == x
+    @test a[blk...] == x
+    @test @view(a[blk...]) == x
+    @test view!(a, blk...) == x
+    @test @view!(a[blk...]) == x
+  end
+  for blk in ((Block(2, 2),), (Block(2), Block(2)))
+    a = BlockSparseArray{elt}(undef, [2, 3], [2, 3])
+    b = @view! a[blk...]
+    x = randn(elt, 3, 3)
+    b .= x
+    @test b == x
+    @test a[blk...] == x
+    @test @view(a[blk...]) == x
+    @test view!(a, blk...) == x
+    @test @view!(a[blk...]) == x
+  end
+  for blk in ((Block(2, 2)[2:3, 1:2],), (Block(2)[2:3], Block(2)[1:2]))
+    a = BlockSparseArray{elt}(undef, [2, 3], [2, 3])
+    b = view!(a, blk...)
+    x = randn(elt, 2, 2)
+    b .= x
+    @test b == x
+    @test a[blk...] == x
+    @test @view(a[blk...]) == x
+    @test view!(a, blk...) == x
+    @test @view!(a[blk...]) == x
+  end
+  for blk in ((Block(2, 2)[2:3, 1:2],), (Block(2)[2:3], Block(2)[1:2]))
+    a = BlockSparseArray{elt}(undef, [2, 3], [2, 3])
+    b = @view! a[blk...]
+    x = randn(elt, 2, 2)
+    b .= x
+    @test b == x
+    @test a[blk...] == x
+    @test @view(a[blk...]) == x
+    @test view!(a, blk...) == x
+    @test @view!(a[blk...]) == x
+  end
+  # 0-dim case
+  # Regression test for https://github.com/ITensor/BlockSparseArrays.jl/issues/148
+  for I in ((), (Block(),))
+    a = dev(BlockSparseArray{elt}(undef))
+    @test !isstored(a)
+    @test iszero(blockstoredlength(a))
+    @test isempty(eachblockstoredindex(a))
+    @test iszero(a)
+    b = @view! a[I...]
+    @test isstored(a)
+    @test isone(blockstoredlength(a))
+    @test issetequal(eachblockstoredindex(a), [Block()])
+    @test iszero(adapt(Array)(a))
+    @test b isa arrayt{elt,0}
+    @test size(b) == ()
+    # Converting to `Array` works around a bug in `iszero(JLArray{Float64}(undef))`.
+    @test iszero(adapt(Array)(b))
+  end
+end