Fix matmul

Author: mtfishman

src/BlockArraysExtensions/blockedunitrange.jl

@@ -36,6 +36,9 @@ end
 # Take a collection of axes and mortar them
 # into a single blocked axis.
 function mortar_axis(axs)
+  return blockrange(axs)
+end
+function mortar_axis(axs::Vector{<:Base.OneTo{<:Integer}})
   return blockedrange(length.(axs))
 end
 

src/abstractblocksparsearray/abstractblocksparsearray.jl

@@ -19,12 +19,12 @@ end
 
 # Specialized in order to fix ambiguity error with `BlockArrays`.
 function Base.getindex(a::AbstractBlockSparseArray{<:Any,N}, I::Vararg{Int,N}) where {N}
-  return @interface BlockSparseArrayInterface() getindex(a, I...)
+  return @interface interface(a) getindex(a, I...)
 end
 
 # Specialized in order to fix ambiguity error with `BlockArrays`.
 function Base.getindex(a::AbstractBlockSparseArray{<:Any,0})
-  return @interface BlockSparseArrayInterface() getindex(a)
+  return @interface interface(a) getindex(a)
 end
 
 ## # Fix ambiguity error with `BlockArrays`.
@@ -39,21 +39,21 @@ end
 ##
 ## # Fix ambiguity error with `BlockArrays`.
 ## function Base.getindex(a::AbstractBlockSparseArray, I::Vararg{AbstractVector})
-##   ## return @interface BlockSparseArrayInterface() getindex(a, I...)
+##   ## return @interface interface(a) getindex(a, I...)
 ##   return ArrayLayouts.layout_getindex(a, I...)
 ## end
 
 # Specialized in order to fix ambiguity error with `BlockArrays`.
 function Base.setindex!(
   a::AbstractBlockSparseArray{<:Any,N}, value, I::Vararg{Int,N}
 ) where {N}
-  @interface BlockSparseArrayInterface() setindex!(a, value, I...)
+  @interface interface(a) setindex!(a, value, I...)
   return a
 end
 
 # Fix ambiguity error.
 function Base.setindex!(a::AbstractBlockSparseArray{<:Any,0}, value)
-  @interface BlockSparseArrayInterface() setindex!(a, value)
+  @interface interface(a) setindex!(a, value)
   return a
 end
 

src/abstractblocksparsearray/arraylayouts.jl

@@ -27,9 +27,8 @@ function Base.similar(
   elt::Type,
   axes,
 ) where {A,B}
-  # TODO: Check that this equals `similartype(blocktype(B), elt, axes)`,
-  # or maybe promote them?
-  output_blocktype = similartype(blocktype(A), elt, axes)
+  # TODO: Use something like `Base.promote_op(*, A, B)` to determine the output block type.
+  output_blocktype = similartype(blocktype(A), Type{elt}, Tuple{blockaxistype.(axes)...})
   return similar(BlockSparseArray{elt,length(axes),output_blocktype}, axes)
 end