Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 ext/StructArraysStaticArraysExt.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module StructArraysStaticArraysExt

using StructArrays
using StaticArrays: StaticArray, FieldArray, tuple_prod, SVector, MVector, SOneTo
using StaticArrays: StaticArray, FieldArray, tuple_prod, SVector, MVector, SOneTo, HeterogeneousShapeTuple

"""
StructArrays.staticschema(::Type{<:StaticArray{S, T}}) where {S, T}
Expand Down Expand Up @@ -41,7 +41,11 @@ StructArrays.component(s::FieldArray, i) = getfield(s, i)
StructArrays.createinstance(T::Type{<:FieldArray}, args...) = StructArrays.createinstance_generic(T, args...)

# disambiguation
Base.similar(s::StructArray, S::Type, sz::Tuple{Union{Integer, Base.OneTo, SOneTo}, Vararg{Union{Union{Integer, Base.OneTo, SOneTo}}}}) = StructArrays._similar(s, S, sz)
let shape = isdefined(Base, :AbstractOneTo) && SOneTo <: Base.AbstractOneTo ?
Tuple{SOneTo, Vararg{SOneTo}} : HeterogeneousShapeTuple
@eval Base.similar(s::StructArray, ::Type{T}, sz::$shape) where T = StructArrays._similar(s, T, sz)
@eval Base.similar(::Type{<:StructArray{T, N, C}}, sz::$shape) where {T, N, C} = StructArrays.buildfromschema(typ -> similar(typ, sz), T, C)
end
Base.reshape(s::StructArray{T}, d::Tuple{SOneTo, Vararg{SOneTo}}) where {T} = StructArray{T}(map(x -> reshape(x, d), StructArrays.components(s)))

# Broadcast overload
Expand Down
10 changes: 7 additions & 3 deletions src/structarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,9 @@ for type in (
:(Tuple{Union{Integer, AbstractUnitRange}, Vararg{Union{Integer, AbstractUnitRange}}}),
# disambiguation with Base
:(Tuple{Union{Integer, Base.OneTo}, Vararg{Union{Integer, Base.OneTo}}}),
:(Tuple{Integer, Vararg{Integer}}),
isdefined(Base, :AbstractOneTo) ?
:(Tuple{Union{Integer, Base.AbstractOneTo}, Vararg{Union{Integer, Base.AbstractOneTo}}}) :
:(Tuple{Integer, Vararg{Integer}}),
)
@eval function Base.similar(::Type{<:StructArray{T, N, C}}, sz::$(type)) where {T, N, C}
return buildfromschema(typ -> similar(typ, sz), T, C)
Expand Down Expand Up @@ -492,7 +494,9 @@ for type in (
:(Tuple{Integer, Vararg{Integer}}),
:(Tuple{Union{Integer, Base.OneTo}, Vararg{Union{Integer, Base.OneTo}}}),
:(Tuple{Union{Colon, Integer}, Vararg{Union{Colon, Integer}}}),
:(Tuple{Vararg{Union{Colon, Int}}}),
isdefined(Base, :AbstractOneTo) ?
:(Tuple{Union{Integer, Base.AbstractOneTo}, Vararg{Union{Integer, Base.AbstractOneTo}}}) :
:(Tuple{Vararg{Union{Colon, Int}}}),
:(Tuple{Colon}),
)
@eval function Base.reshape(s::StructArray{T}, d::$(type)) where {T}
Expand Down Expand Up @@ -642,7 +646,7 @@ end

# for aliasing analysis during broadcast
function Broadcast.broadcast_unalias(dest::StructArray, src::AbstractArray)
if dest === src || any(Base.Fix2(===, src), components(dest))
if dest === src || any(Base.Fix2(===, src), values(components(dest))) # values() works around Julia 1.13 allocation regression
return src
else
return Base.unalias(dest, src)
Expand Down
1 change: 1 addition & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1534,6 +1534,7 @@ end
# potential ambiguities
x = StructArray((SA[1,2], SA[1,2]))
@test eltype(similar(x)::StructArray) == eltype(x)
@test eltype(similar(typeof(x), axes(x))::StructArray) == eltype(x)
@test map(x->x, x)::StructArray == x
@test size(reshape(x, (SOneTo(2), SOneTo(1)))::StructArray) == (2, 1)
end
Expand Down
Loading