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

Resolve ambiguities in similar and reshape #307

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Resolve ambiguities in similar and reshape #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21c5177
Resolve ambiguities in similar and reshape
jishnub Mar 14, 2024
7383d78
Test for ambiguities only on recent Julia versions
jishnub Mar 14, 2024
84621de
Update `similar` test to match failing case
jishnub Nov 27, 2024
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: 5 additions & 3 deletions src/structarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,13 +289,14 @@ 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}}),
)
@eval function Base.similar(::Type{<:StructArray{T, N, C}}, sz::$(type)) where {T, N, C}
return buildfromschema(typ -> similar(typ, sz), T, C)
end

@eval function Base.similar(s::StructArray, S::Type, sz::$(type))
return _similar(s, S, sz)
@eval function Base.similar(s::StructArray, ::Type{T}, sz::$(type)) where {T}
return _similar(s, T, sz)
end
end

Expand Down Expand Up @@ -470,8 +471,9 @@ for type in (
# mimic OffsetArrays signature
:(Tuple{Union{Integer, AbstractUnitRange, Colon}, Vararg{Union{Integer, AbstractUnitRange, Colon}}}),
# disambiguation with Base
:(Tuple{Integer, Vararg{Integer}}),
:(Tuple{Union{Integer, Base.OneTo}, Vararg{Union{Integer, Base.OneTo}}}),
:(Tuple{Vararg{Union{Colon, Integer}}}),
:(Tuple{Union{Colon, Integer}, Vararg{Union{Colon, Integer}}}),
:(Tuple{Vararg{Union{Colon, Int}}}),
:(Tuple{Colon}),
)
Expand Down
14 changes: 10 additions & 4 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ end
@test s isa Matrix{Float32}
@test size(s) == (2, 2)

s = similar(t, Float32, (Int8(2), 2))
@test s isa Matrix{Float32}
@test size(s) == (2, 2)

s = similar(t, Float32, 0:1, 2)
@test s isa OffsetMatrix{Float32, Matrix{Float32}}
@test axes(s) == (0:1, 1:2)
Expand Down Expand Up @@ -1000,6 +1004,8 @@ end
@test rs.a == [1 3; 2 4]
@test rs.b == ["a" "c"; "b" "d"]

@test reshape(s, (Int8(2), 2)) == reshape(s, (2, 2))

rs = reshape(s, (:,))
@test rs.a == s.a
@test rs.b == s.b
Expand Down Expand Up @@ -1206,7 +1212,7 @@ end
# The following code defines `MyArray1/2/3` with different `BroadcastStyle`s.
# 1. `MyArray1` and `MyArray1` have `similar` defined.
# We use them to simulate `BroadcastStyle` overloading `Base.copyto!`.
# 2. `MyArray3` has no `similar` defined.
# 2. `MyArray3` has no `similar` defined.
# We use it to simulate `BroadcastStyle` overloading `Base.copy`.
# 3. Their resolved style could be summaryized as (`-` means conflict)
# | MyArray1 | MyArray2 | MyArray3 | Array
Expand Down Expand Up @@ -1302,7 +1308,7 @@ Base.BroadcastStyle(::Broadcast.ArrayStyle{MyArray2}, S::Broadcast.DefaultArrayS
f(s) = s .+= 1
f(s)
@test (@allocated f(s)) == 0

# issue #185
A = StructArray(randn(ComplexF64, 3, 3))
B = randn(ComplexF64, 3, 3)
Expand All @@ -1321,7 +1327,7 @@ Base.BroadcastStyle(::Broadcast.ArrayStyle{MyArray2}, S::Broadcast.DefaultArrayS

@testset "ambiguity check" begin
test_set = Any[StructArray([1;2+im]),
1:2,
1:2,
(1,2),
StructArray(@SArray [1;1+2im]),
(@SArray [1 2]),
Expand Down Expand Up @@ -1543,5 +1549,5 @@ end
end

@testset "project quality" begin
Aqua.test_all(StructArrays, ambiguities=(; broken=true))
Aqua.test_all(StructArrays, ambiguities = VERSION >= v"1.10")
end
Loading