Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: allow setting VoA of SArray using scalars #310

Merged
merged 2 commits into from
Dec 22, 2023
Merged

fix: allow setting VoA of SArray using scalars #310

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e4a22f
fix: allow setting VoA of SArray using scalars
AayushSabharwal Dec 22, 2023
2939bc3
Update interface_tests.jl
ChrisRackauckas Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/vector_of_array.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,12 @@
copyto!(dest[:, i], unpack_voa(bc, i))
else
unpacked = unpack_voa(bc, i)
dest[:, i] = unpacked.f(unpacked.args...)
value = unpacked.f(unpacked.args...)
dest[:, i] = if value isa Number && dest[:, i] isa AbstractArray
fill(value, StaticArraysCore.similar_type(dest[:, i]))

Check warning on line 686 in src/vector_of_array.jl

View check run for this annotation

Codecov / codecov/patch

src/vector_of_array.jl#L684-L686 

Added lines #L684 - L686 were not covered by tests
else
value

Check warning on line 688 in src/vector_of_array.jl

View check run for this annotation

Codecov / codecov/patch

src/vector_of_array.jl#L688 

Added line #L688 was not covered by tests
end
end
end
dest
Expand Down
3 changes: 3 additions & 0 deletions test/interface_tests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,6 @@ function f!(z,zz)
end
f!(z,zz)
@test (@allocated f!(z,zz)) == 0

z .= 0.1
@test z == VectorOfArray([fill(0.1, SVector{2, Float64}), fill(0.1, SVector{2, Float64})])
Loading