Merge cb42a67 into 20a6d54

rapidsai · Jan 19, 2022 · 45ba02e · 45ba02e
2 parents 20a6d54 + cb42a67
commit 45ba02e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/conda/environments/cugraph_dev_cuda11.0.yml b/conda/environments/cugraph_dev_cuda11.0.yml
@@ -10,6 +10,7 @@ dependencies:
 - libcudf=22.02.*
 - rmm=22.02.*
 - librmm=22.02.*
+- cuda-python>=11.5,<12.0
 - dask>=2021.09.1
 - distributed>=2021.09.1
 - dask-cuda=22.02.*

diff --git a/conda/environments/cugraph_dev_cuda11.2.yml b/conda/environments/cugraph_dev_cuda11.2.yml
@@ -10,6 +10,7 @@ dependencies:
 - libcudf=22.02.*
 - rmm=22.02.*
 - librmm=22.02.*
+- cuda-python>=11.5,<12.0
 - dask>=2021.09.1
 - distributed>=2021.09.1
 - dask-cuda=22.02.*

diff --git a/conda/environments/cugraph_dev_cuda11.4.yml b/conda/environments/cugraph_dev_cuda11.4.yml
@@ -10,6 +10,7 @@ dependencies:
 - libcudf=22.02.*
 - rmm=22.02.*
 - librmm=22.02.*
+- cuda-python>=11.5,<12.0
 - dask>=2021.09.1
 - distributed>=2021.09.1
 - dask-cuda=22.02.*

diff --git a/conda/environments/cugraph_dev_cuda11.5.yml b/conda/environments/cugraph_dev_cuda11.5.yml
@@ -10,6 +10,7 @@ dependencies:
 - libcudf=22.02.*
 - rmm=22.02.*
 - librmm=22.02.*
+- cuda-python>=11.5,<12.0
 - dask>=2021.09.1
 - distributed>=2021.09.1
 - dask-cuda=22.02.*

diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml
@@ -44,6 +44,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
 
 tests:                                 # [linux64]
   requirements:                        # [linux64]

diff --git a/python/cugraph/cugraph/utilities/utils.py b/python/cugraph/cugraph/utilities/utils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021, NVIDIA CORPORATION.
+# Copyright (c) 2020-2022, NVIDIA CORPORATION.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -16,10 +16,9 @@
 from numba import cuda
 
 import cudf
-from rmm._cuda.gpu import (
-    getDeviceAttribute,
-    cudaDeviceAttr,
-)
+
+from cuda.cudart import cudaDeviceAttr
+from rmm._cuda.gpu import getDeviceAttribute
 
 
 # optional dependencies