Make broadcasting more general

Author: mtfishman

src/abstractblocksparsearray/broadcast.jl

@@ -46,3 +46,23 @@ function Broadcast.BroadcastStyle(
 )
   return BlockSparseArrayStyle{ndims(arraytype)}()
 end
+
+# These catch cases that aren't caught by the standard
+# `BlockSparseArrayStyle` definition, and also fix
+# ambiguity issues.
+function Base.copyto!(dest::AnyAbstractBlockSparseArray, bc::Broadcasted)
+  copyto_blocksparse!(dest, bc)
+  return dest
+end
+function Base.copyto!(
+  dest::AnyAbstractBlockSparseArray, bc::Broadcasted{<:Base.Broadcast.AbstractArrayStyle{0}}
+)
+  copyto_blocksparse!(dest, bc)
+  return dest
+end
+function Base.copyto!(
+  dest::AnyAbstractBlockSparseArray{<:Any,N}, bc::Broadcasted{BlockSparseArrayStyle{N}}
+) where {N}
+  copyto_blocksparse!(dest, bc)
+  return dest
+end

src/blocksparsearrayinterface/broadcast.jl

@@ -38,52 +38,17 @@ end
 
 # Broadcasting implementation
 # TODO: Delete this in favor of `DerivableInterfaces` version.
-function Base.copyto!(
-  dest::AbstractArray{<:Any,N}, bc::Broadcasted{BlockSparseArrayStyle{N}}
-) where {N}
+function copyto_blocksparse!(dest::AbstractArray, bc::Broadcasted)
   # convert to map
   # flatten and only keep the AbstractArray arguments
   m = Mapped(bc)
   @interface interface(dest, bc) map!(m.f, dest, m.args...)
   return dest
 end
 
-# Broadcasting implementation
-# TODO: Delete this in favor of `DerivableInterfaces` version.
-function Base.copyto!(dest::AnyAbstractBlockSparseArray, bc::Broadcasted)
-  # convert to map
-  # flatten and only keep the AbstractArray arguments
-  m = Mapped(bc)
-  # TODO: Include `bc` when determining interface, currently
-  # `interface(::Type{<:Base.Broadcast.DefaultArrayStyle})`
-  # isn't defined.
-  @interface interface(dest) map!(m.f, dest, m.args...)
-  return dest
-end
-
-# Broadcasting implementation
-# TODO: Delete this in favor of `DerivableInterfaces` version.
 function Base.copyto!(
-  dest::AnyAbstractBlockSparseArray, bc::Broadcasted{<:Base.Broadcast.AbstractArrayStyle{0}}
-)
-  # convert to map
-  # flatten and only keep the AbstractArray arguments
-  m = Mapped(bc)
-  # TODO: Include `bc` when determining interface, currently
-  # `interface(::Type{<:Base.Broadcast.DefaultArrayStyle})`
-  # isn't defined.
-  @interface interface(dest) map!(m.f, dest, m.args...)
-  return dest
-end
-
-# Broadcasting implementation
-# TODO: Delete this in favor of `DerivableInterfaces` version.
-function Base.copyto!(
-  dest::AnyAbstractBlockSparseArray{<:Any,N}, bc::Broadcasted{BlockSparseArrayStyle{N}}
+  dest::AbstractArray{<:Any,N}, bc::Broadcasted{BlockSparseArrayStyle{N}}
 ) where {N}
-  # convert to map
-  # flatten and only keep the AbstractArray arguments
-  m = Mapped(bc)
-  @interface interface(dest, bc) map!(m.f, dest, m.args...)
+  copyto_blocksparse!(dest, bc)
   return dest
 end