Propagate CachedArrayStyle for ApplyArray

Author: DanielVandH

src/lazyapplying.jl

@@ -331,6 +331,8 @@ end
 
 applybroadcaststyle(::Type{<:AbstractArray{<:Any,N}}, _2) where N = DefaultArrayStyle{N}()
 applybroadcaststyle(::Type{<:AbstractArray{<:Any,N}}, ::AbstractLazyLayout) where N = LazyArrayStyle{N}()
+applybroadcaststyle(::Type{<:ApplyArray{<:Any,N,<:Any,Args}}, ::AbstractLazyLayout) where {N,Args<:Tuple} = result_style(LazyArrayStyle{N}(), tuple_type_broadcastlayout(Args))
+applybroadcaststyle(::Type{<:SubArray{<:Any,<:Any,P}}, lay::AbstractLazyLayout) where {P} = applybroadcaststyle(P, lay)
 BroadcastStyle(M::Type{<:ApplyArray}) = applybroadcaststyle(M, MemoryLayout(M))
 BroadcastStyle(M::Type{<:SubArray{<:Any,N,<:ApplyArray}}) where N = applybroadcaststyle(M, MemoryLayout(M))
 

test/applytests.jl

@@ -1,10 +1,12 @@
 module ApplyTests
 
-using LazyArrays, FillArrays, ArrayLayouts, Test
-import LazyArrays: materialize, broadcasted, DefaultApplyStyle, Applied, arguments,
-            ApplyArray, ApplyMatrix, ApplyVector, LazyArrayApplyStyle, ApplyLayout, call
-import ArrayLayouts: StridedLayout
-using LinearAlgebra
+    using LazyArrays, FillArrays, ArrayLayouts, Test
+    import LazyArrays: materialize, broadcasted, DefaultApplyStyle, Applied, arguments,
+                ApplyArray, ApplyMatrix, ApplyVector, LazyArrayApplyStyle, ApplyLayout, call,
+                CachedArrayStyle, CachedArray, LazyArrayStyle
+    import ArrayLayouts: StridedLayout
+    import Base.Broadcast: BroadcastStyle
+    using LinearAlgebra
 
 @testset "Applying" begin
     @testset "Applied" begin
@@ -121,6 +123,13 @@ using LinearAlgebra
         end
         @test colsupport(M,1) == 1:5
     end
+
+    @testset "BroadcastStyle with a cached argument" begin
+        A = ApplyArray(*, rand(10, 2), rand(2, 2))
+        @test BroadcastStyle(typeof(A)) == BroadcastStyle(typeof(A')) == BroadcastStyle(typeof(view(A, 1:2, 1:2))) == LazyArrayStyle{2}()
+        A = ApplyArray(*, CachedArray(rand(10, 2)), rand(2, 2))
+        @test BroadcastStyle(typeof(A)) == BroadcastStyle(typeof(A')) == BroadcastStyle(typeof(view(A, 1:2, 1:2))) == CachedArrayStyle{2}()
+    end
 end # testset
 
 end # module