Skip to content

Fix similar and fill! for mixed nested VectorOfArray #543

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

Merged
ChrisRackauckas merged 1 commit into from
Mar 5, 2026
Merged

Fix similar and fill! for mixed nested VectorOfArray #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions src/vector_of_array.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1404,7 +1404,11 @@ function Base.similar(
end

@inline function Base.similar(VA::VectorOfArray, ::Type{T} = eltype(VA)) where {T}
return VectorOfArray(similar.(VA.u, T))
if eltype(VA.u) <: Union{AbstractArray, AbstractVectorOfArray}
return VectorOfArray(similar.(VA.u, T))
else
return VectorOfArray(similar(VA.u, T))
end
end

@inline function Base.similar(VA::VectorOfArray, dims::N) where {N <: Number}
Expand All @@ -1420,7 +1424,7 @@ end
# For DiffEqArray it ignores ts and fills only u
function Base.fill!(VA::AbstractVectorOfArray, x)
for i in 1:length(VA.u)
if VA[:, i] isa AbstractArray
if VA[:, i] isa Union{AbstractArray, AbstractVectorOfArray}
if ArrayInterface.ismutable(VA.u[i]) || VA.u[i] isa AbstractVectorOfArray
fill!(VA[:, i], x)
else
Expand Down
17 changes: 17 additions & 0 deletions test/utils_test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,23 @@ end
@test u1.u[2] isa SVector
end

@testset "VectorOfArray similar with nested scalar leaves" begin
a = VectorOfArray([ones(2), VectorOfArray([1.0, 1.0])])
b = similar(a, Float64)
@test b isa typeof(a)
@test b.u[1] isa Vector{Float64}
@test b.u[2] isa typeof(a.u[2])
@test b.u[2].u isa Vector{Float64}
@test length(b.u[2].u) == 2
end

@testset "recursivefill! with nested union partitions" begin
a = VectorOfArray([ones(2), VectorOfArray([1.0, 1.0])])
recursivefill!(a, true)
@test a.u[1] == ones(2)
@test a.u[2].u == ones(2)
end

# Test recursivefill! with immutable StaticArrays (issue #461)
@testset "recursivefill! with immutable StaticArrays (issue #461)" begin
# Test with only immutable SVectors
Expand Down