Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace custom CUDA bindings previously provided by RMM with official CUDA Python bindings #10008

Merged
merged 3 commits into from
Jan 20, 2022
Merged

Replace custom CUDA bindings previously provided by RMM with official CUDA Python bindings #10008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86f00a3
Replace custom CUDA bindings previously provided by RMM with official…
shwina Jan 10, 2022
2454435
Unused import
shwina Jan 11, 2022
206535d
Add cuda-python as explicit dependency.
shwina Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions conda/environments/cudf_dev_cuda11.5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ dependencies:
- ipython
- pandoc=<2.0.0
- cudatoolkit=11.5
- cuda-python >=11.5,<12.0
- pip
- flake8=3.8.3
- black=19.10
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cudf/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ requirements:
- packaging
- cachetools
- ptxcompiler # [linux64] # CUDA enhanced compatibility. See https://github.com/rapidsai/ptxcompiler

- cuda-python >=11.5,<12.0
test: # [linux64]
requires: # [linux64]
- cudatoolkit {{ cuda_version }}.* # [linux64]
Expand Down
42 changes: 20 additions & 22 deletions python/cudf/cudf/utils/gpu_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ def validate_setup():

import warnings

from cuda.cudart import cudaDeviceAttr, cudaError_t

from rmm._cuda.gpu import (
CUDARuntimeError,
cudaDeviceAttr,
cudaError,
deviceGetName,
driverGetVersion,
getDeviceAttribute,
Expand All @@ -30,30 +30,30 @@ def _try_get_old_or_new_symbols():
try:
# CUDA 10.2+ symbols
return [
cudaError.cudaErrorDeviceUninitialized,
cudaError.cudaErrorTimeout,
cudaError_t.cudaErrorDeviceUninitialized,
cudaError_t.cudaErrorTimeout,
]
except AttributeError:
# CUDA 10.1 symbols
return [cudaError.cudaErrorDeviceUninitilialized]
return [cudaError_t.cudaErrorDeviceUninitilialized]

notify_caller_errors = {
cudaError.cudaErrorInitializationError,
cudaError.cudaErrorInsufficientDriver,
cudaError.cudaErrorInvalidDeviceFunction,
cudaError.cudaErrorInvalidDevice,
cudaError.cudaErrorStartupFailure,
cudaError.cudaErrorInvalidKernelImage,
cudaError.cudaErrorAlreadyAcquired,
cudaError.cudaErrorOperatingSystem,
cudaError.cudaErrorNotPermitted,
cudaError.cudaErrorNotSupported,
cudaError.cudaErrorSystemNotReady,
cudaError.cudaErrorSystemDriverMismatch,
cudaError.cudaErrorCompatNotSupportedOnDevice,
cudaError_t.cudaErrorInitializationError,
cudaError_t.cudaErrorInsufficientDriver,
cudaError_t.cudaErrorInvalidDeviceFunction,
cudaError_t.cudaErrorInvalidDevice,
cudaError_t.cudaErrorStartupFailure,
cudaError_t.cudaErrorInvalidKernelImage,
cudaError_t.cudaErrorAlreadyAcquired,
cudaError_t.cudaErrorOperatingSystem,
cudaError_t.cudaErrorNotPermitted,
cudaError_t.cudaErrorNotSupported,
cudaError_t.cudaErrorSystemNotReady,
cudaError_t.cudaErrorSystemDriverMismatch,
cudaError_t.cudaErrorCompatNotSupportedOnDevice,
*_try_get_old_or_new_symbols(),
vyasr marked this conversation as resolved.
Show resolved Hide resolved
cudaError.cudaErrorUnknown,
cudaError.cudaErrorApiFailureBase,
cudaError_t.cudaErrorUnknown,
cudaError_t.cudaErrorApiFailureBase,
}

try:
Expand All @@ -68,8 +68,6 @@ def _try_get_old_or_new_symbols():
# Cupy throws RunTimeException to get GPU count,
# hence obtaining GPU count by in-house cpp api above

# 75 - Indicates to get "cudaDevAttrComputeCapabilityMajor" attribute
# 0 - Get GPU 0
major_version = getDeviceAttribute(
cudaDeviceAttr.cudaDevAttrComputeCapabilityMajor, 0
)
Expand Down