feat: add ability to set VectorOfArray with Array using broadcast

SciML · Dec 21, 2023 · 4d8130e · 4d8130e
1 parent dd5c756
commit 4d8130e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/vector_of_array.jl b/src/vector_of_array.jl
@@ -663,7 +663,20 @@ end
     bc = Broadcast.flatten(bc)
     N = narrays(bc)
     @inbounds for i in 1:N
-        if dest[:, i] isa AbstractArray && !isa(dest[:, i], StaticArraysCore.SArray)
+        if dest[:, i] isa AbstractArray && ArrayInterface.ismutable(dest[:, i])
+            copyto!(dest[:, i], unpack_voa(bc, i))
+        else
+            dest[:, i] = copy(unpack_voa(bc, i))
+        end
+    end
+    dest
+end
+
+@inline function Base.copyto!(dest::AbstractVectorOfArray,
+    bc::Broadcast.Broadcasted{<:Broadcast.DefaultArrayStyle})
+    bc = Broadcast.flatten(bc)
+    @inbounds for i in 1:length(dest.u)
+        if dest[:, i] isa AbstractArray && ArrayInterface.ismutable(dest[:, i])
             copyto!(dest[:, i], unpack_voa(bc, i))
         else
             dest[:, i] = copy(unpack_voa(bc, i))

diff --git a/test/interface_tests.jl b/test/interface_tests.jl
@@ -125,3 +125,11 @@ z = VectorOfArray([zeros(SVector{2, Float64}), zeros(SVector{2, Float64})])
 z .= x .+ y
 
 @test z == VectorOfArray([fill(4, SVector{2, Float64}), fill(2, SVector{2, Float64})])
+
+yy = [2.0 1.0; 2.0 1.0]
+zz = x .+ yy
+@test zz == [4.0 2.0; 4.0 2.0]
+
+z = VectorOfArray([zeros(SVector{2, Float64}), zeros(SVector{2, Float64})])
+z .= zz
+@test z == VectorOfArray([fill(4, SVector{2, Float64}), fill(2, SVector{2, Float64})])