Merge 4b206e7 into 0345fcf

Lightning-AI · Feb 13, 2021 · fd43953 · fd43953
2 parents 0345fcf + 4b206e7
commit fd43953
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 18 deletions.
diff --git a/benchmarks/test_sharded_parity.py b/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
 
 

diff --git a/dockers/tpu-tests/tpu_test_cases.jsonnet b/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"

diff --git a/tests/accelerators/__init__.py b/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
diff --git a/tests/accelerators/legacy/ddp_model.py → tests/accelerators/ddp_model.py b/tests/accelerators/legacy/ddp_model.py → tests/accelerators/ddp_model.py
diff --git a/tests/accelerators/legacy/__init__.py b/tests/accelerators/legacy/__init__.py
diff --git a/...tors/legacy/test_accelerator_connector.py → ...ccelerators/test_accelerator_connector.py b/...tors/legacy/test_accelerator_connector.py → ...ccelerators/test_accelerator_connector.py
diff --git a/tests/accelerators/legacy/test_ddp.py → tests/accelerators/test_ddp.py b/tests/accelerators/legacy/test_ddp.py → tests/accelerators/test_ddp.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
 
 

diff --git a/tests/accelerators/legacy/test_ddp_spawn.py → tests/accelerators/test_ddp_spawn.py b/tests/accelerators/legacy/test_ddp_spawn.py → tests/accelerators/test_ddp_spawn.py
diff --git a/tests/accelerators/legacy/test_dp.py → tests/accelerators/test_dp.py b/tests/accelerators/legacy/test_dp.py → tests/accelerators/test_dp.py
diff --git a/...celerators/legacy/test_multi_nodes_gpu.py → tests/accelerators/test_multi_nodes_gpu.py b/...celerators/legacy/test_multi_nodes_gpu.py → tests/accelerators/test_multi_nodes_gpu.py
diff --git a/...s/accelerators/legacy/test_tpu_backend.py → tests/accelerators/test_tpu_backend.py b/...s/accelerators/legacy/test_tpu_backend.py → tests/accelerators/test_tpu_backend.py
diff --git a/tests/trainer/properties/test_get_model.py b/tests/trainer/properties/test_get_model.py
@@ -17,7 +17,7 @@
 import torch
 
 from pytorch_lightning import Trainer
-from tests.accelerators.legacy import DDPLauncher
+from tests.accelerators import DDPLauncher
 from tests.helpers.boring_model import BoringModel