Skip to content

CAGRA bench: use device-side refinement when the data is on device #228

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

Merged
rapids-bot merged 2 commits into from
Jul 17, 2024
Merged

CAGRA bench: use device-side refinement when the data is on device #228

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a43c48c
CAGRA bench: use device-side refinement when the data is on device
achirkin Jul 17, 2024
944bd8a
Merge branch 'branch-24.08' into fix-cagra-bench-device-refine
achirkin Jul 17, 2024
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
18 changes: 12 additions & 6 deletions cpp/bench/ann/src/cuvs/cuvs_cagra_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,13 @@ class cuvs_cagra : public algo<T>, public algo_gpu {
template <typename T, typename IdxT>
void cuvs_cagra<T, IdxT>::build(const T* dataset, size_t nrow)
{
auto dataset_view =
raft::make_host_matrix_view<const T, int64_t>(dataset, IdxT(nrow), dimension_);
auto dataset_extents = raft::make_extents<IdxT>(nrow, dimension_);

auto& params = index_params_.cagra_params;

if (index_params_.algo == CagraBuildAlgo::kIvfPq) {
auto pq_params = cuvs::neighbors::cagra::graph_build_params::ivf_pq_params(
dataset_view.extents(), params.metric);
auto pq_params =
cuvs::neighbors::cagra::graph_build_params::ivf_pq_params(dataset_extents, params.metric);
if (index_params_.ivf_pq_build_params) {
pq_params.build_params = *index_params_.ivf_pq_build_params;
}
Expand All @@ -181,8 +180,15 @@ void cuvs_cagra<T, IdxT>::build(const T* dataset, size_t nrow)
if (index_params_.nn_descent_params) { nn_params = *index_params_.nn_descent_params; }
params.graph_build_params = nn_params;
}
index_ = std::make_shared<cuvs::neighbors::cagra::index<T, IdxT>>(
std::move(cuvs::neighbors::cagra::build(handle_, params, dataset_view)));
auto dataset_view_host =
raft::make_mdspan<const T, IdxT, raft::row_major, true, false>(dataset, dataset_extents);
auto dataset_view_device =
raft::make_mdspan<const T, IdxT, raft::row_major, false, true>(dataset, dataset_extents);
bool dataset_is_on_host = raft::get_device_for_address(dataset) == -1;

index_ = std::make_shared<cuvs::neighbors::cagra::index<T, IdxT>>(std::move(
dataset_is_on_host ? cuvs::neighbors::cagra::build(handle_, params, dataset_view_host)
: cuvs::neighbors::cagra::build(handle_, params, dataset_view_device)));
}

inline auto allocator_to_string(AllocatorType mem_type) -> std::string
Expand Down