-
Notifications
You must be signed in to change notification settings - Fork 321
fix(core): make cuda.core.system actually fall back when NVML is unimportable #2574
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
Open
LeSingh1
wants to merge
1
commit into
NVIDIA:main
Choose a base branch
from
LeSingh1:system-nvml-fallback
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+59
−2
Open
Changes from all commits
Commits
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
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -47,11 +47,17 @@ else: | |||||||
| if CUDA_BINDINGS_NVML_IS_COMPATIBLE: | ||||||||
| try: | ||||||||
| from cuda.bindings import nvml | ||||||||
| # _nvml_context imports cuda.bindings.nvml itself, so it has to be | ||||||||
| # inside the same try: importing it after nvml failed would raise the | ||||||||
| # very ImportError this block exists to absorb. | ||||||||
| from cuda.core.system._nvml_context import initialize | ||||||||
| except ImportError: | ||||||||
| CUDA_BINDINGS_NVML_IS_COMPATIBLE = False | ||||||||
|
|
||||||||
| from cuda.core.system._nvml_context import initialize | ||||||||
| else: | ||||||||
| # Deliberately a second `if`, not an `else` on the one above: the flag can be | ||||||||
| # cleared by the import that just failed, and the non-NVML fallbacks are | ||||||||
| # exactly what every consumer below reaches for once it is False. | ||||||||
|
Comment on lines
+57
to
+59
Contributor
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.
Suggested change
|
||||||||
| if not CUDA_BINDINGS_NVML_IS_COMPATIBLE: | ||||||||
| from cuda.core._utils.cuda_utils import driver, handle_return, runtime | ||||||||
|
|
||||||||
|
|
||||||||
|
|
||||||||
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 | ||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -73,6 +73,14 @@ Fixes and enhancements | |||||||||||||||||||
| Windows, both ``ctypes.CFUNCTYPE`` and ``ctypes.WINFUNCTYPE`` are accepted. | ||||||||||||||||||||
| (`#2439 <https://github.com/NVIDIA/cuda-python/issues/2439>`__) | ||||||||||||||||||||
|
|
||||||||||||||||||||
| - ``cuda.core.system`` now really does fall back to its non-NVML | ||||||||||||||||||||
| implementations when ``cuda.bindings.nvml`` cannot be imported. The | ||||||||||||||||||||
| ``except ImportError`` cleared ``CUDA_BINDINGS_NVML_IS_COMPATIBLE``, but the | ||||||||||||||||||||
| ``else`` that binds ``driver`` / ``handle_return`` / ``runtime`` hung off the | ||||||||||||||||||||
| outer ``if``, which had already been evaluated, and the unconditional | ||||||||||||||||||||
| ``_nvml_context`` import that followed pulls in ``cuda.bindings.nvml`` | ||||||||||||||||||||
| itself -- so ``import cuda.core.system`` raised instead of degrading. | ||||||||||||||||||||
|
Comment on lines
+76
to
+82
Contributor
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. Release notes should be to-the-point and not go into implementation details.
Suggested change
|
||||||||||||||||||||
|
|
||||||||||||||||||||
| Deprecation Notices | ||||||||||||||||||||
| ------------------- | ||||||||||||||||||||
|
|
||||||||||||||||||||
|
|
||||||||||||||||||||
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.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.