More generalizations

Author: mtfishman

src/blocksparsearray/blocksparsearray.jl

@@ -6,9 +6,10 @@ using BlockArrays:
   blockedrange,
   blocklength,
   undef_blocks
-using DerivableInterfaces: @interface, similartype
+using DerivableInterfaces: @interface
 using Dictionaries: Dictionary
 using SparseArraysBase: SparseArrayDOK
+using TypeParameterAccessors: similartype
 
 """
     SparseArrayDOK{T}(undef_blocks, axes)

src/blocksparsearrayinterface/arraylayouts.jl

@@ -11,15 +11,18 @@ using LinearAlgebra: LinearAlgebra, dot, mul!
   return a_dest
 end
 
+function DerivableInterfaces.interface(m::MulAdd)
+  return interface(m.A, m.B, m.C)
+end
+
 function ArrayLayouts.materialize!(
   m::MatMulMatAdd{
     <:BlockLayout{<:SparseLayout},
     <:BlockLayout{<:SparseLayout},
     <:BlockLayout{<:SparseLayout},
   },
 )
-  α, a1, a2, β, a_dest = m.α, m.A, m.B, m.β, m.C
-  @interface BlockSparseArrayInterface() muladd!(m.α, m.A, m.B, m.β, m.C)
+  @interface interface(m) muladd!(m.α, m.A, m.B, m.β, m.C)
   return m.C
 end
 function ArrayLayouts.materialize!(
@@ -29,7 +32,7 @@ function ArrayLayouts.materialize!(
     <:BlockLayout{<:SparseLayout},
   },
 )
-  @interface BlockSparseArrayInterface() matmul!(m)
+  @interface interface(m) matmul!(m)
   return m.C
 end
 
@@ -42,5 +45,5 @@ end
 end
 
 function Base.copy(d::Dot{<:BlockLayout{<:SparseLayout},<:BlockLayout{<:SparseLayout}})
-  return @interface BlockSparseArrayInterface() dot(d.A, d.B)
+  return @interface interface(d.A, d.B) dot(d.A, d.B)
 end

src/factorizations/svd.jl

@@ -1,5 +1,7 @@
+using DiagonalArrays: diagonaltype
 using MatrixAlgebraKit:
   MatrixAlgebraKit, check_input, default_svd_algorithm, svd_compact!, svd_full!
+using TypeParameterAccessors: realtype
 
 """
     BlockPermutedDiagonalAlgorithm(A::MatrixAlgebraKit.AbstractAlgorithm)
@@ -24,10 +26,7 @@ function similar_output(
   ::typeof(svd_compact!), A, S_axes, alg::MatrixAlgebraKit.AbstractAlgorithm
 )
   U = similar(A, axes(A, 1), S_axes[1])
-  T = real(eltype(A))
-  # TODO: this should be replaced with a more general similar function that can handle setting
-  # the blocktype and element type - something like S = similar(A, BlockType(...))
-  S = BlockSparseMatrix{T,Diagonal{T,Vector{T}}}(undef, S_axes)
+  S = similar(A, BlockType(diagonaltype(realtype(blocktype(A)))), S_axes)
   Vt = similar(A, S_axes[2], axes(A, 2))
   return U, S, Vt
 end