Skip to content

Commit 4e24834

Browse files
committed
Merge branch 'dep_mon' of github.com:daniellepintz/pytorch-lightning into dep_mon
2 parents d07b9da + d300849 commit 4e24834

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

pytorch_lightning/callbacks/gpu_stats_monitor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import pytorch_lightning as pl
3131
from pytorch_lightning.callbacks.base import Callback
32-
from pytorch_lightning.utilities import DeviceType, rank_zero_only, rank_zero_deprecation
32+
from pytorch_lightning.utilities import DeviceType, rank_zero_deprecation, rank_zero_only
3333
from pytorch_lightning.utilities.exceptions import MisconfigurationException
3434
from pytorch_lightning.utilities.parsing import AttributeDict
3535
from pytorch_lightning.utilities.types import STEP_OUTPUT

pytorch_lightning/callbacks/xla_stats_monitor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import time
2222

2323
from pytorch_lightning.callbacks.base import Callback
24-
from pytorch_lightning.utilities import _TPU_AVAILABLE, DeviceType, rank_zero_info, rank_zero_deprecation
24+
from pytorch_lightning.utilities import _TPU_AVAILABLE, DeviceType, rank_zero_deprecation, rank_zero_info
2525
from pytorch_lightning.utilities.exceptions import MisconfigurationException
2626

2727
if _TPU_AVAILABLE:

tests/deprecated_api/test_remove_1-7.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
import torch
1919

2020
from pytorch_lightning import Callback, LightningDataModule, Trainer
21-
from pytorch_lightning.callbacks.xla_stats_monitor import GPUStatsMonitor
22-
from pytorch_lightning.callbacks.xla_stats_monitor import XLAStatsMonitor
21+
from pytorch_lightning.callbacks.xla_stats_monitor import GPUStatsMonitor, XLAStatsMonitor
2322
from pytorch_lightning.loggers import LoggerCollection, TestTubeLogger
2423
from tests.deprecated_api import _soft_unimport_module
2524
from tests.helpers import BoringModel

0 commit comments

Comments
 (0)