Skip to content

25.06 hotfix for SNMG #1027

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

25.06 hotfix for SNMG #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0515ab2
25.06 hotfix for SNMG
viclafargue Jun 17, 2025
0a7ca4b
adding tree merge number of ranks check
viclafargue Jun 17, 2025
7c58fc6
pin faiss version
tarang-jain Jun 17, 2025
fa4cc77
pin faiss version
tarang-jain Jun 17, 2025
600a051
pin faiss version
tarang-jain Jun 17, 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
4 changes: 2 additions & 2 deletions cpp/cmake/patches/faiss_override.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"packages" : {
"faiss" : {
"version": "1.10.0",
"version": "1.11.0",
"git_url": "https://github.com/facebookresearch/faiss.git",
"git_tag": "main"
"git_tag": "v1.11.0"
}
}
}
19 changes: 16 additions & 3 deletions cpp/src/neighbors/mg/snmg.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,13 +409,24 @@ void sharded_search_with_tree_merge(const raft::resources& clique,
radix *= 2;

if (received_something) {
// merge inplace
auto neighbors_merge_res = raft::make_device_matrix<IdxT, int64_t, row_major>(
dev_res, n_rows_of_current_batch, n_neighbors);
auto distances_merge_res = raft::make_device_matrix<float, int64_t, row_major>(
dev_res, n_rows_of_current_batch, n_neighbors);
knn_merge_parts(dev_res,
tmp_distances.view(),
tmp_neighbors.view(),
tmp_distances.view(),
tmp_neighbors.view(),
distances_merge_res.view(),
neighbors_merge_res.view(),
d_trans.view());
raft::copy(tmp_neighbors.data_handle(),
neighbors_merge_res.data_handle(),
part_size,
raft::resource::get_cuda_stream(dev_res));
raft::copy(tmp_distances.data_handle(),
distances_merge_res.data_handle(),
part_size,
raft::resource::get_cuda_stream(dev_res));

// If done, copy the final result
if (remaining <= 1) {
Expand Down Expand Up @@ -605,6 +616,8 @@ void search(const raft::resources& clique,
n_neighbors,
n_batches);
} else if (merge_mode == TREE_MERGE) {
ASSERT(index.num_ranks_ % 2 == 0,
"The number of ranks should be even when running sharded search in TREE_MERGE mode.");
RAFT_LOG_DEBUG(
"SHARDED SEARCH WITH TREE_MERGE MERGE MODE %d*%drows", n_batches, n_rows_per_batch);
sharded_search_with_tree_merge(clique,
Expand Down
23 changes: 10 additions & 13 deletions cpp/tests/neighbors/mg.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <cuvs/neighbors/ivf_flat.hpp>
#include <cuvs/neighbors/ivf_pq.hpp>
#include <raft/core/device_resources_snmg.hpp>
#include <raft/core/resource/nccl_comm.hpp>

namespace cuvs::neighbors::mg {

Expand Down Expand Up @@ -453,6 +454,8 @@ class AnnMGTest : public ::testing::TestWithParam<AnnMGInputs> {
ps.k);
std::vector<float> load_balancer_distances_snmg_ann(n_parallel_searches * ps.num_queries *
ps.k);

raft::resource::get_nccl_comms(clique_);
#pragma omp parallel for
for (uint64_t search_idx = 0; search_idx < searches_correctness.size(); search_idx++) {
uint64_t offset = search_idx * ps.num_queries * ps.k;
Expand Down Expand Up @@ -518,6 +521,8 @@ class AnnMGTest : public ::testing::TestWithParam<AnnMGInputs> {
ps.k);
std::vector<float> load_balancer_distances_snmg_ann(n_parallel_searches * ps.num_queries *
ps.k);

raft::resource::get_nccl_comms(clique_);
#pragma omp parallel for
for (uint64_t search_idx = 0; search_idx < searches_correctness.size(); search_idx++) {
uint64_t offset = search_idx * ps.num_queries * ps.k;
Expand Down Expand Up @@ -578,6 +583,8 @@ class AnnMGTest : public ::testing::TestWithParam<AnnMGInputs> {
ps.k);
std::vector<float> load_balancer_distances_snmg_ann(n_parallel_searches * ps.num_queries *
ps.k);

raft::resource::get_nccl_comms(clique_);
#pragma omp parallel for
for (uint64_t search_idx = 0; search_idx < searches_correctness.size(); search_idx++) {
uint64_t offset = search_idx * ps.num_queries * ps.k;
Expand Down Expand Up @@ -676,8 +683,6 @@ const std::vector<AnnMGInputs> inputs = {
1024,
cuvs::distance::DistanceType::L2Expanded,
true},

/*
{7000,
10000,
8,
Expand All @@ -689,9 +694,6 @@ const std::vector<AnnMGInputs> inputs = {
1024,
cuvs::distance::DistanceType::L2Expanded,
true},
*/

/*
{7000,
10000,
8,
Expand Down Expand Up @@ -725,6 +727,9 @@ const std::vector<AnnMGInputs> inputs = {
1024,
cuvs::distance::DistanceType::L2Expanded,
true},
/*
Tree merge requires an even number of GPU, but CI only has one. Disabled for now.
See https://github.com/rapidsai/cuvs/issues/904

{7000,
10000,
Expand Down Expand Up @@ -760,7 +765,6 @@ const std::vector<AnnMGInputs> inputs = {
cuvs::distance::DistanceType::L2Expanded,
true},
*/

{7000,
10000,
8,
Expand All @@ -783,8 +787,6 @@ const std::vector<AnnMGInputs> inputs = {
1024,
cuvs::distance::DistanceType::L2Expanded,
true},

/*
{7000,
10000,
8,
Expand All @@ -796,8 +798,6 @@ const std::vector<AnnMGInputs> inputs = {
1024,
cuvs::distance::DistanceType::L2Expanded,
true},
*/

{3,
10000,
8,
Expand All @@ -820,8 +820,6 @@ const std::vector<AnnMGInputs> inputs = {
1024,
cuvs::distance::DistanceType::L2Expanded,
true},

/*
{3,
10000,
8,
Expand All @@ -833,6 +831,5 @@ const std::vector<AnnMGInputs> inputs = {
1024,
cuvs::distance::DistanceType::L2Expanded,
true},
*/
};
} // namespace cuvs::neighbors::mg