Skip to content

fix: special case cartesian indexing of reshaped arrays #1640

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
merged 1 commit into from
Sep 7, 2025
Merged

fix: special case cartesian indexing of reshaped arrays #1640

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
13 changes: 9 additions & 4 deletions src/TracedUtils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,14 @@ function set_mlir_data!(x::Base.ReshapedArray{TracedRNumber{T}}, data) where {T}
return x
end

function get_ancestor_indices(
x::Base.ReshapedArray{TracedRNumber{T},N}, indices::Vector{CartesianIndex{N}}
) where {T,N}
linear_indices = LinearIndices(size(x))[indices]
parent_linear_indices = LinearIndices(size(parent(x)))[linear_indices]
return (parent_linear_indices,)
end

function get_ancestor_indices(
x::Base.ReshapedArray{TracedRNumber{T},N}, indices...
) where {T,N}
Expand Down Expand Up @@ -190,15 +198,12 @@ function get_ancestor_indices_inner(
end

function _get_ancestor_indices_linear(x::AnyTracedRArray, indices::AbstractArray)
@show indices
indices = CartesianIndices(x)[indices]
@show indices
pidxs = parentindices(x)
parent_indices = map(indices) do idx
CartesianIndex(Base.reindex(pidxs, (idx.I...,)))
end
@show parent_indices
return @show get_ancestor_indices(parent(x), parent_indices)
return get_ancestor_indices(parent(x), parent_indices)
end

Base.@nospecializeinfer function batch_ty(
Expand Down
22 changes: 22 additions & 0 deletions test/indexing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,3 +419,25 @@ end
@jit test_slice_copy!(x)
@test all(Array(x)[1, :] .== 0)
end

@testset "reshaped view setindex!" begin
du = rand(Float32, 10)
u = rand(Float32, 10)
p = 16.0f0
t = 12.0f0

du_ra = Reactant.to_rarray(du; track_numbers=Number)
u_ra = Reactant.to_rarray(u; track_numbers=Number)
p_ra = Reactant.to_rarray(p; track_numbers=Number)
t_ra = Reactant.to_rarray(t; track_numbers=Number)

function odef(du, u, p, t)
u = reshape(u, 2, :)
du = reshape(du, 2, :)
@view(du[1, :]) .= @view(u[1, :]) .+ p .+ t
@view(du[2, :]) .= @view(u[2, :]) .* 2
return reshape(du, :)
end

@test @jit(odef(du_ra, u_ra, p_ra, t_ra)) ≈ odef(du, u, p, t)
end
Loading