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.

Sign up for GitHub

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 0 recall issue in raft_cagra_hnswlib ANN benchmark #2369

Merged
merged 1 commit into from
Jun 27, 2024
+10 −4
Merged

Fix 0 recall issue in raft_cagra_hnswlib ANN benchmark #2369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Loading
Loading status checks…
fix recall
@divyegala
divyegala committed Jun 27, 2024
commit b7a8d925ef3e29a6bf08a7cc072e2468312b1c3a
2 changes: 1 addition & 1 deletion cpp/bench/ann/src/raft/raft_cagra_hnswlib_wrapper.h
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ class RaftCagraHnswlib : public ANN<T>, public AnnGPU {

RaftCagraHnswlib(Metric metric, int dim, const BuildParam& param, int concurrent_searches = 1)
: ANN<T>(metric, dim),
cagra_build_{metric, dim, param, concurrent_searches},
cagra_build_{metric, dim, param, concurrent_searches, true},
// HnswLib param values don't matter since we don't build with HnswLib
hnswlib_search_{metric, dim, typename HnswLib<T>::BuildParam{50, 100}}
{
12 changes: 9 additions & 3 deletions cpp/bench/ann/src/raft/raft_cagra_wrapper.h
View file
Original file line number Diff line number Diff line change
@@ -72,11 +72,16 @@ class RaftCagra : public ANN<T>, public AnnGPU {
std::optional<raft::neighbors::ivf_pq::search_params> ivf_pq_search_params = std::nullopt;
};

RaftCagra(Metric metric, int dim, const BuildParam& param, int concurrent_searches = 1)
RaftCagra(Metric metric,
int dim,
const BuildParam& param,
int concurrent_searches = 1,
bool shall_include_dataset = false)
: ANN<T>(metric, dim),
index_params_(param),
dimension_(dim),
need_dataset_update_(true),
shall_include_dataset_(shall_include_dataset),
dataset_(std::make_shared<raft::device_matrix<T, int64_t, row_major>>(
std::move(make_device_matrix<T, int64_t>(handle_, 0, 0)))),
graph_(std::make_shared<raft::device_matrix<IdxT, int64_t, row_major>>(
@@ -135,6 +140,7 @@ class RaftCagra : public ANN<T>, public AnnGPU {
float refine_ratio_;
BuildParam index_params_;
bool need_dataset_update_;
bool shall_include_dataset_;
raft::neighbors::cagra::search_params search_params_;
std::shared_ptr<raft::neighbors::cagra::index<T, IdxT>> index_;
int dimension_;
@@ -161,7 +167,7 @@ void RaftCagra<T, IdxT>::build(const T* dataset, size_t nrow)
auto& params = index_params_.cagra_params;

// Do include the compressed dataset for the CAGRA-Q
bool shall_include_dataset = params.compression.has_value();
bool include_dataset = params.compression.has_value() || shall_include_dataset_;

index_ = std::make_shared<raft::neighbors::cagra::index<T, IdxT>>(
std::move(raft::neighbors::cagra::detail::build(handle_,
@@ -171,7 +177,7 @@ void RaftCagra<T, IdxT>::build(const T* dataset, size_t nrow)
index_params_.ivf_pq_refine_rate,
index_params_.ivf_pq_build_params,
index_params_.ivf_pq_search_params,
shall_include_dataset)));
include_dataset)));
}

inline std::string allocator_to_string(AllocatorType mem_type)