Skip to content

Commit d825ada

Browse files
akihironittacarmocca
authored andcommitted
Remove deprecated LightningDistributed (Lightning-AI#13549)
Co-authored-by: Carlos Mocholí <[email protected]>
1 parent db1e4d2 commit d825ada

File tree

5 files changed

+10
-77
lines changed

5 files changed

+10
-77
lines changed

pyproject.toml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,29 @@ warn_no_return = "False"
4545
# TODO: the goal is for this to be empty
4646
[[tool.mypy.overrides]]
4747
# the list can be generated with:
48-
# mypy | tr ':' ' ' | awk '{print $1}' | sort | uniq | sed 's/\.py//g' | sed 's|\/|\.|g' | xargs -I {} echo '"{}",'
48+
# mypy --no-error-summary 2>&1 | tr ':' ' ' | awk '{print $1}' | sort | uniq | sed 's/\.py//g; s|src/||g; s|\/|\.|g' | xargs -I {} echo '"{}",'
4949
module = [
5050
"pytorch_lightning.callbacks.model_checkpoint",
5151
"pytorch_lightning.callbacks.progress.rich_progress",
5252
"pytorch_lightning.callbacks.quantization",
5353
"pytorch_lightning.callbacks.stochastic_weight_avg",
5454
"pytorch_lightning.core.datamodule",
5555
"pytorch_lightning.core.decorators",
56-
"pytorch_lightning.core.module",
5756
"pytorch_lightning.core.mixins.device_dtype_mixin",
57+
"pytorch_lightning.core.module",
5858
"pytorch_lightning.core.saving",
5959
"pytorch_lightning.demos.boring_classes",
6060
"pytorch_lightning.demos.mnist_datamodule",
61-
"pytorch_lightning.distributed.dist",
6261
"pytorch_lightning.loggers.comet",
6362
"pytorch_lightning.loggers.mlflow",
6463
"pytorch_lightning.loggers.neptune",
6564
"pytorch_lightning.loggers.tensorboard",
6665
"pytorch_lightning.loggers.wandb",
6766
"pytorch_lightning.loops.epoch.training_epoch_loop",
67+
"pytorch_lightning.profilers.advanced",
68+
"pytorch_lightning.profilers.base",
69+
"pytorch_lightning.profilers.pytorch",
70+
"pytorch_lightning.profilers.simple",
6871
"pytorch_lightning.strategies.ddp",
6972
"pytorch_lightning.strategies.ddp_spawn",
7073
"pytorch_lightning.strategies.deepspeed",
@@ -74,16 +77,11 @@ module = [
7477
"pytorch_lightning.strategies.parallel",
7578
"pytorch_lightning.strategies.sharded",
7679
"pytorch_lightning.strategies.sharded_spawn",
77-
"pytorch_lightning.strategies.tpu_spawn",
7880
"pytorch_lightning.strategies.strategy",
79-
"pytorch_lightning.profilers.advanced",
80-
"pytorch_lightning.profilers.base",
81-
"pytorch_lightning.profilers.pytorch",
82-
"pytorch_lightning.profilers.simple",
81+
"pytorch_lightning.strategies.tpu_spawn",
8382
"pytorch_lightning.trainer.callback_hook",
8483
"pytorch_lightning.trainer.connectors.callback_connector",
8584
"pytorch_lightning.trainer.connectors.data_connector",
86-
"pytorch_lightning.trainer.data_loading",
8785
"pytorch_lightning.trainer.supporters",
8886
"pytorch_lightning.trainer.trainer",
8987
"pytorch_lightning.tuner.batch_size_scaling",

src/pytorch_lightning/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
284284
- Removed support for the `DDP2Strategy` ([#12705](https://github.com/PyTorchLightning/pytorch-lightning/pull/12705))
285285

286286

287+
- Removed deprecated `LightningDistributed` ([#13549](https://github.com/PyTorchLightning/pytorch-lightning/pull/13549))
288+
289+
287290
- Removed deprecated ClusterEnvironment properties `master_address` and `master_port` in favor of `main_address` and `main_port` ([#13458](https://github.com/PyTorchLightning/pytorch-lightning/pull/13458))
288291

289292

src/pytorch_lightning/distributed/__init__.py

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/pytorch_lightning/distributed/dist.py

Lines changed: 0 additions & 47 deletions
This file was deleted.

tests/tests_pytorch/deprecated_api/test_remove_1-7.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@
2121
from pytorch_lightning.strategies import SingleDeviceStrategy
2222

2323

24-
def test_v1_7_0_deprecate_lightning_distributed(tmpdir):
25-
with pytest.deprecated_call(match="LightningDistributed is deprecated in v1.5 and will be removed in v1.7."):
26-
from pytorch_lightning.distributed.dist import LightningDistributed
27-
28-
_ = LightningDistributed()
29-
30-
3124
def test_v1_7_0_deprecated_max_steps_none(tmpdir):
3225
with pytest.deprecated_call(match="`max_steps = None` is deprecated in v1.5"):
3326
_ = Trainer(max_steps=None)

0 commit comments

Comments
 (0)