Skip to content

Adding int64 search for MG CAGRA #975

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 4 commits into from
Jun 5, 2025
Merged

Adding int64 search for MG CAGRA #975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1f9d09
Adding int64 search for MG CAGRA
viclafargue Jun 4, 2025
1d268f5
Merge branch 'branch-25.08' into mg-cagra-int64-search
viclafargue Jun 4, 2025
54b6129
Commenting out some tests for CI
viclafargue Jun 4, 2025
760387b
Merge branch 'branch-25.08' into mg-cagra-int64-search
viclafargue Jun 5, 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
2 changes: 1 addition & 1 deletion cpp/bench/ann/src/cuvs/cuvs_mg_cagra_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ void cuvs_mg_cagra<T, IdxT>::search_base(
auto queries_view =
raft::make_host_matrix_view<const T, int64_t, raft::row_major>(queries, batch_size, dim_);
auto neighbors_view =
raft::make_host_matrix_view<IdxT, int64_t, raft::row_major>((IdxT*)neighbors, batch_size, k);
raft::make_host_matrix_view<int64_t, int64_t, raft::row_major>(neighbors, batch_size, k);
auto distances_view =
raft::make_host_matrix_view<float, int64_t, raft::row_major>(distances, batch_size, k);

Expand Down
2 changes: 1 addition & 1 deletion cpp/bench/ann/src/cuvs/cuvs_mg_ivf_flat_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ void cuvs_mg_ivf_flat<T, IdxT>::search(
auto queries_view = raft::make_host_matrix_view<const T, int64_t, raft::row_major>(
queries, IdxT(batch_size), IdxT(dim_));
auto neighbors_view = raft::make_host_matrix_view<IdxT, int64_t, raft::row_major>(
(IdxT*)neighbors, IdxT(batch_size), IdxT(k));
neighbors, IdxT(batch_size), IdxT(k));
auto distances_view = raft::make_host_matrix_view<float, int64_t, raft::row_major>(
distances, IdxT(batch_size), IdxT(k));

Expand Down
2 changes: 1 addition & 1 deletion cpp/bench/ann/src/cuvs/cuvs_mg_ivf_pq_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void cuvs_mg_ivf_pq<T, IdxT>::search(
auto queries_view = raft::make_host_matrix_view<const T, int64_t, raft::row_major>(
queries, IdxT(batch_size), IdxT(dim_));
auto neighbors_view = raft::make_host_matrix_view<IdxT, int64_t, raft::row_major>(
(IdxT*)neighbors, IdxT(batch_size), IdxT(k));
neighbors, IdxT(batch_size), IdxT(k));
auto distances_view = raft::make_host_matrix_view<float, int64_t, raft::row_major>(
distances, IdxT(batch_size), IdxT(k));

Expand Down
118 changes: 118 additions & 0 deletions cpp/include/cuvs/neighbors/cagra.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2335,6 +2335,124 @@ void extend(const raft::resources& clique,

/// \defgroup mg_cpp_index_search ANN MG index search

/// \ingroup mg_cpp_index_search
/**
* @brief Searches a multi-GPU index
*
* Usage example:
* @code{.cpp}
* raft::device_resources_snmg clique;
* cuvs::neighbors::mg_index_params<cagra::index_params> index_params;
* auto index = cuvs::neighbors::cagra::build(clique, index_params, index_dataset);
* cuvs::neighbors::mg_search_params<cagra::search_params> search_params;
* cuvs::neighbors::cagra::search(clique, index, search_params, queries, neighbors,
* distances);
* @endcode
*
* @param[in] clique a `raft::resources` object specifying the NCCL clique configuration
* @param[in] index the pre-built index
* @param[in] search_params configure the index search
* @param[in] queries a row-major matrix on host [n_rows, dim]
* @param[out] neighbors a row-major matrix on host [n_rows, n_neighbors]
* @param[out] distances a row-major matrix on host [n_rows, n_neighbors]
*
*/
void search(const raft::resources& clique,
const cuvs::neighbors::mg_index<cagra::index<float, uint32_t>, float, uint32_t>& index,
const cuvs::neighbors::mg_search_params<cagra::search_params>& search_params,
raft::host_matrix_view<const float, int64_t, row_major> queries,
raft::host_matrix_view<int64_t, int64_t, row_major> neighbors,
raft::host_matrix_view<float, int64_t, row_major> distances);

/// \ingroup mg_cpp_index_search
/**
* @brief Searches a multi-GPU index
*
* Usage example:
* @code{.cpp}
* raft::device_resources_snmg clique;
* cuvs::neighbors::mg_index_params<cagra::index_params> index_params;
* auto index = cuvs::neighbors::cagra::build(clique, index_params, index_dataset);
* cuvs::neighbors::mg_search_params<cagra::search_params> search_params;
* cuvs::neighbors::cagra::search(clique, index, search_params, queries, neighbors,
* distances);
* @endcode
*
* @param[in] clique a `raft::resources` object specifying the NCCL clique configuration
* @param[in] index the pre-built index
* @param[in] search_params configure the index search
* @param[in] queries a row-major matrix on host [n_rows, dim]
* @param[out] neighbors a row-major matrix on host [n_rows, n_neighbors]
* @param[out] distances a row-major matrix on host [n_rows, n_neighbors]
*
*/
void search(const raft::resources& clique,
const cuvs::neighbors::mg_index<cagra::index<half, uint32_t>, half, uint32_t>& index,
const cuvs::neighbors::mg_search_params<cagra::search_params>& search_params,
raft::host_matrix_view<const half, int64_t, row_major> queries,
raft::host_matrix_view<int64_t, int64_t, row_major> neighbors,
raft::host_matrix_view<float, int64_t, row_major> distances);

/// \ingroup mg_cpp_index_search
/**
* @brief Searches a multi-GPU index
*
* Usage example:
* @code{.cpp}
* raft::device_resources_snmg clique;
* cuvs::neighbors::mg_index_params<cagra::index_params> index_params;
* auto index = cuvs::neighbors::cagra::build(clique, index_params, index_dataset);
* cuvs::neighbors::mg_search_params<cagra::search_params> search_params;
* cuvs::neighbors::cagra::search(clique, index, search_params, queries, neighbors,
* distances);
* @endcode
*
* @param[in] clique a `raft::resources` object specifying the NCCL clique configuration
* @param[in] index the pre-built index
* @param[in] search_params configure the index search
* @param[in] queries a row-major matrix on host [n_rows, dim]
* @param[out] neighbors a row-major matrix on host [n_rows, n_neighbors]
* @param[out] distances a row-major matrix on host [n_rows, n_neighbors]
*
*/
void search(
const raft::resources& clique,
const cuvs::neighbors::mg_index<cagra::index<int8_t, uint32_t>, int8_t, uint32_t>& index,
const cuvs::neighbors::mg_search_params<cagra::search_params>& search_params,
raft::host_matrix_view<const int8_t, int64_t, row_major> queries,
raft::host_matrix_view<int64_t, int64_t, row_major> neighbors,
raft::host_matrix_view<float, int64_t, row_major> distances);

/// \ingroup mg_cpp_index_search
/**
* @brief Searches a multi-GPU index
*
* Usage example:
* @code{.cpp}
* raft::device_resources_snmg clique;
* cuvs::neighbors::mg_index_params<cagra::index_params> index_params;
* auto index = cuvs::neighbors::cagra::build(clique, index_params, index_dataset);
* cuvs::neighbors::mg_search_params<cagra::search_params> search_params;
* cuvs::neighbors::cagra::search(clique, index, search_params, queries, neighbors,
* distances);
* @endcode
*
* @param[in] clique a `raft::resources` object specifying the NCCL clique configuration
* @param[in] index the pre-built index
* @param[in] search_params configure the index search
* @param[in] queries a row-major matrix on host [n_rows, dim]
* @param[out] neighbors a row-major matrix on host [n_rows, n_neighbors]
* @param[out] distances a row-major matrix on host [n_rows, n_neighbors]
*
*/
void search(
const raft::resources& clique,
const cuvs::neighbors::mg_index<cagra::index<uint8_t, uint32_t>, uint8_t, uint32_t>& index,
const cuvs::neighbors::mg_search_params<cagra::search_params>& search_params,
raft::host_matrix_view<const uint8_t, int64_t, row_major> queries,
raft::host_matrix_view<int64_t, int64_t, row_major> neighbors,
raft::host_matrix_view<float, int64_t, row_major> distances);

/// \ingroup mg_cpp_index_search
/**
* @brief Searches a multi-GPU index
Expand Down
4 changes: 2 additions & 2 deletions cpp/include/cuvs/neighbors/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,12 +786,12 @@ void extend(
std::optional<raft::mdspan<const IdxT, vector_extent<int64_t>, layout_c_contiguous, Accessor2>>
new_indices);

template <typename AnnIndexType, typename T, typename IdxT>
template <typename AnnIndexType, typename T, typename IdxT, typename searchIdxT>
void search(const raft::resources& handle,
const cuvs::neighbors::iface<AnnIndexType, T, IdxT>& interface,
const cuvs::neighbors::search_params* search_params,
raft::device_matrix_view<const T, int64_t, row_major> h_queries,
raft::device_matrix_view<IdxT, int64_t, row_major> d_neighbors,
raft::device_matrix_view<searchIdxT, int64_t, row_major> d_neighbors,
raft::device_matrix_view<float, int64_t, row_major> d_distances);

template <typename AnnIndexType, typename T, typename IdxT>
Expand Down
18 changes: 16 additions & 2 deletions cpp/src/neighbors/iface/generate_iface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,28 @@
const cuvs::neighbors::iface<cagra::index<T, IdxT>, T, IdxT>& interface, \\
const cuvs::neighbors::search_params* search_params, \\
raft::device_matrix_view<const T, int64_t, row_major> queries, \\
raft::device_matrix_view<IdxT, int64_t, row_major> neighbors, \\
raft::device_matrix_view<int64_t, int64_t, row_major> neighbors, \\
raft::device_matrix_view<float, int64_t, row_major> distances); \\
\\
template void search(const raft::resources& handle, \\
const cuvs::neighbors::iface<cagra::index<T, IdxT>, T, IdxT>& interface, \\
const cuvs::neighbors::search_params* search_params, \\
raft::host_matrix_view<const T, int64_t, row_major> h_queries, \\
raft::device_matrix_view<IdxT, int64_t, row_major> d_neighbors, \\
raft::device_matrix_view<int64_t, int64_t, row_major> d_neighbors, \\
raft::device_matrix_view<float, int64_t, row_major> d_distances); \\
\\
template void search(const raft::resources& handle, \\
const cuvs::neighbors::iface<cagra::index<T, IdxT>, T, IdxT>& interface, \\
const cuvs::neighbors::search_params* search_params, \\
raft::device_matrix_view<const T, int64_t, row_major> queries, \\
raft::device_matrix_view<uint32_t, int64_t, row_major> neighbors, \\
raft::device_matrix_view<float, int64_t, row_major> distances); \\
\\
template void search(const raft::resources& handle, \\
const cuvs::neighbors::iface<cagra::index<T, IdxT>, T, IdxT>& interface, \\
const cuvs::neighbors::search_params* search_params, \\
raft::host_matrix_view<const T, int64_t, row_major> h_queries, \\
raft::device_matrix_view<uint32_t, int64_t, row_major> d_neighbors, \\
raft::device_matrix_view<float, int64_t, row_major> d_distances); \\
\\
template void serialize(const raft::resources& handle, \\
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/neighbors/iface/iface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ void extend(
resource::sync_stream(handle);
}

template <typename AnnIndexType, typename T, typename IdxT>
template <typename AnnIndexType, typename T, typename IdxT, typename searchIdxT>
void search(const raft::resources& handle,
const cuvs::neighbors::iface<AnnIndexType, T, IdxT>& interface,
const cuvs::neighbors::search_params* search_params,
raft::device_matrix_view<const T, int64_t, row_major> queries,
raft::device_matrix_view<IdxT, int64_t, row_major> neighbors,
raft::device_matrix_view<searchIdxT, int64_t, row_major> neighbors,
raft::device_matrix_view<float, int64_t, row_major> distances)
{
// std::lock_guard(*interface.mutex_);
Expand Down Expand Up @@ -114,12 +114,12 @@ void search(const raft::resources& handle,
}

// for MG ANN only
template <typename AnnIndexType, typename T, typename IdxT>
template <typename AnnIndexType, typename T, typename IdxT, typename searchIdxT>
void search(const raft::resources& handle,
const cuvs::neighbors::iface<AnnIndexType, T, IdxT>& interface,
const cuvs::neighbors::search_params* search_params,
raft::host_matrix_view<const T, int64_t, row_major> h_queries,
raft::device_matrix_view<IdxT, int64_t, row_major> d_neighbors,
raft::device_matrix_view<searchIdxT, int64_t, row_major> d_neighbors,
raft::device_matrix_view<float, int64_t, row_major> d_distances)
{
// std::lock_guard(*interface.mutex_);
Expand Down
18 changes: 16 additions & 2 deletions cpp/src/neighbors/iface/iface_cagra_float_uint32_t.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,28 @@ namespace cuvs::neighbors {
const cuvs::neighbors::iface<cagra::index<T, IdxT>, T, IdxT>& interface, \
const cuvs::neighbors::search_params* search_params, \
raft::device_matrix_view<const T, int64_t, row_major> queries, \
raft::device_matrix_view<IdxT, int64_t, row_major> neighbors, \
raft::device_matrix_view<int64_t, int64_t, row_major> neighbors, \
raft::device_matrix_view<float, int64_t, row_major> distances); \
\
template void search(const raft::resources& handle, \
const cuvs::neighbors::iface<cagra::index<T, IdxT>, T, IdxT>& interface, \
const cuvs::neighbors::search_params* search_params, \
raft::host_matrix_view<const T, int64_t, row_major> h_queries, \
raft::device_matrix_view<IdxT, int64_t, row_major> d_neighbors, \
raft::device_matrix_view<int64_t, int64_t, row_major> d_neighbors, \
raft::device_matrix_view<float, int64_t, row_major> d_distances); \
\
template void search(const raft::resources& handle, \
const cuvs::neighbors::iface<cagra::index<T, IdxT>, T, IdxT>& interface, \
const cuvs::neighbors::search_params* search_params, \
raft::device_matrix_view<const T, int64_t, row_major> queries, \
raft::device_matrix_view<uint32_t, int64_t, row_major> neighbors, \
raft::device_matrix_view<float, int64_t, row_major> distances); \
\
template void search(const raft::resources& handle, \
const cuvs::neighbors::iface<cagra::index<T, IdxT>, T, IdxT>& interface, \
const cuvs::neighbors::search_params* search_params, \
raft::host_matrix_view<const T, int64_t, row_major> h_queries, \
raft::device_matrix_view<uint32_t, int64_t, row_major> d_neighbors, \
raft::device_matrix_view<float, int64_t, row_major> d_distances); \
\
template void serialize(const raft::resources& handle, \
Expand Down
18 changes: 16 additions & 2 deletions cpp/src/neighbors/iface/iface_cagra_half_uint32_t.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,28 @@ namespace cuvs::neighbors {
const cuvs::neighbors::iface<cagra::index<T, IdxT>, T, IdxT>& interface, \
const cuvs::neighbors::search_params* search_params, \
raft::device_matrix_view<const T, int64_t, row_major> queries, \
raft::device_matrix_view<IdxT, int64_t, row_major> neighbors, \
raft::device_matrix_view<int64_t, int64_t, row_major> neighbors, \
raft::device_matrix_view<float, int64_t, row_major> distances); \
\
template void search(const raft::resources& handle, \
const cuvs::neighbors::iface<cagra::index<T, IdxT>, T, IdxT>& interface, \
const cuvs::neighbors::search_params* search_params, \
raft::host_matrix_view<const T, int64_t, row_major> h_queries, \
raft::device_matrix_view<IdxT, int64_t, row_major> d_neighbors, \
raft::device_matrix_view<int64_t, int64_t, row_major> d_neighbors, \
raft::device_matrix_view<float, int64_t, row_major> d_distances); \
\
template void search(const raft::resources& handle, \
const cuvs::neighbors::iface<cagra::index<T, IdxT>, T, IdxT>& interface, \
const cuvs::neighbors::search_params* search_params, \
raft::device_matrix_view<const T, int64_t, row_major> queries, \
raft::device_matrix_view<uint32_t, int64_t, row_major> neighbors, \
raft::device_matrix_view<float, int64_t, row_major> distances); \
\
template void search(const raft::resources& handle, \
const cuvs::neighbors::iface<cagra::index<T, IdxT>, T, IdxT>& interface, \
const cuvs::neighbors::search_params* search_params, \
raft::host_matrix_view<const T, int64_t, row_major> h_queries, \
raft::device_matrix_view<uint32_t, int64_t, row_major> d_neighbors, \
raft::device_matrix_view<float, int64_t, row_major> d_distances); \
\
template void serialize(const raft::resources& handle, \
Expand Down
Loading