More compact show for block sparse arrays

Author: mtfishman

Project.toml

@@ -47,7 +47,7 @@ SparseArraysBase = "0.2.10"
 SplitApplyCombine = "1.2.3"
 TensorAlgebra = "0.1.0"
 Test = "1.10"
-TypeParameterAccessors = "0.2.0"
+TypeParameterAccessors = "0.3.0"
 julia = "1.10"
 
 [extras]

src/BlockSparseArrays.jl

@@ -25,9 +25,9 @@ include("blocksparsearrayinterface/cat.jl")
 
 # functions defined for any abstractblocksparsearray
 include("abstractblocksparsearray/abstractblocksparsearray.jl")
-include("abstractblocksparsearray/wrappedabstractblocksparsearray.jl")
 include("abstractblocksparsearray/abstractblocksparsematrix.jl")
 include("abstractblocksparsearray/abstractblocksparsevector.jl")
+include("abstractblocksparsearray/wrappedabstractblocksparsearray.jl")
 include("abstractblocksparsearray/views.jl")
 include("abstractblocksparsearray/arraylayouts.jl")
 include("abstractblocksparsearray/sparsearrayinterface.jl")

src/abstractblocksparsearray/abstractblocksparsearray.jl

@@ -77,3 +77,49 @@ function Base.setindex!(
   blocks(a)[Int.(I)...] = value
   return a
 end
+
+using TypeParameterAccessors: unspecify_type_parameters
+function show_typeof_blocksparse(io::IO, a::AbstractBlockSparseArray)
+  Base.show(io, unspecify_type_parameters(typeof(a)))
+  print(io, '{')
+  show(io, eltype(a))
+  print(io, ", ")
+  show(io, ndims(a))
+  print(io, ", ")
+  show(io, blocktype(a))
+  print(io, ", …")
+  print(io, '}')
+  return nothing
+end
+
+# Copied from `BlockArrays.jl`.
+block2string(b, s) = string(join(map(string,b), '×'), "-blocked ", Base.dims2string(s))
+
+function summary_blocksparse(io::IO, a::AbstractArray)
+  print(io, block2string(blocksize(a), size(a)))
+  print(io, ' ')
+  show_typeof_blocksparse(io, a)
+  return nothing
+end
+
+function Base.summary(io::IO, a::AbstractBlockSparseArray)
+  summary_blocksparse(io, a)
+  return nothing
+end
+
+function Base.showarg(io::IO, a::AbstractBlockSparseArray, toplevel::Bool)
+  if toplevel
+    show_typeof_blocksparse(io, a)
+  else
+    print(io, "::")
+    show_typeof_blocksparse(io, a)
+  end
+  return nothing
+end
+
+# TypeParameterAccessors.jl interface
+using TypeParameterAccessors: TypeParameterAccessors, Position, set_type_parameters
+TypeParameterAccessors.position(::Type{BlockSparseArray}, eltype) = Position(1)
+TypeParameterAccessors.position(::Type{BlockSparseArray}, ndims) = Position(2)
+TypeParameterAccessors.position(::Type{BlockSparseArray}, blocktype) = Position(3)
+TypeParameterAccessors.position(::Type{BlockSparseArray}, blockstype) = Position(4)

src/blocksparsearray/blocksparsearray.jl

@@ -199,3 +199,38 @@ blockstype(arraytype::Type{<:BlockSparseArray}) = SparseArrayDOK{AbstractArray}
 ##   # TODO: Preserve GPU data!
 ##   return BlockSparseArray{elt}(undef, axes)
 ## end
+
+# TypeParameterAccessors.jl interface
+using TypeParameterAccessors: TypeParameterAccessors, Position, set_type_parameters
+TypeParameterAccessors.position(::Type{BlockSparseArray}, eltype) = Position(1)
+TypeParameterAccessors.position(::Type{BlockSparseArray}, ndims) = Position(2)
+TypeParameterAccessors.position(::Type{BlockSparseArray}, blocktype) = Position(3)
+TypeParameterAccessors.position(::Type{BlockSparseArray}, blockstype) = Position(4)
+
+# TODO: Make this generic to `AbstractBlockSparseVector` using
+# TypeParameterAccessors.jl, for example using:
+# `set_ndims(unspecify_type_parameters(typeof(a)), 1)`.
+function show_typeof_blocksparse(io::IO, a::BlockSparseVector)
+  print(io, "BlockSparseVector")
+  print(io, '{')
+  show(io, eltype(a))
+  print(io, ", ")
+  show(io, blocktype(a))
+  print(io, ", …")
+  print(io, '}')
+  return nothing
+end
+
+# TODO: Make this generic to `AbstractBlockSparseMatrix` using
+# TypeParameterAccessors.jl, for example using:
+# `set_ndims(unspecify_type_parameters(typeof(a)), 2)`.
+function show_typeof_blocksparse(io::IO, a::BlockSparseMatrix)
+  print(io, "BlockSparseMatrix")
+  print(io, '{')
+  show(io, eltype(a))
+  print(io, ", ")
+  show(io, blocktype(a))
+  print(io, ", …")
+  print(io, '}')
+  return nothing
+end