Special *, /, \ for MulArray, triu/tril support

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "LazyArrays"
 uuid = "5078a376-72f3-5289-bfd5-ec5146d43c02"
-version = "0.12.3"
+version = "0.12.4"
 
 [deps]
 FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"

src/lazyapplying.jl

@@ -284,4 +284,20 @@ end
 # avoid infinite-loop
 _base_copyto!(dest::AbstractArray{T,N}, src::AbstractArray{T,N}) where {T,N} = Base.invoke(copyto!, NTuple{2,AbstractArray{T,N}}, dest, src)
 _base_copyto!(dest::AbstractArray, src::AbstractArray) = Base.invoke(copyto!, NTuple{2,AbstractArray}, dest, src)
-@inline copyto!(dest::AbstractArray, M::Applied{LazyArrayApplyStyle}) = _base_copyto!(dest, materialize(M))
+@inline copyto!(dest::AbstractArray, M::Applied{LazyArrayApplyStyle}) = _base_copyto!(dest, materialize(M))
+
+## 
+# triu/tril
+##
+for tri in (:tril, :triu)
+    for op in (:axes, :size)
+        @eval begin
+            $op(A::Applied{<:Any,typeof($tri)}) = $op(first(A.args))
+            $op(A::Applied{<:Any,typeof($tri)}, j) = $op(first(A.args), j)
+        end
+    end
+    @eval begin 
+        ndims(::Applied{<:Any,typeof($tri)}) = 2
+        eltype(A::Applied{<:Any,typeof($tri)}) = eltype(first(A.args))
+    end
+end

src/lazyconcat.jl

@@ -618,4 +618,4 @@ end
 materialize!(M::MatMulMatAdd{<:AbstractColumnMajor,<:ApplyLayout{typeof(vcat)}}) = 
     materialize!(MulAdd(M.α,M.A,Array(M.B),M.β,M.C))
 materialize!(M::MatMulVecAdd{<:AbstractColumnMajor,<:ApplyLayout{typeof(vcat)}}) = 
-    materialize!(MulAdd(M.α,M.A,Array(M.B),M.β,M.C))    
+    materialize!(MulAdd(M.α,M.A,Array(M.B),M.β,M.C))    

src/linalg/mul.jl

@@ -244,4 +244,16 @@ end
 
 @inline sub_materialize(::ApplyLayout{typeof(*)}, V) = apply(*, arguments(V)...)
 @inline copyto!(dest::AbstractArray{T,N}, src::SubArray{T,N,<:ApplyArray{T,N,typeof(*)}}) where {T,N} = 
-    copyto!(dest, Applied(src))
+    copyto!(dest, Applied(src))
+
+## 
+# * specialcase
+##    
+
+for op in (:*, :\)
+    @eval broadcasted(::DefaultArrayStyle{N}, ::typeof($op), a::Number, b::ApplyArray{<:Number,N,typeof(*)}) where N =
+        ApplyArray(*, broadcast($op,a,first(b.args)), tail(b.args)...)
+end
+
+broadcasted(::DefaultArrayStyle{N}, ::typeof(/), b::ApplyArray{<:Number,N,typeof(*)}, a::Number) where N =
+        ApplyArray(*, most(b.args)..., broadcast(/,last(b.args),a))

test/multests.jl

@@ -1053,4 +1053,14 @@ end
         VERSION ≥ v"1.2" && @test @allocated(copyto!(c, V)) ≤ 1000
         @test all(c .=== apply(*, arguments(V)...))
     end
+
+    @testset "* algebra" begin
+        A = ApplyArray(*,[1 2; 3 4], Vcat(Fill(1,1,3),Fill(2,1,3)))
+        @test 2.0A isa ApplyArray
+        @test 2.0\A isa ApplyArray
+        @test A/2 isa ApplyArray
+        @test (2.0A) == 2.0Array(A)
+        @test (2.0\A) == 2.0\Array(A)
+        @test A/2.0 == Array(A)/2.0
+    end
 end

test/runtests.jl

@@ -187,4 +187,19 @@ end
 
     # bug from BandedMartrices.jl
     @test LazyArrays.convexunion(7:10,9:8) == LazyArrays.convexunion(9:8,7:10) == 7:10
+end
+
+@testset "triu/tril" begin
+    A = ApplyArray(triu,randn(2,2))
+    @test A isa ApplyArray{Float64}
+    @test A == triu(A.args[1])
+    A = ApplyArray(tril,randn(2,2))
+    @test A isa ApplyArray{Float64}
+    @test A == tril(A.args[1])
+    A = ApplyArray(triu,randn(2,2),1)
+    @test A isa ApplyArray{Float64}
+    @test A == triu(A.args[1],1)
+    A = ApplyArray(tril,randn(2,2),-1)
+    @test A isa ApplyArray{Float64}
+    @test A == tril(A.args[1],-1)
 end