Skip to content

Commit 96a2825

Browse files
committed
Revert "refactor and add types"
This reverts commit b4c552f
1 parent c59a1b8 commit 96a2825

21 files changed

+21
-38
lines changed

pytorch_lightning/core/lightning.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from pytorch_lightning.core.memory import ModelSummary
2121
from pytorch_lightning.core.saving import ModelIO, load_hparams_from_tags_csv
2222
from pytorch_lightning.overrides.data_parallel import LightningDistributedDataParallel
23-
from pytorch_lightning.debugging import MisconfigurationException
23+
from pytorch_lightning.utilities.exceptions import MisconfigurationException
2424

2525
try:
2626
import torch_xla.core.xla_model as xm

pytorch_lightning/loggers/comet.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
from pytorch_lightning import _logger as log
3030
from pytorch_lightning.loggers.base import LightningLoggerBase, rank_zero_only
31-
from pytorch_lightning.debugging import MisconfigurationException
31+
from pytorch_lightning.utilities.exceptions import MisconfigurationException
3232

3333

3434
class CometLogger(LightningLoggerBase):

pytorch_lightning/profiler/__init__.py

-13
This file was deleted.

pytorch_lightning/debugging/__init__.py pytorch_lightning/profiling/__init__.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,9 @@ def custom_processing_step(self, data):
113113
114114
"""
115115

116-
from pytorch_lightning.debugging.exceptions import MisconfigurationException
117-
from pytorch_lightning.debugging.profilers import BaseProfiler, Profiler, AdvancedProfiler, PassThroughProfiler
116+
from pytorch_lightning.profiling.profilers import Profiler, AdvancedProfiler, PassThroughProfiler, BaseProfiler
118117

119118
__all__ = [
120-
'MisconfigurationException',
121119
'BaseProfiler',
122120
'Profiler',
123121
'AdvancedProfiler',

pytorch_lightning/trainer/__init__.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -612,15 +612,15 @@ def on_train_end(self):
612612
# default used by the Trainer
613613
trainer = Trainer(process_position=0)
614614
615-
profiler
616-
^^^^^^^^
615+
profiling
616+
^^^^^^^^^
617617
To profile individual steps during training and assist in identifying bottlenecks.
618618
619619
See the `profiler documentation <profiler.rst>`_. for more details.
620620
621621
Example::
622622
623-
from pytorch_lightning.profiler import Profiler, AdvancedProfiler
623+
from pytorch_lightning.profiling import Profiler, AdvancedProfiler
624624
625625
# default used by the Trainer
626626
trainer = Trainer(profiler=None)

pytorch_lightning/trainer/data_loading.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from torch.utils.data.distributed import DistributedSampler
77

88
from pytorch_lightning.core import LightningModule
9-
from pytorch_lightning.debugging import MisconfigurationException
9+
from pytorch_lightning.utilities.exceptions import MisconfigurationException
1010

1111
try:
1212
from apex import amp

pytorch_lightning/trainer/distrib_data_parallel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def train_fx(trial_hparams, cluster_manager, _):
122122
import torch
123123
from pytorch_lightning import _logger as log
124124
from pytorch_lightning.loggers import LightningLoggerBase
125-
from pytorch_lightning.debugging import MisconfigurationException
125+
from pytorch_lightning.utilities.exceptions import MisconfigurationException
126126

127127
try:
128128
from apex import amp

pytorch_lightning/trainer/distrib_parts.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@
344344
LightningDistributedDataParallel,
345345
LightningDataParallel,
346346
)
347-
from pytorch_lightning.debugging import MisconfigurationException
347+
from pytorch_lightning.utilities.exceptions import MisconfigurationException
348348

349349
try:
350350
from apex import amp

pytorch_lightning/trainer/evaluation_loop.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135

136136
from pytorch_lightning.core.lightning import LightningModule
137137
from pytorch_lightning.overrides.data_parallel import LightningDistributedDataParallel, LightningDataParallel
138-
from pytorch_lightning.debugging import MisconfigurationException
138+
from pytorch_lightning.utilities.exceptions import MisconfigurationException
139139

140140
try:
141141
import torch_xla.distributed.parallel_loader as xla_pl

pytorch_lightning/trainer/trainer.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
from pytorch_lightning import _logger as log
1818
from pytorch_lightning.callbacks import ModelCheckpoint, EarlyStopping, Callback
1919
from pytorch_lightning.core.lightning import LightningModule
20-
from pytorch_lightning.debugging import BaseProfiler, Profiler, PassThroughProfiler
2120
from pytorch_lightning.loggers import LightningLoggerBase
21+
from pytorch_lightning.profiling import Profiler, PassThroughProfiler, BaseProfiler
2222
from pytorch_lightning.trainer.auto_mix_precision import TrainerAMPMixin
2323
from pytorch_lightning.trainer.callback_config import TrainerCallbackConfigMixin
2424
from pytorch_lightning.trainer.callback_hook import TrainerCallbackHookMixin
@@ -32,7 +32,7 @@
3232
from pytorch_lightning.trainer.training_io import TrainerIOMixin
3333
from pytorch_lightning.trainer.training_loop import TrainerTrainLoopMixin
3434
from pytorch_lightning.trainer.training_tricks import TrainerTrainingTricksMixin
35-
from pytorch_lightning.debugging import MisconfigurationException
35+
from pytorch_lightning.utilities.exceptions import MisconfigurationException
3636

3737
try:
3838
from apex import amp

pytorch_lightning/trainer/training_loop.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ def training_step(self, batch, batch_idx):
145145
from pytorch_lightning.callbacks.base import Callback
146146
from pytorch_lightning.core.lightning import LightningModule
147147
from pytorch_lightning.loggers import LightningLoggerBase
148-
from pytorch_lightning.debugging import MisconfigurationException
148+
from pytorch_lightning.utilities.exceptions import MisconfigurationException
149149

150150
try:
151151
from apex import amp

tests/loggers/test_comet.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import tests.base.utils as tutils
99
from pytorch_lightning import Trainer
1010
from pytorch_lightning.loggers import CometLogger
11-
from pytorch_lightning.debugging import MisconfigurationException
11+
from pytorch_lightning.utilities.exceptions import MisconfigurationException
1212
from tests.base import LightningTestModel
1313

1414

tests/models/test_amp.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import tests.base.utils as tutils
66
from pytorch_lightning import Trainer
7-
from pytorch_lightning.debugging import MisconfigurationException
7+
from pytorch_lightning.utilities.exceptions import MisconfigurationException
88
from tests.base import (
99
LightningTestModel,
1010
)

tests/models/test_gpu.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
parse_gpu_ids,
1212
determine_root_gpu_device,
1313
)
14-
from pytorch_lightning.debugging import MisconfigurationException
14+
from pytorch_lightning.utilities.exceptions import MisconfigurationException
1515
from tests.base import LightningTestModel
1616

1717
PRETEND_N_OF_GPUS = 16

tests/models/test_restore.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import tests.base.utils as tutils
99
from pytorch_lightning import Trainer
1010
from pytorch_lightning.callbacks import ModelCheckpoint
11-
from pytorch_lightning.debugging import MisconfigurationException
11+
from pytorch_lightning.utilities.exceptions import MisconfigurationException
1212
from tests.base import (
1313
LightningTestModel,
1414
LightningTestModelWithoutHyperparametersArg,

tests/test_deprecated.py

-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ def test_tbd_remove_in_v0_9_0_module_imports():
5757
from pytorch_lightning.logging.test_tube import TestTubeLogger # noqa: F402
5858
from pytorch_lightning.logging.wandb import WandbLogger # noqa: F402
5959

60-
from pytorch_lightning.profiler import Profiler, AdvancedProfiler # noqa: F402
61-
6260

6361
class ModelVer0_6(LightTrainDataloader, LightEmptyTestStep, TestModelBase):
6462

tests/test_profiler.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import tempfile
12
import time
23
from pathlib import Path
34

45
import numpy as np
56
import pytest
6-
7-
from pytorch_lightning.debugging import AdvancedProfiler, Profiler
7+
from pytorch_lightning.profiling import AdvancedProfiler, Profiler
88

99
PROFILER_OVERHEAD_MAX_TOLERANCE = 0.0001
1010

tests/trainer/test_dataloaders.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import tests.base.utils as tutils
44
from pytorch_lightning import Trainer
5-
from pytorch_lightning.debugging import MisconfigurationException
5+
from pytorch_lightning.utilities.exceptions import MisconfigurationException
66
from tests.base import (
77
TestModelBase,
88
LightningTestModel,

tests/trainer/test_trainer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
)
1515
from pytorch_lightning.core.lightning import load_hparams_from_tags_csv
1616
from pytorch_lightning.trainer.logging import TrainerLoggingMixin
17-
from pytorch_lightning.debugging import MisconfigurationException
17+
from pytorch_lightning.utilities.exceptions import MisconfigurationException
1818
from tests.base import (
1919
TestModelBase,
2020
DictHparamsModel,

0 commit comments

Comments
 (0)