Skip to content

Prevent type-inferability escaping for rrule of sortslices #817

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prevent type-inferability escaping for rrule of sortslices #817

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
7 changes: 5 additions & 2 deletions src/rulesets/Base/sort.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,13 @@ end

function rrule(::typeof(sortslices), x::AbstractArray; dims::Integer, kw...)
p = sortperm(collect(eachslice(x; dims=dims)); kw...)
inds = ntuple(d -> d == dims ? p : (:), ndims(x))
function sortslices_pullback(dy)
return (NoTangent(), ∇getindex(x, unthunk(dy), inds...))
# avoid closing over `inds` as it doesn't fully infer and that makes it worse
# recomputing is cheap
inds_inner = ntuple(d -> d == dims ? p : (:), ndims(x))
return (NoTangent(), ∇getindex(x, unthunk(dy), inds_inner...))
end
inds = ntuple(d -> d == dims ? p : (:), ndims(x))
return x[inds...], sortslices_pullback
end

Expand Down
2 changes: 1 addition & 1 deletion test/rulesets/Base/sort.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

test_rrule(sortslices, rand(3,4); fkwargs=(; dims=2))
test_rrule(sortslices, rand(5,4); fkwargs=(; dims=1, rev=true, by=last))
test_rrule(sortslices, rand(3,4,5); fkwargs=(; dims=3, by=sum), check_inferred=false)
test_rrule(sortslices, rand(3,4,5); fkwargs=(; dims=3, by=sum))
Comment on lines 27 to +29
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
test_rrule(sortslices, rand(3,4); fkwargs=(; dims=2))
test_rrule(sortslices, rand(5,4); fkwargs=(; dims=1, rev=true, by=last))
test_rrule(sortslices, rand(3,4,5); fkwargs=(; dims=3, by=sum), check_inferred=false)
test_rrule(sortslices, rand(3,4,5); fkwargs=(; dims=3, by=sum))
test_rrule(sortslices, rand(3, 4); fkwargs=(; dims=2))
test_rrule(sortslices, rand(5, 4); fkwargs=(; dims=1, rev=true, by=last))
test_rrule(sortslices, rand(3, 4, 5); fkwargs=(; dims=3, by=sum))


@test_throws Exception sortslices(Diagonal(1:3), dims=1)
end
Expand Down
Loading