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

FAISS with cuVS enabled in cuvs-bench #561

Merged
merged 33 commits into from
Jan 29, 2025
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
689716c
fix
tarang-jain Dec 19, 2024
8e3a02e
updates
tarang-jain Jan 6, 2025
27dda5f
Merge branch 'branch-25.02' of https://github.com/rapidsai/cuvs into …
tarang-jain Jan 6, 2025
10618fb
Merge branch 'branch-25.02' of https://github.com/rapidsai/cuvs into …
tarang-jain Jan 8, 2025
c0ff9ba
more changes
tarang-jain Jan 8, 2025
21f92fd
working
tarang-jain Jan 9, 2025
20e462c
update yaml
tarang-jain Jan 10, 2025
3f86225
Merge branch 'branch-25.02' of https://github.com/rapidsai/cuvs into …
tarang-jain Jan 13, 2025
8d098bd
update configs
tarang-jain Jan 14, 2025
f8beec6
cagra wrapper
tarang-jain Jan 15, 2025
63ecfde
Merge branch 'branch-25.02' into faiss-cuvs
tarang-jain Jan 15, 2025
c37f028
cagra wrapper
tarang-jain Jan 21, 2025
1cb5b73
merge upstream
tarang-jain Jan 22, 2025
61fd247
Merge branch 'branch-25.02' of https://github.com/rapidsai/cuvs into …
tarang-jain Jan 22, 2025
6d8c396
Merge branch 'faiss-cuvs' of https://github.com/tarang-jain/cuvs into…
tarang-jain Jan 22, 2025
c11c317
automatic pool resource management
tarang-jain Jan 22, 2025
25765ed
rm algo-specific in benchmark.hpp
tarang-jain Jan 22, 2025
26fbe30
refine
tarang-jain Jan 22, 2025
508bd5c
Merge branch 'branch-25.02' into faiss-cuvs
tarang-jain Jan 22, 2025
e4d97db
kHost queries
tarang-jain Jan 22, 2025
fed8c3b
raft_log_level
tarang-jain Jan 22, 2025
52eac3b
cleanup
tarang-jain Jan 22, 2025
9066e2d
rm raft::raft
tarang-jain Jan 23, 2025
bc5714f
Merge branch 'branch-25.02' of https://github.com/rapidsai/cuvs into …
tarang-jain Jan 23, 2025
986f476
conditionally link raft::raft
tarang-jain Jan 23, 2025
ddd711a
Merge branch 'branch-25.02' of https://github.com/rapidsai/cuvs into …
tarang-jain Jan 23, 2025
b3511fa
conditionally link raft::raft only for faiss_gpu
tarang-jain Jan 24, 2025
880966a
Merge branch 'branch-25.02' of https://github.com/rapidsai/cuvs into …
tarang-jain Jan 24, 2025
4a82d13
inherit faiss_gpu
tarang-jain Jan 27, 2025
18d1e62
raft::raft in invidual targets
tarang-jain Jan 27, 2025
4b07e90
merge upstream
tarang-jain Jan 27, 2025
6cffe02
style
tarang-jain Jan 27, 2025
d288548
Merge branch 'branch-25.02' into faiss-cuvs
tarang-jain Jan 28, 2025
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
Prev Previous commit
Next Next commit
refine
tarang-jain committed Jan 22, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 26fbe3020ff278a27f69fef1370994f3eccc7d15
13 changes: 0 additions & 13 deletions cpp/bench/ann/src/faiss/faiss_gpu_wrapper.h
Original file line number Diff line number Diff line change
@@ -554,19 +554,6 @@ class faiss_gpu_cagra : public faiss_gpu<T> {
auto sp = dynamic_cast<const typename faiss_gpu_cagra<T>::search_param&>(param);
this->refine_ratio_ = sp.refine_ratio;
this->search_params_ = std::make_shared<faiss::gpu::SearchParametersCagra>(sp.p);

// if (sp.refine_ratio > 1.0) {
// RAFT_LOG_INFO("now creating index_refine_");
// this->index_refine_ =
// std::make_shared<faiss::IndexRefineFlat>(this->index_.get(), this->dataset_);
// RAFT_LOG_INFO("now done creating index_refine_");
// this->index_refine_.get()->k_factor = sp.refine_ratio;
// faiss::IndexRefineSearchParameters faiss_refine_search_params;
// faiss_refine_search_params.k_factor = this->index_refine_.get()->k_factor;
// faiss_refine_search_params.base_index_params = this->search_params_.get();
// this->refine_search_params_ =
// std::make_unique<faiss::IndexRefineSearchParameters>(faiss_refine_search_params);
// }
}

void save(const std::string& file) const override