integrate #7736

Lightning-AI · May 27, 2021 · 395050a · 395050a
1 parent ccd738b
commit 395050a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/pytorch_lightning/loops/batch_loop.py b/pytorch_lightning/loops/batch_loop.py
@@ -9,9 +9,9 @@
 from torch.optim import Optimizer
 
 from pytorch_lightning.core.optimizer import LightningOptimizer
-from pytorch_lightning.core.step_result import Result
 from pytorch_lightning.loops.base import Loop
 from pytorch_lightning.plugins import ParallelPlugin
+from pytorch_lightning.trainer.connectors.logger_connector.result import Result
 from pytorch_lightning.trainer.supporters import TensorRunningAccum
 from pytorch_lightning.utilities import AMPType, AttributeDict, DeviceType, grad_norm
 from pytorch_lightning.utilities.exceptions import MisconfigurationException
@@ -179,9 +179,9 @@ def training_step_and_backward_closure(
         return_result: AttributeDict,
     ) -> Optional[torch.Tensor]:
 
-        step_result = self.training_step_and_backward(split_batch, batch_idx, opt_idx, optimizer, hiddens)
-        if step_result is not None:
-            return_result.update(step_result)
+        result = self.training_step_and_backward(split_batch, batch_idx, opt_idx, optimizer, hiddens)
+        if result is not None:
+            return_result.update(result)
             return return_result.loss
 
     def make_closure(self, *closure_args, **closure_kwargs: Any) -> Callable:

diff --git a/pytorch_lightning/loops/epoch_loop.py b/pytorch_lightning/loops/epoch_loop.py
@@ -8,7 +8,6 @@
 
 import pytorch_lightning as pl
 from pytorch_lightning.callbacks.early_stopping import EarlyStopping
-from pytorch_lightning.core.step_result import Result
 from pytorch_lightning.loops.base import Loop
 from pytorch_lightning.loops.training_loop import TrainingLoop
 from pytorch_lightning.trainer.supporters import TensorRunningAccum

diff --git a/pytorch_lightning/loops/evaluation_dataloader_loop.py b/pytorch_lightning/loops/evaluation_dataloader_loop.py
@@ -3,9 +3,9 @@
 
 from torch.utils.data.dataloader import DataLoader
 
-from pytorch_lightning.core.step_result import Result
 from pytorch_lightning.loops.base import Loop
 from pytorch_lightning.loops.evaluation_loop import EvaluationLoop
+from pytorch_lightning.trainer.connectors.logger_connector.result import Result
 from pytorch_lightning.trainer.states import TrainerFn
 from pytorch_lightning.trainer.supporters import PredictionCollection
 from pytorch_lightning.utilities.model_helpers import is_overridden

diff --git a/pytorch_lightning/loops/evaluation_loop.py b/pytorch_lightning/loops/evaluation_loop.py
@@ -1,8 +1,8 @@
 from collections import OrderedDict
 from typing import Any, Optional, Dict, Union, Iterator
 
-from pytorch_lightning.core.step_result import Result
 from pytorch_lightning.loops.base import Loop
+from pytorch_lightning.trainer.connectors.logger_connector.result import Result
 from pytorch_lightning.trainer.supporters import PredictionCollection
 from pytorch_lightning.utilities.types import STEP_OUTPUT
 

diff --git a/pytorch_lightning/loops/training_loop.py b/pytorch_lightning/loops/training_loop.py
@@ -1,9 +1,9 @@
 from typing import Dict, List, Union
 
 import pytorch_lightning as pl
-from pytorch_lightning.core.step_result import Result
 from pytorch_lightning.loops.base import Loop
 from pytorch_lightning.loops.batch_loop import BatchLoop
+from pytorch_lightning.trainer.connectors.logger_connector.result import Result
 from pytorch_lightning.utilities.exceptions import MisconfigurationException
 from pytorch_lightning.utilities.model_helpers import is_overridden
 from pytorch_lightning.utilities.signature_utils import is_param_in_hook_signature