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

Don't import torch_xla.debug for torch-xla<1.8 #10836

Merged
merged 11 commits into from
Dec 6, 2021
Merged

Don't import torch_xla.debug for torch-xla<1.8 #10836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
47bccec
Don't import torch_xla.debug for torch-xla<1.8
kaushikb11 Nov 30, 2021
96da995
Update changelog
kaushikb11 Nov 30, 2021
569380a
Add tests
kaushikb11 Nov 30, 2021
62464ce
Address reviews
kaushikb11 Nov 30, 2021
11cc1fd
merge master
awaelchli Dec 1, 2021
9f9fbbc
fix accidental _notebooks change
awaelchli Dec 1, 2021
04bc4d2
fix accidental _notebooks change
awaelchli Dec 1, 2021
2a5c3a3
Update tests
kaushikb11 Dec 1, 2021
9671b08
Merge branch 'master' into fix/dont_import_debug
kaushikb11 Dec 1, 2021
e8edfb6
Update test
kaushikb11 Dec 6, 2021
0d8ce30
Merge branch 'master' into fix/dont_import_debug
kaushikb11 Dec 6, 2021
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- Disabled batch_size extraction for torchmetric instances because they accumulate the metrics internally ([#10815](https://github.com/PyTorchLightning/pytorch-lightning/pull/10815))


- Fixed importing `torch_xla.debug` for `torch-xla<1.8` ([#10836](https://github.com/PyTorchLightning/pytorch-lightning/pull/10836))


- Fixed an issue to return the results for each dataloader separately instead of duplicating them for each ([#10810](https://github.com/PyTorchLightning/pytorch-lightning/pull/10810))


Expand Down
9 changes: 7 additions & 2 deletions pytorch_lightning/profiler/xla.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@
from typing import Dict

from pytorch_lightning.profiler.base import BaseProfiler
from pytorch_lightning.utilities import _TPU_AVAILABLE
from pytorch_lightning.utilities import _TORCH_GREATER_EQUAL_1_8, _TPU_AVAILABLE
from pytorch_lightning.utilities.exceptions import MisconfigurationException

if _TPU_AVAILABLE:
if _TPU_AVAILABLE and _TORCH_GREATER_EQUAL_1_8:
import torch_xla.debug.profiler as xp

log = logging.getLogger(__name__)
Expand All @@ -65,6 +66,10 @@ class XLAProfiler(BaseProfiler):
def __init__(self, port: int = 9012) -> None:
"""This Profiler will help you debug and optimize training workload performance for your models using Cloud
TPU performance tools."""
if not _TPU_AVAILABLE:
raise MisconfigurationException("`XLAProfiler` is only supported on TPUs")
if not _TORCH_GREATER_EQUAL_1_8:
raise MisconfigurationException("`XLAProfiler` is only supported with `torch-xla >= 1.8`")
super().__init__(dirpath=None, filename=None)
self.port = port
self._recording_map: Dict = {}
Expand Down
6 changes: 4 additions & 2 deletions tests/profiler/test_xla_profiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@

from pytorch_lightning import Trainer
from pytorch_lightning.profiler import XLAProfiler
from pytorch_lightning.utilities import _TPU_AVAILABLE
from pytorch_lightning.utilities import _TORCH_GREATER_EQUAL_1_8, _TPU_AVAILABLE
from tests.helpers import BoringModel
from tests.helpers.runif import RunIf

if _TPU_AVAILABLE:
import torch_xla.debug.profiler as xp
import torch_xla.utils.utils as xu

if _TORCH_GREATER_EQUAL_1_8:
import torch_xla.debug.profiler as xp


@RunIf(tpu=True)
def test_xla_profiler_instance(tmpdir):
Expand Down