Merge pull request #2403 from rapidsai/branch-22.06

[RELEASE] v22.06.01
rapidsai · Jul 12, 2022 · 2076eae · 2076eae
2 parents fb99d2d + 76800bc
commit 2076eae
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/conda/environments/cugraph_dev_cuda11.2.yml b/conda/environments/cugraph_dev_cuda11.2.yml
@@ -13,7 +13,7 @@ dependencies:
 - librmm=22.06.*
 - libraft-headers=22.06.*
 - pyraft=22.06.*
-- cuda-python>=11.5,<12.0
+- cuda-python>=11.5,<11.7.1
 - dask==2022.05.2
 - distributed==2022.05.2
 - dask-cuda=22.06.*

diff --git a/conda/environments/cugraph_dev_cuda11.4.yml b/conda/environments/cugraph_dev_cuda11.4.yml
@@ -13,7 +13,7 @@ dependencies:
 - librmm=22.06.*
 - libraft-headers=22.06.*
 - pyraft=22.06.*
-- cuda-python>=11.5,<12.0
+- cuda-python>=11.5,<11.7.1
 - dask==2022.05.2
 - distributed==2022.05.2
 - dask-cuda=22.06.*

diff --git a/conda/environments/cugraph_dev_cuda11.5.yml b/conda/environments/cugraph_dev_cuda11.5.yml
@@ -13,7 +13,7 @@ dependencies:
 - librmm=22.06.*
 - libraft-headers=22.06.*
 - pyraft=22.06.*
-- cuda-python>=11.5,<12.0
+- cuda-python>=11.5,<11.7.1
 - dask==2022.05.2
 - distributed==2022.05.2
 - dask-cuda=22.06.*

diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml
@@ -54,7 +54,7 @@ requirements:
     - ucx-py {{ ucx_py_version }}
     - ucx-proc=*=gpu
     - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
-    - cuda-python >=11.5,<12.0
+    - cuda-python >=11.5,<11.7.1
 
 tests:                                 # [linux64]
   requirements:                        # [linux64]

diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml
@@ -41,7 +41,7 @@ requirements:
     - libraft-headers {{ minor_version }}.*
     - libcugraphops {{ minor_version }}.*
     - librmm {{ minor_version }}.*
-    - cudf {{ minor_version }}.*
+    - libcudf {{ minor_version }}.*
     - boost-cpp {{ boost_cpp_version }}
     - nccl {{ nccl_version }}
     - ucx-proc=*=gpu

diff --git a/python/cugraph/cugraph/dask/common/input_utils.py b/python/cugraph/cugraph/dask/common/input_utils.py
@@ -25,8 +25,10 @@
 from cugraph.dask.common.read_utils import MissingUCXPy
 try:
     from raft.dask.common.utils import get_client
-except ModuleNotFoundError as err:
-    if err.name == "ucp":
+except ImportError as err:
+    # FIXME: Generalize since err.name is arr when
+    # libnuma.so.1 is not available
+    if err.name == "ucp" or err.name == "arr":
         get_client = MissingUCXPy()
     else:
         raise

diff --git a/python/cugraph/cugraph/dask/common/mg_utils.py b/python/cugraph/cugraph/dask/common/mg_utils.py
@@ -23,8 +23,10 @@
 from cugraph.dask.common.read_utils import MissingUCXPy
 try:
     from raft.dask.common.utils import default_client
-except ModuleNotFoundError as err:
-    if err.name == "ucp":
+except ImportError as err:
+    # FIXME: Generalize since err.name is arr when
+    # libnuma.so.1 is not available
+    if err.name == "ucp" or err.name == "arr":
         default_client = MissingUCXPy()
     else:
         raise

diff --git a/python/cugraph/cugraph/dask/comms/comms.py b/python/cugraph/cugraph/dask/comms/comms.py
@@ -17,8 +17,10 @@
 try:
     from raft.dask.common.comms import Comms as raftComms
     from raft.dask.common.comms import get_raft_comm_state
-except ModuleNotFoundError as err:
-    if err.name == "ucp":
+except ImportError as err:
+    # FIXME: Generalize since err.name is arr when
+    # libnuma.so.1 is not available
+    if err.name == "ucp" or err.name == "arr":
         raftComms = MissingUCXPy()
         get_raft_comm_state = MissingUCXPy()
     else: