Fix allocation in ApplyArray (#380)

* Fix allocation in ApplyArray

* Update paddedtests.jl

Author: dlfivefifty

.github/workflows/ci.yml

@@ -14,6 +14,7 @@ jobs:
         version:
           - 'lts'
           - '1'
+          - 'pre'
         os:
           - ubuntu-latest
           - macOS-latest

Project.toml

@@ -1,6 +1,6 @@
 name = "LazyArrays"
 uuid = "5078a376-72f3-5289-bfd5-ec5146d43c02"
-version = "2.6.3"
+version = "2.6.4"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"

src/linalg/mul.jl

@@ -228,7 +228,7 @@ sublayout(::ApplyLayout{typeof(*)}, ::Type{<:Tuple{AbstractVector{<:CartesianInd
 call(::ApplyLayout{typeof(*)}, V::SubArray) = *
 
 function _mat_mul_arguments(args, (kr,jr)::Tuple{Any,Any})
-    kjr = intersect.(_mul_args_rows(kr, args...), _mul_args_cols(jr, reverse(args)...))
+    kjr = map(intersect, _mul_args_rows(kr, args...), _mul_args_cols(jr, reverse(args)...))
     map(view, args, (kr, kjr...), (kjr..., jr))
 end
 
@@ -237,8 +237,8 @@ _vec_mul_view(a::AbstractVector, kr, ::Colon) = view(a, kr)
 
 # this is a vector view of a MulVector
 function _vec_mul_arguments(args, (kr,)::Tuple{Any})
-    kjr = intersect.(_mul_args_rows(kr, args...), _mul_args_cols(Base.OneTo(1), reverse(args)...))
-    _vec_mul_view.(args, (kr, kjr...), (kjr..., :))
+    kjr = map(intersect, _mul_args_rows(kr, args...), _mul_args_cols(Base.OneTo(1), reverse(args)...))
+    map(_vec_mul_view, args, (kr, kjr...), (kjr..., :))
 end
 
 # this is a vector view of a MulMatrix

test/multests.jl

@@ -1051,17 +1051,16 @@ end
         M = ApplyArray(*,A,b)
 
         V = view(M,2:300)
+        c = similar(V)
         @test MemoryLayout(typeof(V)) isa ApplyLayout{typeof(*)}
         @test arguments(V) == (view(A,2:300,Base.OneTo(500)),view(b, Base.OneTo(500)))
         @test Applied(V) isa Applied{MulStyle}
         @test ApplyArray(V) ≈ (A*b)[2:300]
-        c = similar(V)
         copyto!(c,Applied(V))
         @test @allocated(copyto!(c,Applied(V))) ≤ 200
         copyto!(c, V)
 
-        # This test fails intermittently on GitHub Actions
-        #     @test @allocated(copyto!(c, V)) ≤ 500
+        @test @allocated(copyto!(c, V)) == 0
 
         @test all(c .=== apply(*, arguments(V)...))
 

test/paddedtests.jl

@@ -404,7 +404,7 @@ paddeddata(a::PaddedPadded) = a
         @test simplifiable(*, b', a) == Val(true)
 
         D = Diagonal(Fill(2,8))
-        @test D*b isa Vcat
+        @test MemoryLayout(D*b) isa PaddedColumns
         @test simplifiable(*, D, b) == Val(true)
 
         B = BroadcastArray(+, 1:8, (2:9)')