Skip to content

Reduce NEIGHBORS_ALL_NEIGHBORS_TEST combinatorial test space #2573

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 3 commits into from
Sep 12, 2026
+144 −30
Merged

Reduce NEIGHBORS_ALL_NEIGHBORS_TEST combinatorial test space #2573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
daf9669
Reduce NEIGHBORS_ALL_NEIGHBORS_TEST combinatorial test space
robertmaynard Sep 9, 2026
37ce6d4
Merge branch 'main' into fea/improve_neighbors_test_time
robertmaynard Sep 9, 2026
98a07c2
Merge branch 'main' into fea/improve_neighbors_test_time
cjnolet Sep 11, 2026
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
146 changes: 120 additions & 26 deletions cpp/tests/neighbors/all_neighbors.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,12 +279,66 @@ const std::vector<AllNeighborsInputs> inputsSingle =
{5000, 7151}, // n_rows
{64, 137}, // dim
{16, 23}, // graph_degree
{false, true}, // data on host
{false}, // data on host
{false}, // mutual_reach
{false} // output on host
);

const std::vector<AllNeighborsInputs> inputsSingleDataTransfer =
raft::util::itertools::product<AllNeighborsInputs>(
{std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(IVF_PQ, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::InnerProduct, 0.8)},
{std::make_tuple(1lu, 2lu)}, // min_recall, n_clusters, overlap_factor
{5000}, // n_rows
{137}, // dim
{23}, // graph_degree
{true}, // data on host
{false}, // mutual_reach
{false, true} // output on host
);

const std::vector<AllNeighborsInputs> inputsBatch =
const std::vector<AllNeighborsInputs> inputsBatchLow =
raft::util::itertools::product<AllNeighborsInputs>(
{std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::L2SqrtExpanded, 0.9),
std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::CosineExpanded, 0.9),
std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::InnerProduct, 0.9),
std::make_tuple(IVF_PQ, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::L2SqrtExpanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::CosineExpanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::InnerProduct, 0.9)},
{std::make_tuple(4lu, 2lu)}, // min_recall, n_clusters, overlap_factor
{5000}, // n_rows
{64, 137}, // dim
{16, 23}, // graph_degree
{true}, // data on host
{false}, // mutual_reach
{true} // output on host
);

const std::vector<AllNeighborsInputs> inputsBatchMed =
raft::util::itertools::product<AllNeighborsInputs>(
{std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::L2SqrtExpanded, 0.9),
std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::CosineExpanded, 0.9),
std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::InnerProduct, 0.9),
std::make_tuple(IVF_PQ, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::L2SqrtExpanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::CosineExpanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::InnerProduct, 0.9)},
{std::make_tuple(7lu, 2lu)}, // min_recall, n_clusters, overlap_factor
{7151}, // n_rows
{137}, // dim
{23}, // graph_degree
{true}, // data on host
{false}, // mutual_reach
{false} // output on host
);

const std::vector<AllNeighborsInputs> inputsBatchHigh =
raft::util::itertools::product<AllNeighborsInputs>(
{std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::L2SqrtExpanded, 0.9),
Expand All @@ -295,17 +349,13 @@ const std::vector<AllNeighborsInputs> inputsBatch =
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::L2SqrtExpanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::CosineExpanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::InnerProduct, 0.9)},
{
std::make_tuple(4lu, 2lu),
std::make_tuple(7lu, 2lu),
std::make_tuple(10lu, 2lu),
}, // min_recall, n_clusters, overlap_factor
{5000, 7151}, // n_rows
{64, 137}, // dim
{16, 23}, // graph_degree
{true}, // data on host
{false}, // mutual_reach
{false, true} // output on host
{std::make_tuple(10lu, 2lu)}, // min_recall, n_clusters, overlap_factor
{5000}, // n_rows
{64}, // dim
{16}, // graph_degree
{true}, // data on host
{false}, // mutual_reach
{false} // output on host
);

const std::vector<AllNeighborsInputs> mutualReachSingle =
Expand All @@ -320,30 +370,74 @@ const std::vector<AllNeighborsInputs> mutualReachSingle =
{5000, 7151}, // n_rows
{64, 137}, // dim
{16, 23}, // graph_degree
{false, true}, // data on host
{false}, // data on host
{true}, // mutual_reach
{false} // output on host
);
const std::vector<AllNeighborsInputs> mutualReachSingleDataTransfer =
raft::util::itertools::product<AllNeighborsInputs>(
{std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::L2SqrtExpanded, 0.9),
std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::CosineExpanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::L2SqrtExpanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::CosineExpanded, 0.9)},
{std::make_tuple(1lu, 2lu)}, // n_clusters, overlap_factor
{5000}, // n_rows
{137}, // dim
{23}, // graph_degree
{true}, // data on host
{true}, // mutual_reach
{false, true} // output on host
);

