-
Notifications
You must be signed in to change notification settings - Fork 184
Migrate IVF-PQ from RAFT to cuVS #86
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
Merged
rapids-bot
merged 47 commits into
rapidsai:branch-24.06
from
lowener:24.06-ivfpq-migration
May 10, 2024
Merged
Changes from all commits
Commits
Show all changes
47 commits
Select commit
Hold shift + click to select a range
3c40a06
Init IVFPQ migration
lowener c5a3d3a
Migrate ivf-pq build steps to cuvs
lowener 3568f12
Migrate ivf-pq extend to cuvs
lowener 69bf330
Migrate ivf-pq serialize to cuvs
lowener 7a5e8a0
Migrate compute similarity
lowener 4b86f94
Migrate search
lowener 8c8aaed
Add Test for IVFPQ
lowener e444f4b
Temporarily remove IVFPQ Search with filter
lowener 5228a68
Reset exceptions
lowener 3f924f2
Merge branch 'branch-24.06' into 24.06-ivfpq-migration
lowener e8907ee
Add bitset to cuvs, add search_with_filter to ivf-pq
lowener 64809e8
Remove `uint32_t` ivfpq compute_similarity instantiation
lowener e88f82c
Add bitset to compute similarity instantiation
lowener 36bd63b
Add NVTX cuvs domain
lowener 9c4781d
Expose only public API on includes
lowener 9cbfc53
First commit of moving CAGRA from RAFT
cjnolet 1a8a789
Making progress
cjnolet 6e7591a
Merge branch 'branch-24.06' into 24.06-ivfpq-migration
cjnolet 5a719ba
Move headers
lowener 844f209
Merge remote-tracking branch 'mickael/24.06-ivfpq-migration' into fea…
cjnolet 2783c83
Making progress
cjnolet ec2125b
Checking in.
cjnolet c024780
COuple minor fixes to ann_utils
cjnolet 55d8851
More fixes to ann_utils
cjnolet b24a43c
MOre updates
cjnolet 091fe02
Separate header and impl for filters
lowener 80a0c0b
Compiles!
cjnolet 40a860a
Merge remote-tracking branch 'mickael/24.06-ivfpq-migration' into fea…
cjnolet cb011f6
I think it works!
cjnolet dff10bc
Making sure tests are using runtime APIs
cjnolet 3a4c04b
Merge branch 'branch-24.06' into fea-2406-cagra_from_raft
cjnolet 8fd2389
Removing debugging prints
cjnolet 9b9db71
Checking in
cjnolet e5b8500
Merge branch 'fea-2406-cagra_from_raft' of github.com:rapidsai/cuvs i…
cjnolet 849358c
Adding nn-descent public API and tests
cjnolet 8621e6f
Fix style
lowener 197730e
Remove CMAKE_INSTALL_MESSAGE = LAZY
lowener 7c15d0c
Merge remote-tracking branch 'mickael/24.06-ivfpq-migration' into fea…
cjnolet 5b60ee4
Fixing docs
cjnolet 73ae071
Using CUVS_USE_RAFT_STATIC
cjnolet 57d33a8
Trying again
cjnolet 3cf245a
Trying again...y
cjnolet f7dbd55
Use Raft Bitset
lowener e22aff7
Revert "Trying again...y"
cjnolet de395c8
Revert "Using CUVS_USE_RAFT_STATIC"
cjnolet 5239b93
Making sure the python cmakelists is reverted
cjnolet 10b9a7e
Removing line that was accidentally inserted back
cjnolet File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * Copyright (c) 2024, NVIDIA CORPORATION. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <raft/core/bitset.hpp> | ||
|
|
||
| namespace cuvs::core { | ||
| /* To use bitset functions containing CUDA code, include <raft/core/bitset.cuh> */ | ||
|
|
||
| template <typename bitset_t, typename index_t> | ||
| using bitset_view = raft::core::bitset_view<bitset_t, index_t>; | ||
|
|
||
| template <typename bitset_t, typename index_t> | ||
| using bitset = raft::core::bitset<bitset_t, index_t>; | ||
|
|
||
| } // end namespace cuvs::core | ||
This file contains hidden or 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
Oops, something went wrong.
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.
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.
We should consider keeping this in raft with the other vocabulary types so it can continue to be used across different libraries that use raft. Also- we can't be defining device functions in an hpp file in cuVS, since it's not header-only. The only APIs users should be interacting with in cuVS should be pre-compiled runtime APIs.