Merge branch 'master' into refactor/legacy-cleanup3

Author: mergify[bot]

benchmarks/test_sharded_parity.py

@@ -23,7 +23,7 @@
 from pytorch_lightning import seed_everything, Trainer
 from pytorch_lightning.plugins import DDPSpawnShardedPlugin
 from pytorch_lightning.utilities import _FAIRSCALE_AVAILABLE, _NATIVE_AMP_AVAILABLE
-from tests.accelerators.legacy import DDPLauncher
+from tests.accelerators import DDPLauncher
 from tests.helpers.boring_model import BoringModel, RandomDataset
 
 

dockers/tpu-tests/tpu_test_cases.jsonnet

@@ -23,7 +23,7 @@ local tputests = base.BaseTest {
       cd pytorch-lightning
       coverage run --source=pytorch_lightning -m pytest -v --capture=no \
           pytorch_lightning/utilities/xla_device_utils.py \
-          tests/accelerators/legacy/test_tpu_backend.py \
+          tests/accelerators/test_tpu_backend.py \
           tests/models/test_tpu.py
       test_exit_code=$?
       echo "\n||| END PYTEST LOGS |||\n"

tests/accelerators/__init__.py

@@ -0,0 +1,12 @@
+try:
+    from dtrun.launcher import DDPLauncher
+except ImportError:
+
+    class DDPLauncher:
+
+        def run(cmd_line, **kwargs):
+
+            def inner(func):
+                pass
+
+            return inner

tests/accelerators/legacy/ddp_model.py renamed to tests/accelerators/ddp_model.py

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