-
Notifications
You must be signed in to change notification settings - Fork 197
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
Fix max_queries
for CAGRA
#2081
Merged
rapids-bot
merged 4 commits into
rapidsai:branch-24.02
from
lowener:24.02-cagra-smallfix
Jan 9, 2024
Merged
Fix max_queries
for CAGRA
#2081
rapids-bot
merged 4 commits into
rapidsai:branch-24.02
from
lowener:24.02-cagra-smallfix
Jan 9, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Mickael Ide <[email protected]>
cjnolet
reviewed
Jan 8, 2024
@@ -118,7 +118,7 @@ void search_main(raft::resources const& res, | |||
RAFT_EXPECTS(queries.extent(1) == index.dim(), "Queries and index dim must match"); | |||
const uint32_t topk = neighbors.extent(1); | |||
|
|||
if (params.max_queries == 0) { params.max_queries = queries.extent(0); } | |||
if (params.max_queries == 0) { params.max_queries = std::min<size_t>(queries.extent(0), 65535); } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be more robust to compute the value, perhaps using std::limits for int 16, MAX_UNSIGNED_SHORT, or (1<<16)-1.
cjnolet
approved these changes
Jan 9, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
/merge |
ChristinaZ
pushed a commit
to ChristinaZ/raft
that referenced
this pull request
Jan 17, 2024
Fix for rapidsai#2072: CAGRA search is launching a thread per query in single-CTA. The maximum number of thread is 65535 so the `max_queries` auto selection should be bounded to this number. Authors: - Micka (https://github.com/lowener) Approvers: - Corey J. Nolet (https://github.com/cjnolet) URL: rapidsai#2081
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix for #2072: CAGRA search is launching a thread per query in single-CTA. The maximum number of thread is 65535 so the
max_queries
auto selection should be bounded to this number.