update lightning version to v1.2.2

remove unneccessary import Update CHANGELOG resolve a bug remove print resolve bug fix pep8 issues
Lightning-AI · Mar 5, 2021 · 9f3ef1b · 9f3ef1b
1 parent c5e9d67
commit 9f3ef1b
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,41 +9,20 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ### Added
 
-
 - Added `checkpoint` parameter to callback's `on_save_checkpoint` hook ([#6072](https://github.com/PyTorchLightning/pytorch-lightning/pull/6072))
 
-
 ### Changed
 
 - Changed the order of `backward`, `step`, `zero_grad` to `zero_grad`, `backward`, `step` ([#6147](https://github.com/PyTorchLightning/pytorch-lightning/pull/6147))
-
-
 - Changed default for DeepSpeed CPU Offload to False, due to prohibitively slow speeds at smaller scale ([#6262](https://github.com/PyTorchLightning/pytorch-lightning/pull/6262))
 
-
-### Deprecated
-
-
-### Removed
-
-
 ### Fixed
 
 - Fixed epoch level schedulers not being called when `val_check_interval < 1.0` ([#6075](https://github.com/PyTorchLightning/pytorch-lightning/pull/6075))
-
-
 - Fixed multiple early stopping callbacks ([#6197](https://github.com/PyTorchLightning/pytorch-lightning/pull/6197))
-
-
 - Fixed incorrect usage of `detach()`, `cpu()`, `to()` ([#6216](https://github.com/PyTorchLightning/pytorch-lightning/pull/6216))
-
-
 - Fixed LBFGS optimizer support which didn't converge in automatic optimization ([#6147](https://github.com/PyTorchLightning/pytorch-lightning/pull/6147))
-
-
 - Prevent `WandbLogger` from dropping values ([#5931](https://github.com/PyTorchLightning/pytorch-lightning/pull/5931))
-
-
 - Fixed error thrown when using valid distributed mode in multi node ([#6297](https://github.com/PyTorchLightning/pytorch-lightning/pull/6297)
 
 

diff --git a/pytorch_lightning/__init__.py b/pytorch_lightning/__init__.py
@@ -5,7 +5,7 @@
 import time
 
 _this_year = time.strftime("%Y")
-__version__ = '1.2.1'
+__version__ = '1.2.2'
 __author__ = 'William Falcon et al.'
 __author_email__ = 'waf2107@columbia.edu'
 __license__ = 'Apache-2.0'

diff --git a/pytorch_lightning/trainer/training_loop.py b/pytorch_lightning/trainer/training_loop.py
@@ -514,6 +514,7 @@ def run_training_epoch(self):
             # VALIDATE IF NEEDED + CHECKPOINT CALLBACK
             # -----------------------------------------
             should_check_val = self.should_check_val_fx(batch_idx, is_last_batch)
+
             if should_check_val:
                 self.trainer.run_evaluation()
                 val_loop_called = True
@@ -577,7 +578,7 @@ def run_training_epoch(self):
             self.trainer.run_evaluation(on_epoch=True)
 
             # reset stage to train
-            self.trainer._running_stage = RunningStage.TRAINING
+            self.trainer._set_running_stage(RunningStage.TRAINING, self.trainer.lightning_module)
 
         # increment the global step once
         # progress global step according to grads progress

diff --git a/tests/accelerators/test_accelerator_connector.py b/tests/accelerators/test_accelerator_connector.py
@@ -35,7 +35,6 @@
 )
 from pytorch_lightning.plugins.environments import ClusterEnvironment, SLURMEnvironment, TorchElasticEnvironment
 from pytorch_lightning.utilities import _DEEPSPEED_AVAILABLE
-from pytorch_lightning.utilities.exceptions import MisconfigurationException
 from tests.helpers.boring_model import BoringModel
 
 

diff --git a/tests/overrides/test_data_parallel.py b/tests/overrides/test_data_parallel.py
@@ -147,6 +147,7 @@ def training_step(self, batch, batch_idx):
     model = TestModel().to(device)
     model.trainer = MagicMock()
     model.trainer._running_stage = RunningStage.TRAINING
+    model.running_stage = RunningStage.TRAINING
     batch = torch.rand(2, 32).to(device)
     batch_idx = 0