Fix tests

Author: mtfishman

src/BlockArraysExtensions/BlockArraysExtensions.jl

@@ -158,9 +158,17 @@ end
 const BlockSliceCollection = Union{
   Base.Slice,BlockSlice{<:BlockRange{1}},BlockIndices{<:Vector{<:Block{1}}}
 }
+const BlockIndexRangeSlice = BlockSlice{
+  <:BlockVector{<:BlockIndex{1},<:Vector{<:BlockIndexRange{1}}}
+}
+const BlockIndexRangeSlices = BlockIndices{
+  <:BlockVector{<:BlockIndex{1},<:Vector{<:BlockIndexRange{1}}}
+}
+const BlockIndexVectorSlices = BlockIndices{
+  <:BlockVector{<:BlockIndex{1},<:Vector{<:BlockIndexVector}}
+}
 const SubBlockSliceCollection = Union{
-  BlockSlice{<:BlockVector{<:BlockIndex{1},<:Vector{<:BlockIndexRange{1}}}},
-  BlockIndices{<:BlockVector{<:BlockIndex{1},<:Vector{<:BlockIndexVector}}},
+  BlockIndexRangeSlice,BlockIndexRangeSlices,BlockIndexVectorSlices
 }
 
 # TODO: This is type piracy. This is used in `reindex` when making

src/abstractblocksparsearray/views.jl

@@ -214,6 +214,13 @@ function to_blockindexrange(
   # work right now.
   return blocks(a.block)[Int(I)]
 end
+function to_blockindexrange(
+  a::BlockIndices{<:BlockVector{<:BlockIndex{1},<:Vector{<:BlockIndexRange}}}, I::Block{1}
+)
+  # TODO: Ideally we would just use `a.blocks[I]` but that doesn't
+  # work right now.
+  return blocks(a.blocks)[Int(I)]
+end
 function to_blockindexrange(
   a::BlockIndices{<:BlockVector{<:BlockIndex{1},<:Vector{<:BlockIndexVector}}}, I::Block{1}
 )
@@ -254,18 +261,10 @@ function BlockArrays.viewblock(
   return view(viewblock(a, Block.(block)...), map(b -> only(b.indices), block)...)
 end
 
-# Block slice of the result of slicing `@view a[2:5, 2:5]`.
-# TODO: Move this to `BlockArraysExtensions`.
-const BlockIndexRangeSlice = BlockSlice{
-  <:BlockVector{<:BlockIndex{1},<:Vector{<:BlockIndexRange{1}}}
-}
-const BlockIndexVectorSlice = BlockSlice{
-  <:BlockVector{<:BlockIndex{1},<:Vector{<:BlockIndexVector}}
-}
-const BlockedSlice = Union{BlockIndexRangeSlice,BlockIndexVectorSlice}
-
 function Base.view(
-  a::SubArray{T,N,<:AbstractBlockSparseArray{T,N},<:Tuple{Vararg{BlockedSlice,N}}},
+  a::SubArray{
+    T,N,<:AbstractBlockSparseArray{T,N},<:Tuple{Vararg{SubBlockSliceCollection,N}}
+  },
   block::Union{Block{N},BlockIndexRange{N}},
 ) where {T,N}
   return viewblock(a, block)
@@ -277,13 +276,17 @@ function Base.view(
   return viewblock(a, block)
 end
 function Base.view(
-  a::SubArray{T,N,<:AbstractBlockSparseArray{T,N},<:Tuple{Vararg{BlockedSlice,N}}},
+  a::SubArray{
+    T,N,<:AbstractBlockSparseArray{T,N},<:Tuple{Vararg{SubBlockSliceCollection,N}}
+  },
   block::Vararg{Union{Block{1},BlockIndexRange{1},BlockIndexVector},N},
 ) where {T,N}
   return viewblock(a, block...)
 end
 function BlockArrays.viewblock(
-  a::SubArray{T,N,<:AbstractBlockSparseArray{T,N},<:Tuple{Vararg{BlockedSlice,N}}},
+  a::SubArray{
+    T,N,<:AbstractBlockSparseArray{T,N},<:Tuple{Vararg{SubBlockSliceCollection,N}}
+  },
   block::Union{Block{N},BlockIndexRange{N}},
 ) where {T,N}
   return viewblock(a, to_tuple(block)...)
@@ -294,7 +297,9 @@ blockedslice_blocks(x::BlockIndices) = x.blocks
 
 # TODO: Define `@interface BlockSparseArrayInterface() viewblock`.
 function BlockArrays.viewblock(
-  a::SubArray{T,N,<:AbstractBlockSparseArray{T,N},<:Tuple{Vararg{BlockedSlice,N}}},
+  a::SubArray{
+    T,N,<:AbstractBlockSparseArray{T,N},<:Tuple{Vararg{SubBlockSliceCollection,N}}
+  },
   I::Vararg{Block{1},N},
 ) where {T,N}
   # TODO: Use `reindex`, `to_indices`, etc.
@@ -308,7 +313,9 @@ function BlockArrays.viewblock(
 end
 # TODO: Define `@interface BlockSparseArrayInterface() viewblock`.
 function BlockArrays.viewblock(
-  a::SubArray{T,N,<:AbstractBlockSparseArray{T,N},<:Tuple{Vararg{BlockedSlice,N}}},
+  a::SubArray{
+    T,N,<:AbstractBlockSparseArray{T,N},<:Tuple{Vararg{SubBlockSliceCollection,N}}
+  },
   block::Vararg{BlockIndexRange{1},N},
 ) where {T,N}
   return view(viewblock(a, Block.(block)...), map(b -> only(b.indices), block)...)

src/factorizations/svd.jl

@@ -12,7 +12,9 @@ struct BlockPermutedDiagonalAlgorithm{A<:MatrixAlgebraKit.AbstractAlgorithm} <:
   alg::A
 end
 
-function MatrixAlgebraKit.default_svd_algorithm(A::AbstractBlockSparseMatrix; kwargs...)
+function MatrixAlgebraKit.default_svd_algorithm(
+  A::Type{<:AbstractBlockSparseMatrix}; kwargs...
+)
   blocktype(A) <: StridedMatrix{<:LinearAlgebra.BLAS.BlasFloat} ||
     error("unsupported type: $(blocktype(A))")
   # TODO: this is a hardcoded for now to get around this function not being defined in the

test/test_basics.jl

@@ -588,7 +588,11 @@ arrayts = (Array, JLArray)
     @views for b in [Block(1, 2), Block(2, 1)]
       a[b] = dev(randn(elt, size(a[b])))
     end
-    for b in (a[2:4, 2:4], @view(a[2:4, 2:4]))
+    I = 2:4
+    I′, J′ = falses.(size(a))
+    I′[I] .= true
+    J′[I] .= true
+    for b in (a[I, I], @view(a[I, I]), a[I′, J′], @view(a[I′, J′]))
       @allowscalar @test b == Array(a)[2:4, 2:4]
       @test size(b) == (3, 3)
       @test blocksize(b) == (2, 2)