Skip to content

[TOPI] GPU sort IR refactor to enable sort by keys #7157

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
zhiics merged 10 commits into from
Dec 23, 2020
Merged

[TOPI] GPU sort IR refactor to enable sort by keys #7157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7baf939
sort refactor initial import
Dec 23, 2020
8d47aca
sort test working
Dec 23, 2020
5b507d6
scatter 1d with positive indices working
Dec 23, 2020
3e87a23
remove negatiev indices, using extern for now
Dec 23, 2020
afb86fa
minor fix
masahi Dec 23, 2020
1334260
minor fix
masahi Dec 23, 2020
7049ede
add sort by key test
masahi Dec 23, 2020
d9ed4d2
revert scatter change
masahi Dec 23, 2020
13d706f
add document
masahi Dec 23, 2020
f79abc8
fix py format
masahi Dec 23, 2020
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
4 changes: 1 addition & 3 deletions python/tvm/topi/cuda/nms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,9 +737,7 @@ def non_max_suppression(
score_tensor, valid_count=None, axis=1, is_ascend=False, dtype=valid_count_dtype
)
else:
sort_tensor = argsort(
score_tensor, valid_count=None, axis=1, is_ascend=False, dtype=valid_count_dtype
)
sort_tensor = argsort(score_tensor, axis=1, is_ascend=False, dtype=valid_count_dtype)

sort_tensor_buf = tvm.tir.decl_buffer(
sort_tensor.shape, sort_tensor.dtype, "sort_tensor_buf", data_alignment=8
Expand Down
12 changes: 4 additions & 8 deletions python/tvm/topi/cuda/scatter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,8 @@ def gen_scatter_1d_thrust(data, indices_sorted, updates_sorted, axis, out, _):
Sorting of indices, and sorting of updates with respect to indices, can be done
at the same time by thrust's sort_by_key function. It is important that sorting
be done in a "stable" way via stable_sort, to guarantee deterministic output.
Negative indices are assumed to have been converted to corresponding positive
indices.

Parameters
----------
Expand Down Expand Up @@ -473,12 +475,6 @@ def gen_scatter_1d_thrust(data, indices_sorted, updates_sorted, axis, out, _):

ni = indices_sorted.shape[0]

def do_update(ib, index, update):
with ib.if_scope(index < 0):
out_ptr[index + n] = update
with ib.else_scope():
out_ptr[index] = update

with ib.new_scope():
nthread_bx = ceil_div(ni, nthread_tx)
tx = te.thread_axis("threadIdx.x")
Expand All @@ -491,7 +487,7 @@ def do_update(ib, index, update):
# The last element can always update.
index = indices_ptr[tid]
update = updates_ptr[tid]
do_update(ib, index, update)
out_ptr[index] = update

with ib.else_scope():
with ib.if_scope(tid < ni - 1):
Expand All @@ -503,7 +499,7 @@ def do_update(ib, index, update):
# This thread can update the output.
with ib.if_scope(index != index_next):
update = updates_ptr[tid]
do_update(ib, index, update)
out_ptr[index] = update

return ib.get()

Expand Down
Loading