From 467a674f152f5b3894acdf4f42fd8774b17471d8 Mon Sep 17 00:00:00 2001 From: Joseph Nke <76006812+jnke2016@users.noreply.github.com> Date: Wed, 6 Jul 2022 10:07:09 -0500 Subject: [PATCH 1/2] pin cuda-python max version to 11.7.0 (#2389) Pin max version of `cuda-python` to 11.7.0 Authors: - Joseph Nke (https://github.com/jnke2016) Approvers: - Ray Douglass (https://github.com/raydouglass) --- conda/environments/cugraph_dev_cuda11.2.yml | 2 +- conda/environments/cugraph_dev_cuda11.4.yml | 2 +- conda/environments/cugraph_dev_cuda11.5.yml | 2 +- conda/recipes/cugraph/meta.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conda/environments/cugraph_dev_cuda11.2.yml b/conda/environments/cugraph_dev_cuda11.2.yml index 0910adb29c4..de00a16e67d 100644 --- 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 index 9662c454c1c..32988dba2cb 100644 --- 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 index 55de007b81c..2c15e4be172 100644 --- 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 index 860f9f4bc4e..11fc3f2861a 100644 --- 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] From 76800bc768c5757869314ec1928b01ec49f32ee1 Mon Sep 17 00:00:00 2001 From: Rick Ratzel <3039903+rlratzel@users.noreply.github.com> Date: Tue, 12 Jul 2022 12:27:32 -0400 Subject: [PATCH 2/2] [HOTFIX] Generalize ModuleNotFoundError exception handling to ImportError for Amazon SMS libnuma.so.1 bug (#2385) Generalize ModuleNotFoundError exception handling to ImportError for Amazon SMS libnuma.so.1 bug https://github.com/rapidsai/cugraph/issues/2113 This allows cugraph to be imported in a SageMaker environment without having to remove `ucx-py` Authors: - Dylan Chima-Sanchez (https://github.com/betochimas) - Rick Ratzel (https://github.com/rlratzel) Approvers: - Brad Rees (https://github.com/BradReesWork) --- conda/recipes/libcugraph/meta.yaml | 2 +- python/cugraph/cugraph/dask/common/input_utils.py | 6 ++++-- python/cugraph/cugraph/dask/common/mg_utils.py | 6 ++++-- python/cugraph/cugraph/dask/comms/comms.py | 6 ++++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml index 76bed2d0517..e56fd9bed6e 100644 --- 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 index ca2b45a0a26..9db3964c021 100644 --- 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 index 4ac472e36e5..99d80b3c659 100644 --- 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 index 4837628dec6..c1f3ac304d5 100644 --- 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: