Merge pull request rapidsai#2436 from rlratzel/branch-22.08-merge-22.06

Branch 22.08 merge 22.06
oorliu · Jul 21, 2022 · e9e48c8 · e9e48c8
2 parents f09c298 + c9c9343
commit e9e48c8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
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: