Merge branch 'branch-24.10' into update-nccl

rapidsai · Sep 26, 2024 · 2bbdfbc · 2bbdfbc
2 parents 5c8ec71 + 0f8b097
commit 2bbdfbc
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 11 deletions.
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -25,8 +25,8 @@ NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR}
 NEXT_UCXX_SHORT_TAG="$(curl -sL https://version.gpuci.io/rapids/${NEXT_SHORT_TAG})"
 
 # Need to distutils-normalize the original version
-NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))")
-NEXT_UCXX_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_UCXX_SHORT_TAG}'))")
+NEXT_SHORT_TAG_PEP440=$(python -c "from packaging.version import Version; print(Version('${NEXT_SHORT_TAG}'))")
+NEXT_UCXX_SHORT_TAG_PEP440=$(python -c "from packaging.version import Version; print(Version('${NEXT_UCXX_SHORT_TAG}'))")
 
 echo "Preparing release $CURRENT_TAG => $NEXT_FULL_TAG"
 

diff --git a/cpp/test/CMakeLists.txt b/cpp/test/CMakeLists.txt
@@ -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

diff --git a/cpp/test/neighbors/ann_nn_descent.cuh b/cpp/test/neighbors/ann_nn_descent.cuh
@@ -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
diff --git a/python/pylibraft/pylibraft/test/pytest.ini b/python/pylibraft/pylibraft/test/pytest.ini
@@ -0,0 +1,5 @@
+# Copyright (c) 2024, NVIDIA CORPORATION.
+
+[pytest]
+addopts = --tb=native
+
diff --git a/python/raft-dask/pytest.ini b/python/raft-dask/pytest.ini
@@ -10,3 +10,4 @@ markers =
   nccl: marks a test as using NCCL
   ucx: marks a test as using UCX-Py
   ucxx: marks a test as using UCXX
+addopts = --tb=native
diff --git a/python/raft-dask/raft_dask/test/pytest.ini b/python/raft-dask/raft_dask/test/pytest.ini
@@ -0,0 +1,5 @@
+# Copyright (c) 2024, NVIDIA CORPORATION.
+
+[pytest]
+addopts = --tb=native
+