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.

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

Add L2SqrtExpanded support to ivf_flat ANN indices #1133

Merged
merged 7 commits into from
Jan 13, 2023

Conversation

benfred
Copy link
Member

@benfred benfred commented Jan 10, 2023

No description provided.

@benfred benfred added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Jan 10, 2023
@benfred benfred requested a review from a team as a code owner January 10, 2023 22:38
@github-actions github-actions bot added the cpp label Jan 10, 2023
@codecov-commenter
Copy link

codecov-commenter commented Jan 11, 2023

Codecov Report

Base: 87.99% // Head: 87.99% // No change to project coverage 👍

Coverage data is based on head (c15b45e) compared to base (36b315d).
Patch has no changes to coverable lines.

Additional details and impacted files
@@              Coverage Diff              @@
##           branch-23.02    #1133   +/-   ##
=============================================
  Coverage         87.99%   87.99%           
=============================================
  Files                21       21           
  Lines               483      483           
=============================================
  Hits                425      425           
  Misses               58       58           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@benfred benfred marked this pull request as draft January 11, 2023 17:48
@cjnolet cjnolet requested a review from achirkin January 11, 2023 19:16
@benfred benfred marked this pull request as ready for review January 11, 2023 21:59
Copy link
Contributor

@achirkin achirkin left a comment

Choose a reason for hiding this comment

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

Thanks, couple of minor suggestions here

cpp/include/raft/spatial/knn/detail/ivf_flat_search.cuh Outdated Show resolved Hide resolved
cpp/include/raft/spatial/knn/detail/ann_quantized.cuh Outdated Show resolved Hide resolved
Copy link
Contributor

@achirkin achirkin left a comment

Choose a reason for hiding this comment

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

Thanks, LGTM!

@@ -591,9 +592,10 @@ class block_sort {
}

/** Save the content by the pointer location. */
__device__ void store(T* out, IdxT* out_idx) const
template <typename Lambda = raft::identity_op>
__device__ void store(T* out, IdxT* out_idx, Lambda post_process = raft::identity_op()) const
Copy link
Contributor

Choose a reason for hiding this comment

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

Just for the record: I'm currently refactoring select_k in #1085 , so I'd need to catch up with these changes there. I'm also planning to change T and IdxT into OutT and OutIdxT to allow saving the results in a type different from the working types T and IdxT.

@benfred
Copy link
Member Author

benfred commented Jan 13, 2023

/merge

@rapids-bot rapids-bot bot merged commit ab4f1fd into rapidsai:branch-23.02 Jan 13, 2023
@benfred benfred deleted the ivf_flat_l2sqrt branch January 13, 2023 17:26
rapids-bot bot pushed a commit that referenced this pull request Jan 15, 2023
This change was part of #1141 but was accidentally lost while merging conflicts with #1133

Authors:
  - Louis Sugy (https://github.com/Nyrio)

Approvers:
  - Corey J. Nolet (https://github.com/cjnolet)

URL: #1144
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
5 - Ready to Merge cpp improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
Development

Successfully merging this pull request may close these issues.

4 participants