diff --git a/src/pytorch_lightning/CHANGELOG.md b/src/pytorch_lightning/CHANGELOG.md index 845c7fd88bc61..80304b60d366e 100644 --- a/src/pytorch_lightning/CHANGELOG.md +++ b/src/pytorch_lightning/CHANGELOG.md @@ -101,6 +101,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Removed deprecated support for old torchtext versions ([#14375](https://github.com/Lightning-AI/lightning/pull/14375)) +- Removed the deprecated `Trainer.data_parallel_device_ids` hook in favour of `Trainer.device_ids` ([#14422](https://github.com/Lightning-AI/lightning/pull/14422)) + + - Removed the deprecated class `TrainerCallbackHookMixin` ([#14401](https://github.com/Lightning-AI/lightning/14401)) diff --git a/src/pytorch_lightning/trainer/trainer.py b/src/pytorch_lightning/trainer/trainer.py index 13817deaf64d1..38bd8e9fcb7d3 100644 --- a/src/pytorch_lightning/trainer/trainer.py +++ b/src/pytorch_lightning/trainer/trainer.py @@ -2106,14 +2106,6 @@ def devices(self) -> int: ) return self.num_devices - @property - def data_parallel_device_ids(self) -> Optional[List[int]]: - rank_zero_deprecation( - "`Trainer.data_parallel_device_ids` was deprecated in v1.6 and will be removed in v1.8." - " Please use `Trainer.device_ids` instead." - ) - return self.device_ids if isinstance(self.accelerator, CUDAAccelerator) else None - @property def lightning_module(self) -> "pl.LightningModule": # TODO: this is actually an optional return diff --git a/tests/tests_pytorch/deprecated_api/test_remove_1-8.py b/tests/tests_pytorch/deprecated_api/test_remove_1-8.py index d3a014177dabc..4dc5166013ac3 100644 --- a/tests/tests_pytorch/deprecated_api/test_remove_1-8.py +++ b/tests/tests_pytorch/deprecated_api/test_remove_1-8.py @@ -786,32 +786,6 @@ def test_trainer_num_processes(monkeypatch, trainer_kwargs, expected_num_process trainer.num_processes == expected_num_processes -@pytest.mark.parametrize( - ["trainer_kwargs", "expected_data_parallel_device_ids"], - [ - ({}, None), - ({"devices": 1}, None), - ({"devices": "1"}, None), - ({"accelerator": "gpu", "devices": 1}, [0]), - ({"accelerator": "gpu", "devices": 2}, [0, 1]), - ({"accelerator": "gpu", "devices": [1]}, [1]), - ({"accelerator": "gpu", "devices": "0,"}, [0]), - ], -) -def test_trainer_data_parallel_device_ids(monkeypatch, trainer_kwargs, expected_data_parallel_device_ids): - """Test multi type argument with bool.""" - if trainer_kwargs.get("accelerator") == "gpu": - monkeypatch.setattr(device_parser, "is_cuda_available", lambda: True) - monkeypatch.setattr(device_parser, "num_cuda_devices", lambda: 2) - - trainer = Trainer(**trainer_kwargs) - with pytest.deprecated_call( - match="`Trainer.data_parallel_device_ids` was deprecated in v1.6 and will be removed in v1.8." - " Please use `Trainer.device_ids` instead." - ): - assert trainer.data_parallel_device_ids == expected_data_parallel_device_ids - - def test_deprecated_mc_save_checkpoint(): mc = ModelCheckpoint() trainer = Trainer()