Merge branch 'release/1.2-dev' into patch-2

Author: Borda

pyproject.toml

@@ -23,8 +23,6 @@ known_first_party = [
     "tests",
 ]
 skip_glob = [
-
-
     # todo
     "pytorch_lightning/accelerators/*",
 
@@ -75,22 +73,6 @@ skip_glob = [
 
     # todo
     "pytorch_lightning/utilities/*",
-
-
-    # todo
-    "tests/backends/*",
-
-
-    # todo
-    "tests/base/*",
-
-
-    # todo
-    "tests/tuner/*",
-
-
-    # todo
-    "tests/utilities/*",
 ]
 profile = "black"
 line_length = 120

pytorch_lightning/loggers/comet.py

@@ -25,6 +25,7 @@
 from torch import is_tensor
 
 from pytorch_lightning import _logger as log
+from pytorch_lightning.core.lightning import LightningModule
 from pytorch_lightning.loggers.base import LightningLoggerBase, rank_zero_experiment
 from pytorch_lightning.utilities import rank_zero_only, _module_available
 from pytorch_lightning.utilities.exceptions import MisconfigurationException
@@ -310,3 +311,7 @@ def __getstate__(self):
         # needed later
         state["_experiment"] = None
         return state
+
+    def log_graph(self, model: LightningModule, input_array=None) -> None:
+        if self._experiment is not None:
+            self._experiment.set_model_graph(model)

tests/backends/ddp_model.py

@@ -17,11 +17,11 @@
 import os
 from argparse import ArgumentParser
 
-from pytorch_lightning import Trainer, seed_everything
-from tests.base import EvalModelTemplate
-
 import torch
 
+from pytorch_lightning import seed_everything, Trainer
+from tests.base import EvalModelTemplate
+
 
 def main():
     seed_everything(1234)

tests/backends/test_accelerator_connector.py

@@ -17,7 +17,7 @@
 
 import pytest
 
-from pytorch_lightning import Trainer, accelerators
+from pytorch_lightning import accelerators, Trainer
 from pytorch_lightning.accelerators import Accelerator
 from pytorch_lightning.callbacks import Callback
 from pytorch_lightning.cluster_environments import ClusterEnvironment, SLURMEnvironment, TorchElasticEnvironment

tests/backends/test_ddp.py

@@ -16,8 +16,7 @@
 import pytest
 import torch
 
-from tests.backends import ddp_model
-from tests.backends import DDPLauncher
+from tests.backends import ddp_model, DDPLauncher
 from tests.utilities.distributed import call_training_script
 
 

tests/backends/test_ddp_spawn.py

@@ -17,10 +17,10 @@
 import tests.base.develop_pipelines as tpipes
 import tests.base.develop_utils as tutils
 from pytorch_lightning.callbacks import EarlyStopping
-from pytorch_lightning.trainer.states import TrainerState
-from tests.base import EvalModelTemplate
 from pytorch_lightning.core import memory
 from pytorch_lightning.trainer import Trainer
+from pytorch_lightning.trainer.states import TrainerState
+from tests.base import EvalModelTemplate
 
 
 @pytest.mark.skipif(torch.cuda.device_count() < 2, reason="test requires multi-GPU machine")

tests/backends/test_dp.py

@@ -14,13 +14,12 @@
 import pytest
 import torch
 
+import pytorch_lightning as pl
 import tests.base.develop_pipelines as tpipes
 import tests.base.develop_utils as tutils
 from pytorch_lightning.callbacks import EarlyStopping
 from pytorch_lightning.core import memory
 from tests.base import EvalModelTemplate
-import pytorch_lightning as pl
-
 
 PRETEND_N_OF_GPUS = 16
 

tests/base/datamodules.py

@@ -13,11 +13,12 @@
 # limitations under the License.
 from typing import Any, Dict, Optional
 
-from pytorch_lightning.core.datamodule import LightningDataModule
-from tests.base.datasets import MNIST, TrialMNIST
 from torch.utils.data import DataLoader, random_split
 from torch.utils.data.distributed import DistributedSampler
 
+from pytorch_lightning.core.datamodule import LightningDataModule
+from tests.base.datasets import MNIST, TrialMNIST
+
 
 class TrialMNISTDataModule(LightningDataModule):
     def __init__(self, data_dir: str = "./"):

tests/base/datasets.py

@@ -16,7 +16,7 @@
 import random
 import time
 import urllib.request
-from typing import Tuple, Optional, Sequence
+from typing import Optional, Sequence, Tuple
 
 import torch
 from torch import Tensor

tests/base/deterministic_model.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 import torch
 from torch import nn
-from torch.utils.data import Dataset, DataLoader
+from torch.utils.data import DataLoader, Dataset
 
 from pytorch_lightning.core.lightning import LightningModule
 from pytorch_lightning.utilities import DistributedType