Skip to content

Commit

Permalink
Merge pull request #2454 from rapidsai/branch-24.10
Browse files Browse the repository at this point in the history
Forward-merge branch-24.10 into branch-24.12
  • Loading branch information
GPUtester authored Sep 26, 2024
2 parents e6174f2 + 0f8b097 commit 4c4d9bc
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
4 changes: 3 additions & 1 deletion cpp/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,9 @@ if(BUILD_TESTS)
neighbors/ann_nn_descent/test_float_uint32_t.cu
neighbors/ann_nn_descent/test_int8_t_uint32_t.cu
neighbors/ann_nn_descent/test_uint8_t_uint32_t.cu
neighbors/ann_nn_descent/test_batch_float_uint32_t.cu
# TODO: Investigate why this test is failing Reference issue
# https://github.com/rapidsai/raft/issues/2450
# neighbors/ann_nn_descent/test_batch_float_uint32_t.cu
LIB
EXPLICIT_INSTANTIATE_ONLY
GPUS
Expand Down
18 changes: 10 additions & 8 deletions cpp/test/neighbors/ann_nn_descent.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -318,13 +318,15 @@ const std::vector<AnnNNDescentInputs> inputs = raft::util::itertools::product<An
{false, true},
{0.90});

const std::vector<AnnNNDescentBatchInputs> inputsBatch =
raft::util::itertools::product<AnnNNDescentBatchInputs>(
{std::make_pair(0.9, 3lu), std::make_pair(0.9, 2lu)}, // min_recall, n_clusters
{4000, 5000}, // n_rows
{192, 512}, // dim
{32, 64}, // graph_degree
{raft::distance::DistanceType::L2Expanded},
{false, true});
// TODO: Investigate why this test is failing
// Reference issue https://github.com/rapidsai/raft/issues/2450
// const std::vector<AnnNNDescentBatchInputs> inputsBatch =
// raft::util::itertools::product<AnnNNDescentBatchInputs>(
// {std::make_pair(0.9, 3lu), std::make_pair(0.9, 2lu)}, // min_recall, n_clusters
// {4000, 5000}, // n_rows
// {192, 512}, // dim
// {32, 64}, // graph_degree
// {raft::distance::DistanceType::L2Expanded},
// {false, true});

} // namespace raft::neighbors::experimental::nn_descent

0 comments on commit 4c4d9bc

Please sign in to comment.