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

Jump to bottom

Explicitly compute stride in unaliascopy for SubArray #54102

Merged
merged 3 commits into from
Apr 16, 2024
Merged

Explicitly compute stride in unaliascopy for SubArray #54102

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f1b454
Explicitly compute stride in unaliascopy for SubArray
jishnub Apr 16, 2024
7dd2f62
Use zero of the eltype in _trimmedshape
jishnub Apr 16, 2024
b39b039
Branch on empty range in _trimmedshape
jishnub Apr 16, 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
7 changes: 5 additions & 2 deletions base/subarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,14 @@ function unaliascopy(V::SubArray{T,N,A,I,LD}) where {T,N,A<:Array,I<:Tuple{Varar
trimmedpind = _trimmedpind(V.indices...)
vdest = trimmedpind isa Tuple{Vararg{Union{Slice,Colon}}} ? dest : view(dest, trimmedpind...)
copyto!(vdest, view(V, _trimmedvind(V.indices...)...))
SubArray{T,N,A,I,LD}(dest, map(_trimmedindex, V.indices), 0, Int(LD))
indices = map(_trimmedindex, V.indices)
stride1 = LD ? compute_stride1(dest, indices) : 0
offset1 = LD ? compute_offset1(dest, stride1, indices) : 0
SubArray{T,N,A,I,LD}(dest, indices, offset1, stride1)
end
# Get the proper trimmed shape
_trimmedshape(::ScalarIndex, rest...) = (1, _trimmedshape(rest...)...)
_trimmedshape(i::AbstractRange, rest...) = (maximum(i), _trimmedshape(rest...)...)
_trimmedshape(i::AbstractRange, rest...) = (maximum(i, init=0), _trimmedshape(rest...)...)
N5N3 marked this conversation as resolved.
Show resolved Hide resolved
_trimmedshape(i::Union{UnitRange,StepRange,OneTo}, rest...) = (length(i), _trimmedshape(rest...)...)
_trimmedshape(i::AbstractArray{<:ScalarIndex}, rest...) = (length(i), _trimmedshape(rest...)...)
_trimmedshape(i::AbstractArray{<:AbstractCartesianIndex{0}}, rest...) = _trimmedshape(rest...)
Expand Down
19 changes: 19 additions & 0 deletions test/subarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,25 @@ end
@test @inferred(Base.unaliascopy(V))::typeof(V) == V == A[i1, 1:5, i2, i3]
V = view(A, i1, 1:5, i3, i2)
@test @inferred(Base.unaliascopy(V))::typeof(V) == V == A[i1, 1:5, i3, i2]

@testset "custom ranges" begin
struct MyStepRange{T} <: OrdinalRange{T,T}
r::StepRange{T,T}
end

for f in (:first, :last, :step, :length, :size)
@eval Base.$f(r::MyStepRange) = $f(r.r)
end
Base.getindex(r::MyStepRange, i::Int) = r.r[i]

a = rand(6)
V = view(a, MyStepRange(2:2:4))
@test @inferred(Base.unaliascopy(V))::typeof(V) == V

# empty range
V = view(a, MyStepRange(2:2:1))
@test @inferred(Base.unaliascopy(V))::typeof(V) == V
end
end

@testset "issue #27632" begin
Expand Down