Make lmul!/rmul! general (#177)

* Make lmul!/rmul! general

* fix rmul!

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "BlockArrays"
 uuid = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
-version = "0.16.1"
+version = "0.16.2"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"

src/blockarray.jl

@@ -437,20 +437,6 @@ function Base.fill!(block_array::BlockArray, v)
     block_array
 end
 
-function lmul!(α::Number, block_array::BlockArray)
-    for block in block_array.blocks
-        lmul!(α, block)
-    end
-    block_array
-end
-
-function rmul!(block_array::BlockArray, α::Number)
-    for block in block_array.blocks
-        rmul!(block, α)
-    end
-    block_array
-end
-
 # Temporary work around
 Base.reshape(block_array::BlockArray, axes::NTuple{N,AbstractUnitRange{Int}}) where N =
     reshape(PseudoBlockArray(block_array), axes)

src/blocklinalg.jl

@@ -137,6 +137,28 @@ function _copyto!(_, ::AbstractBlockLayout, dest::AbstractMatrix, src::AbstractM
     dest
 end
 
+
+####
+# l/rmul!
+#####
+
+
+function materialize!(L::Lmul{ScalarLayout,<:AbstractBlockLayout})
+    α, block_array = L.A, L.B
+    for block in blocks(block_array)
+        lmul!(α, block)
+    end
+    block_array
+end
+
+function materialize!(L::Rmul{<:AbstractBlockLayout,ScalarLayout})
+    block_array, α = L.A, L.B
+    for block in block_array.blocks
+        rmul!(block, α)
+    end
+    block_array
+end
+
 #############
 # BLAS overrides
 #############

src/pseudo_blockarray.jl

@@ -230,12 +230,12 @@ function Base.fill!(block_array::PseudoBlockArray, v)
     block_array
 end
 
-function lmul!(α::Number, block_array::PseudoBlockArray)
+function ArrayLayouts.lmul!(α::Number, block_array::PseudoBlockArray)
     lmul!(α, block_array.blocks)
     block_array
 end
 
-function rmul!(block_array::PseudoBlockArray, α::Number)
+function ArrayLayouts.rmul!(block_array::PseudoBlockArray, α::Number)
     rmul!(block_array.blocks, α)
     block_array
 end