const std::vector<AllNeighborsInputs> mutualReachBatch =
const std::vector<AllNeighborsInputs> mutualReachBatchLow =
raft::util::itertools::product<AllNeighborsInputs>(
{std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::L2SqrtExpanded, 0.9),
std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::CosineExpanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::L2SqrtExpanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::CosineExpanded, 0.9)},
{std::make_tuple(4lu, 2lu)}, // n_clusters, overlap_factor
{5000}, // n_rows
{64, 137}, // dim
{16, 23}, // graph_degree
{true}, // data on host
{true}, // mutual_reach
{true} // output on host
);
const std::vector<AllNeighborsInputs> mutualReachBatchMed =
raft::util::itertools::product<AllNeighborsInputs>(
{std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::L2SqrtExpanded, 0.9),
std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::CosineExpanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::L2SqrtExpanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::CosineExpanded, 0.9)},
{std::make_tuple(7lu, 2lu)}, // n_clusters, overlap_factor
{5000}, // n_rows
{137}, // dim
{16}, // graph_degree
{true}, // data on host
{true}, // mutual_reach
{false} // output on host
);
const std::vector<AllNeighborsInputs> mutualReachBatchHigh =
raft::util::itertools::product<AllNeighborsInputs>(
{std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::L2SqrtExpanded, 0.9),
std::make_tuple(BRUTE_FORCE, cuvs::distance::DistanceType::CosineExpanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::L2Expanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::L2SqrtExpanded, 0.9),
std::make_tuple(NN_DESCENT, cuvs::distance::DistanceType::CosineExpanded, 0.9)},
{
std::make_tuple(4lu, 2lu),
std::make_tuple(7lu, 2lu),
std::make_tuple(10lu, 2lu),
}, // n_clusters, overlap_factor
{5000, 7151}, // n_rows
{64, 137}, // dim
{16, 23}, // graph_degree
{true}, // data on host
{true}, // mutual_reach
{false, true} // output on host
{std::make_tuple(10lu, 2lu)}, // n_clusters, overlap_factor
{7151}, // n_rows
{64}, // dim
{23}, // graph_degree
{true}, // data on host
{true}, // mutual_reach
{false} // output on host
);

} // namespace cuvs::neighbors::all_neighbors
28 changes: 24 additions & 4 deletions cpp/tests/neighbors/all_neighbors/test_float.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION.
* SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
* SPDX-License-Identifier: Apache-2.0
*/

Expand All @@ -15,14 +15,34 @@ TEST_P(AllNeighborsTestF, AllNeighbors) { this->run(); }
INSTANTIATE_TEST_CASE_P(AllNeighborsSingleTest,
AllNeighborsTestF,
::testing::ValuesIn(inputsSingle));
INSTANTIATE_TEST_CASE_P(AllNeighborsSingleTestDataTransfer,
AllNeighborsTestF,
::testing::ValuesIn(inputsSingleDataTransfer));

INSTANTIATE_TEST_CASE_P(AllNeighborsBatchTest, AllNeighborsTestF, ::testing::ValuesIn(inputsBatch));
INSTANTIATE_TEST_CASE_P(AllNeighborsBatchTestLow,
AllNeighborsTestF,
::testing::ValuesIn(inputsBatchLow));
INSTANTIATE_TEST_CASE_P(AllNeighborsBatchTestMed,
AllNeighborsTestF,
::testing::ValuesIn(inputsBatchMed));
INSTANTIATE_TEST_CASE_P(AllNeighborsBatchTestHigh,
AllNeighborsTestF,
::testing::ValuesIn(inputsBatchHigh));

INSTANTIATE_TEST_CASE_P(AllNeighborsSingleMutualTest,
AllNeighborsTestF,
::testing::ValuesIn(mutualReachSingle));
INSTANTIATE_TEST_CASE_P(AllNeighborsSingleMutualTestDataTransfer,
AllNeighborsTestF,
::testing::ValuesIn(mutualReachSingleDataTransfer));

INSTANTIATE_TEST_CASE_P(AllNeighborsBatchMutualTest,
INSTANTIATE_TEST_CASE_P(AllNeighborsBatchMutualTestLow,
AllNeighborsTestF,
::testing::ValuesIn(mutualReachBatchLow));
INSTANTIATE_TEST_CASE_P(AllNeighborsBatchMutualTestMed,
AllNeighborsTestF,
::testing::ValuesIn(mutualReachBatchMed));
INSTANTIATE_TEST_CASE_P(AllNeighborsBatchMutualTestHigh,
AllNeighborsTestF,
::testing::ValuesIn(mutualReachBatch));
::testing::ValuesIn(mutualReachBatchHigh));
} // namespace cuvs::neighbors::all_neighbors
Loading