Skip to content

Commit 4654529

Browse files
committed
rename spawn launcher files
1 parent bf5077e commit 4654529

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

src/pytorch_lightning/strategies/ddp_spawn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from pytorch_lightning.plugins.environments.cluster_environment import ClusterEnvironment
3131
from pytorch_lightning.plugins.io.checkpoint_plugin import CheckpointIO
3232
from pytorch_lightning.plugins.precision import PrecisionPlugin
33-
from pytorch_lightning.strategies.launchers.spawn import _MultiProcessingLauncher
33+
from pytorch_lightning.strategies.launchers.multiprocessing import _MultiProcessingLauncher
3434
from pytorch_lightning.strategies.parallel import ParallelStrategy
3535
from pytorch_lightning.trainer.states import TrainerFn
3636
from pytorch_lightning.utilities.distributed import (

src/pytorch_lightning/strategies/launchers/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
from pytorch_lightning.strategies.launchers.base import _Launcher
15-
from pytorch_lightning.strategies.launchers.spawn import _MultiProcessingLauncher
15+
from pytorch_lightning.strategies.launchers.multiprocessing import _MultiProcessingLauncher
1616
from pytorch_lightning.strategies.launchers.subprocess_script import _SubprocessScriptLauncher
17-
from pytorch_lightning.strategies.launchers.xla_spawn import _XLALauncher
17+
from pytorch_lightning.strategies.launchers.xla import _XLALauncher
1818

1919
__all__ = [
2020
"_Launcher",

src/pytorch_lightning/strategies/launchers/xla_spawn.py renamed to src/pytorch_lightning/strategies/launchers/xla.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import torch.multiprocessing as mp
2020

2121
import pytorch_lightning as pl
22-
from pytorch_lightning.strategies.launchers.spawn import _FakeQueue, _MultiProcessingLauncher, _WorkerOutput
22+
from pytorch_lightning.strategies.launchers.multiprocessing import _FakeQueue, _MultiProcessingLauncher, _WorkerOutput
2323
from pytorch_lightning.trainer.states import TrainerFn
2424
from pytorch_lightning.utilities import _TPU_AVAILABLE
2525
from pytorch_lightning.utilities.apply_func import move_data_to_device

src/pytorch_lightning/strategies/tpu_spawn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from pytorch_lightning.plugins.io.xla_plugin import XLACheckpointIO
2727
from pytorch_lightning.plugins.precision import PrecisionPlugin
2828
from pytorch_lightning.strategies.ddp_spawn import DDPSpawnStrategy
29-
from pytorch_lightning.strategies.launchers.xla_spawn import _XLALauncher
29+
from pytorch_lightning.strategies.launchers.xla import _XLALauncher
3030
from pytorch_lightning.trainer.connectors.data_connector import DataConnector
3131
from pytorch_lightning.trainer.states import TrainerFn
3232
from pytorch_lightning.utilities import _TPU_AVAILABLE, find_shared_parameters, set_shared_parameters

tests/tests_pytorch/accelerators/test_accelerator_connector.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ def test_ipython_compatible_dp_strategy_gpu(_, monkeypatch):
228228

229229
@mock.patch("pytorch_lightning.accelerators.tpu.TPUAccelerator.is_available", return_value=True)
230230
@mock.patch(
231-
"pytorch_lightning.strategies.launchers.spawn.torch.multiprocessing.get_all_start_methods", return_value=["fork"]
231+
"pytorch_lightning.strategies.launchers.multiprocessing.torch.multiprocessing.get_all_start_methods", return_value=["fork"]
232232
)
233233
def test_ipython_compatible_strategy_tpu(_, __, monkeypatch):
234234
monkeypatch.setattr(pytorch_lightning.utilities, "_IS_INTERACTIVE", True)

tests/tests_pytorch/strategies/launchers/test_spawn.py renamed to tests/tests_pytorch/strategies/launchers/test_multiprocessing.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616

1717
import pytest
1818

19-
from pytorch_lightning.strategies.launchers.spawn import _MultiProcessingLauncher
19+
from pytorch_lightning.strategies.launchers.multiprocessing import _MultiProcessingLauncher
2020

2121

22-
@mock.patch("pytorch_lightning.strategies.launchers.spawn.mp.get_all_start_methods", return_value=[])
22+
@mock.patch("pytorch_lightning.strategies.launchers.multiprocessing.mp.get_all_start_methods", return_value=[])
2323
def test_spawn_launcher_forking_on_unsupported_platform(_):
2424
launcher = _MultiProcessingLauncher(strategy=Mock(), start_method="fork")
2525
with pytest.raises(ValueError, match="The start method 'fork' is not available on this platform"):
2626
launcher.launch(function=Mock())
2727

2828

2929
@pytest.mark.parametrize("start_method", ["spawn", "fork"])
30-
@mock.patch("pytorch_lightning.strategies.launchers.spawn.mp")
30+
@mock.patch("pytorch_lightning.strategies.launchers.multiprocessing.mp")
3131
def test_spawn_launcher_start_method(mp_mock, start_method):
3232
mp_mock.get_all_start_methods.return_value = [start_method]
3333
launcher = _MultiProcessingLauncher(strategy=Mock(), start_method=start_method)

tests/tests_pytorch/strategies/test_ddp_spawn_strategy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from pytorch_lightning import LightningModule, Trainer
2424
from pytorch_lightning.demos.boring_classes import BoringDataModule, BoringModel
2525
from pytorch_lightning.strategies import DDPSpawnStrategy
26-
from pytorch_lightning.strategies.launchers.spawn import _MultiProcessingLauncher
26+
from pytorch_lightning.strategies.launchers.multiprocessing import _MultiProcessingLauncher
2727
from pytorch_lightning.trainer.states import TrainerFn
2828
from tests_pytorch.helpers.runif import RunIf
2929

0 commit comments

Comments
 (0)