KNN select-top-k variants #551

achirkin · 2022-03-10T13:09:30Z

Integrate two new implementations for knn's select_k function.

tfeher

Hi Artem, thanks for this PR! Although it is still a work in progress, I think it makes sense to give you an early feedback. Here are my first batch of comments.

cpp/include/raft/spatial/knn/knn.hpp

cpp/test/spatial/selection.cu

cpp/include/raft/spatial/knn/knn.cuh

cpp/include/raft/spatial/knn/detail/ivf_flat/bitonic_sort.cuh

cpp/include/raft/spatial/knn/detail/ivf_flat/warpsort_topk.cuh

tfeher

Hi Artem, here is a second batch of comments.

cpp/include/raft/spatial/knn/detail/ivf_flat/warpsort_topk.cuh

tfeher

I have went through the raidx top-k kernels, here are my comments.

cpp/include/raft/spatial/knn/detail/ivf_flat/radix_topk.cuh

…egisters

tfeher

Hi Artem, I have finished my first review round. Overall it looks good, but as my comments indicate, some more documentation is required at certain places.

cpp/include/raft/spatial/knn/detail/ivf_flat/warpsort_topk.cuh

…k-variants

tfeher

Thanks Artem for addressing the issues and improving the documentation! I had second look at the bitonic sort, here are a few additional comments.

cpp/include/raft/spatial/knn/detail/ivf_flat/bitonic_sort.cuh

cpp/include/raft/spatial/knn/detail/topk/bitonic_sort.cuh

tfeher

Hi Artem, I had a second look on radix_topk. It looks good overall, just found a few minor things.

cpp/include/raft/spatial/knn/detail/topk/radix_topk.cuh

tfeher

I have finished a second review. Please find a few more suggestions for improving the docs. Apart from these pending items, the PR looks good to me.

cpp/include/raft/spatial/knn/detail/topk/warpsort_topk.cuh

Co-authored-by: Tamas Bela Feher <[email protected]>

tfeher

Thanks Artem for addressing the issues! Apart from two more nitpicks, the PR looks good to me. Pre-approving.

cpp/include/raft/spatial/knn/detail/topk/warpsort_topk.cuh

cjnolet

Thanks Artem! Just one little thing from me this time around. I don't see any obvious things in these changes that would break cuml downstream but a PR should be opened and pinned to this branch before merging just to make sure.

cpp/bench/spatial/selection.cu

cjnolet · 2022-03-28T22:43:06Z

rerun tests

cjnolet

LGTM

cjnolet · 2022-03-30T13:52:47Z

@gpucibot merge

github-actions bot added CMake cpp gpuCI labels Mar 10, 2022

achirkin added 2 - In Progress Currenty a work in progress improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Mar 10, 2022

cjnolet assigned achirkin Mar 10, 2022

achirkin force-pushed the enh-knn-topk-variants branch from 691362a to 02dcaec Compare March 11, 2022 06:47

achirkin added 8 commits March 11, 2022 19:12

Integrate new select-top-k implementations

179e1df

warpsort_topk: refactoring and fixing some bugs

4749295

Allow passing indices along with keys (values).

8504d32

Adapt to the new bench

cef3253

Use the pooled allocator helper

535fa0d

Remove the step of calculating required buf size.

7d10507

Remove unused code

ba66efa

Allow different types in select-k functions (float/double, int/size_t)

3eab24b

achirkin force-pushed the enh-knn-topk-variants branch from 76b1a8b to 3eab24b Compare March 11, 2022 18:15

github-actions bot removed the gpuCI label Mar 11, 2022

tfeher requested changes Mar 14, 2022

View reviewed changes

tfeher requested changes Mar 15, 2022

View reviewed changes

tfeher requested changes Mar 16, 2022

View reviewed changes

achirkin added 7 commits March 17, 2022 16:38

More refactoring and comments

659bc18

Update knn.cuh docs

8b6351b

Add more comments

a43e462

Use radix top-k as reference, because it supports larger k

45f6a35

Add more comments and refactor vectorized_process

0fe93d2

Make bitonic sort use less template parameters for faster compile times

50800a4

Use gridDim.y for the batch dimension to simplify math and use less r…

78805f0

…egisters

