Merge branch 'branch-25.02' into use-cuda-bindings

rapidsai · Jan 23, 2025 · 37eb8cb · 37eb8cb
2 parents 3c65885 + bd7c69e
commit 37eb8cb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -47,7 +47,7 @@ dependencies:
 - nbsphinx
 - ninja
 - nltk
-- numba>=0.57
+- numba>=0.59.1,<0.61.0a0
 - numpy>=1.23,<3.0a0
 - numpydoc
 - nvcc_linux-64=11.8

diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -44,7 +44,7 @@ dependencies:
 - nbsphinx
 - ninja
 - nltk
-- numba>=0.57
+- numba>=0.59.1,<0.61.0a0
 - numpy>=1.23,<3.0a0
 - numpydoc
 - packaging

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -234,7 +234,7 @@ dependencies:
         packages:
           - dask-cuda==25.2.*,>=0.0.0a0
           - joblib>=0.11
-          - numba>=0.57
+          - numba>=0.59.1,<0.61.0a0
           - numpy>=1.23,<3.0a0
             # TODO: Is scipy really a hard dependency, or should
             # we make it optional (i.e. an extra for pip

diff --git a/python/cuml/cuml/tests/dask/test_dask_logistic_regression.py b/python/cuml/cuml/tests/dask/test_dask_logistic_regression.py
@@ -34,7 +34,12 @@
 dask_cudf = gpu_only_import("dask_cudf")
 cudf = gpu_only_import("cudf")
 
-pytestmark = pytest.mark.mg
+pytestmark = [
+    pytest.mark.mg,
+    pytest.mark.skip(
+        reason="pytest hang https://github.com/rapidsai/cuml/issues/6247"
+    ),
+]
 
 
 def _prep_training_data(c, X_train, y_train, partitions_per_worker):

diff --git a/python/cuml/pyproject.toml b/python/cuml/pyproject.toml
@@ -99,7 +99,7 @@ dependencies = [
     "dask-cuda==25.2.*,>=0.0.0a0",
     "dask-cudf==25.2.*,>=0.0.0a0",
     "joblib>=0.11",
-    "numba>=0.57",
+    "numba>=0.59.1,<0.61.0a0",
     "numpy>=1.23,<3.0a0",
     "nvidia-cublas",
     "nvidia-cufft",