scalar padded copyto!

Author: dlfivefifty

Project.toml

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

src/lazyconcat.jl

@@ -486,12 +486,14 @@ function ==(A::CachedVector{<:Any,<:Any,<:Zeros}, B::CachedVector{<:Any,<:Any,<:
 end
 
 # special copyto! since `similar` of a padded returns a cached
-function copyto!(dest::CachedVector{T,Vector{T},<:Zeros{T,1}}, src::Vcat{<:Any,1,<:Tuple{<:AbstractVector,<:Zeros}}) where T
-    length(src) ≤ length(dest)  || throw(BoundsError())
-    a,_ = src.args
-    resizedata!(dest, length(a)) # make sure we are padded enough
-    copyto!(dest.data, a)
-    dest
+for Typ in (:Number, :AbstractVector)
+    @eval function copyto!(dest::CachedVector{T,Vector{T},<:Zeros{T,1}}, src::Vcat{<:Any,1,<:Tuple{<:$Typ,<:Zeros}}) where T
+        length(src) ≤ length(dest)  || throw(BoundsError())
+        a,_ = src.args
+        resizedata!(dest, length(a)) # make sure we are padded enough
+        copyto!(dest.data, a)
+        dest
+    end
 end
 
 struct Dot{StyleA,StyleB,ATyp,BTyp}

test/concattests.jl

@@ -311,6 +311,14 @@ import LazyArrays: MemoryLayout, DenseColumnMajor, PaddedLayout, materialize!, M
     end
 
     @testset "copyto!" begin
+        a = Vcat(1, Zeros(10))
+        c = cache(Zeros(11));
+        @test MemoryLayout(typeof(a)) isa PaddedLayout
+        @test MemoryLayout(typeof(c)) isa PaddedLayout{DenseColumnMajor}
+        @test copyto!(c, a) ≡ c;
+        @test length(c.data) == 1
+        @test c == a
+
         a = Vcat(1:3, Zeros(10))
         c = cache(Zeros(13));
         @test MemoryLayout(typeof(a)) isa PaddedLayout