tfeher requested changes Mar 21, 2022

View reviewed changes

Update tests

9cf1f33

Merge remote-tracking branch 'rapidsai/branch-22.04' into enh-knn-top…

dcb17fe

…k-variants

tfeher requested changes Mar 25, 2022

View reviewed changes

Clarify some parts of documentsion for bitonic sort

84de3f2

achirkin added 3 - Ready for Review and removed 2 - In Progress Currenty a work in progress labels Mar 25, 2022

tfeher requested changes Mar 25, 2022

View reviewed changes

cpp/include/raft/spatial/knn/detail/topk/radix_topk.cuh Show resolved Hide resolved

cpp/include/raft/spatial/knn/detail/topk/radix_topk.cuh Outdated Show resolved Hide resolved

cpp/include/raft/spatial/knn/detail/topk/radix_topk.cuh Outdated Show resolved Hide resolved

tfeher requested changes Mar 25, 2022

View reviewed changes

achirkin and others added 6 commits March 28, 2022 07:31

Update cpp/include/raft/spatial/knn/detail/topk/warpsort_topk.cuh

25ff099

Co-authored-by: Tamas Bela Feher <[email protected]>

Update cpp/include/raft/spatial/knn/detail/topk/warpsort_topk.cuh

99f6feb

Co-authored-by: Tamas Bela Feher <[email protected]>

Update cpp/include/raft/spatial/knn/detail/topk/warpsort_topk.cuh

deb7e44

Co-authored-by: Tamas Bela Feher <[email protected]>

Update cpp/include/raft/spatial/knn/detail/topk/warpsort_topk.cuh

073d0f5

Co-authored-by: Tamas Bela Feher <[email protected]>

Address review comments

a811740

Slightly reduce the number of tests for faster CI

ff2d6e6

achirkin requested review from tfeher and cjnolet March 28, 2022 06:24

Couple more comments

e2f7d86

tfeher approved these changes Mar 28, 2022

View reviewed changes

cpp/include/raft/spatial/knn/detail/topk/warpsort_topk.cuh Outdated Show resolved Hide resolved

cpp/include/raft/spatial/knn/detail/topk/warpsort_topk.cuh Outdated Show resolved Hide resolved

Address more comments

1936abd

cjnolet requested changes Mar 28, 2022

View reviewed changes

cpp/bench/spatial/selection.cu Outdated Show resolved Hide resolved

achirkin added 2 commits March 29, 2022 07:39

Remove commented-out bench cases

6b3804c

Change some bench cases

bea83b3

achirkin mentioned this pull request Mar 29, 2022

Testing changes in raft kNN select_k rapidsai/cuml#4665

Closed

cjnolet approved these changes Mar 30, 2022

View reviewed changes

rapids-bot bot merged commit bde2584 into rapidsai:branch-22.04 Mar 30, 2022

achirkin deleted the enh-knn-topk-variants branch March 31, 2022 06:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

KNN select-top-k variants #551

KNN select-top-k variants #551

achirkin commented Mar 10, 2022 •

edited

Loading

tfeher left a comment

tfeher left a comment

tfeher left a comment

tfeher left a comment

tfeher left a comment

tfeher left a comment

tfeher left a comment

tfeher left a comment

cjnolet left a comment

cjnolet commented Mar 28, 2022

cjnolet left a comment

cjnolet commented Mar 30, 2022

KNN select-top-k variants #551

KNN select-top-k variants #551

Conversation

achirkin commented Mar 10, 2022 • edited Loading

tfeher left a comment

Choose a reason for hiding this comment

tfeher left a comment

Choose a reason for hiding this comment

tfeher left a comment

Choose a reason for hiding this comment

tfeher left a comment

Choose a reason for hiding this comment

tfeher left a comment

Choose a reason for hiding this comment

tfeher left a comment

Choose a reason for hiding this comment

tfeher left a comment

Choose a reason for hiding this comment

tfeher left a comment

Choose a reason for hiding this comment

cjnolet left a comment

Choose a reason for hiding this comment

cjnolet commented Mar 28, 2022

cjnolet left a comment

Choose a reason for hiding this comment

cjnolet commented Mar 30, 2022

achirkin commented Mar 10, 2022 •

edited

Loading