-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Add conditional replacement of @torch.inference_mode for inference on AMD DirectML GPUs
#3295
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
9 commits
Select commit
Hold shift + click to select a range
af2a079
Add conditional no_grad decorator for AMD DirectML GPUs.
deruyter92 5c52ede
Update comment
deruyter92 6ae4829
update naming: `_no_grad_decorator` -> `_inference_mode_decorator`
deruyter92 880394b
Add pytest for directml conditional no_grad inference mode
deruyter92 03ac5a0
update pyproject.toml and uv.lock: add importlib to `dev` dependencies
deruyter92 199501c
Update deeplabcut/pose_estimation_pytorch/runners/inference.py
deruyter92 a4d29d8
restore pyproject.toml and uv.lock (no changes needed)
deruyter92 4c1bdb1
add error-hint (using contextmanager) for directml-related runtime error
deruyter92 662555f
add note in TechHardware.md for DirectML inference troubleshooting
deruyter92 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
67 changes: 67 additions & 0 deletions
67
tests/pose_estimation_pytorch/runners/test_inference_directml_no_grad.py
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 |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| # | ||
| # DeepLabCut Toolbox (deeplabcut.org) | ||
| # © A. & M.W. Mathis Labs | ||
| # https://github.com/DeepLabCut/DeepLabCut | ||
| # | ||
| # Please see AUTHORS for contributors. | ||
| # https://github.com/DeepLabCut/DeepLabCut/blob/main/AUTHORS | ||
| # | ||
| # Licensed under GNU Lesser General Public License v3.0 | ||
| # | ||
| """Tests DLC_DIRECTML_NO_GRAD toggles inference_mode vs no_grad (AMD DirectML).""" | ||
|
|
||
| from __future__ import annotations | ||
|
|
||
| import importlib | ||
| import os | ||
| from unittest.mock import Mock | ||
|
|
||
| import numpy as np | ||
| import pytest | ||
| import torch | ||
|
|
||
| import deeplabcut.pose_estimation_pytorch.runners.inference as inference | ||
|
|
||
|
|
||
| def _reload_with_env(env_value: str | None): | ||
| if env_value is None: | ||
| os.environ.pop("DLC_DIRECTML_NO_GRAD", None) | ||
| else: | ||
| os.environ["DLC_DIRECTML_NO_GRAD"] = env_value | ||
| importlib.reload(inference) | ||
|
|
||
|
|
||
| @pytest.fixture(autouse=True) | ||
| def _restore_env(): | ||
| yield | ||
| _reload_with_env(None) # always restore defaults after each test | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| ("env_value", "directml_no_grad"), | ||
| [(None, False), ("false", False), ("true", True)], | ||
| ) | ||
| def test_directml_no_grad_env(env_value, directml_no_grad): | ||
| """env var sets _directml_no_grad and selects the correct torch grad context.""" | ||
| _reload_with_env(env_value) | ||
| assert inference._directml_no_grad is directml_no_grad | ||
|
|
||
| class _SniffRunner(inference.InferenceRunner): | ||
| def __init__(self): | ||
| super().__init__( | ||
| model=Mock(), | ||
| batch_size=1, | ||
| inference_cfg=inference.InferenceConfig( | ||
| multithreading=inference.MultithreadingConfig(enabled=False), | ||
| ), | ||
| ) | ||
| self.saw_inference_mode: bool | None = None | ||
|
|
||
| def predict(self, inputs: torch.Tensor, **kwargs): | ||
| self.saw_inference_mode = torch.is_inference_mode_enabled() | ||
| return [{"mock": {"poses": np.zeros((1,), dtype=np.float32)}}] | ||
|
|
||
| runner = _SniffRunner() | ||
| runner.inference([np.zeros((1, 3, 8, 8), dtype=np.float32)]) | ||
|
|
||
| assert runner.saw_inference_mode is not directml_no_grad |
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.