-
Notifications
You must be signed in to change notification settings - Fork 255
Improve optional CUDA module import handling for NVVM and nvJitLink #1733
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ import threading | |
| from warnings import warn | ||
|
|
||
| from cuda.bindings import driver, nvrtc | ||
| from cuda.pathfinder import optional_cuda_import | ||
|
|
||
| from libcpp.vector cimport vector | ||
|
|
||
|
|
@@ -461,8 +462,8 @@ class ProgramOptions: | |
| # ============================================================================= | ||
|
|
||
| # Module-level state for NVVM lazy loading | ||
| cdef object_nvvm_module = None | ||
| cdef bint _nvvm_import_attempted = False | ||
| _nvvm_module = None | ||
| _nvvm_import_attempted = False | ||
|
Comment on lines
464
to
+466
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Making them |
||
|
|
||
|
|
||
| def _get_nvvm_module(): | ||
|
|
@@ -484,18 +485,21 @@ def _get_nvvm_module(): | |
| "Please update cuda-bindings to use NVVM features." | ||
| ) | ||
|
|
||
| from cuda.bindings import nvvm | ||
| from cuda.bindings._internal.nvvm import _inspect_function_pointer | ||
|
|
||
| if _inspect_function_pointer("__nvvmCreateProgram") == 0: | ||
| raise RuntimeError("NVVM library (libnvvm) is not available in this Python environment. ") | ||
| nvvm = optional_cuda_import( | ||
| "cuda.bindings.nvvm", | ||
| probe_function=lambda module: module.version(), # probe triggers libnvvm load | ||
| ) | ||
| if nvvm is None: | ||
| raise RuntimeError( | ||
| "NVVM support is unavailable: cuda.bindings.nvvm is missing or libnvvm cannot be loaded." | ||
| ) | ||
|
|
||
| _nvvm_module = nvvm | ||
| return _nvvm_module | ||
|
|
||
| except RuntimeError as e: | ||
| except RuntimeError: | ||
| _nvvm_module = None | ||
| raise e | ||
| raise | ||
|
|
||
| def _find_libdevice_path(): | ||
| """Find libdevice*.bc for NVVM compilation using cuda.pathfinder.""" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.