Skip to content

Commit

Permalink
Remove deprecated property configure_slurm_dpp from accelerator con…
Browse files Browse the repository at this point in the history
…nector (#10370)

* Remove deprecated configure_slurm_ddp

* Update CHANGELOG

* Remove deprecated tests from test suite
  • Loading branch information
SauravMaheshkar authored Nov 5, 2021
1 parent 348fc4b commit a9bd4fb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- Removed deprecated `has_prepared_data`, `has_setup_fit`, `has_setup_validate`, `has_setup_test`, `has_setup_predict`, `has_teardown_fit`, `has_teardown_validate`, `has_teardown_test` and `has_teardown_predict` datamodule lifecycle properties ([#10350](https://github.com/PyTorchLightning/pytorch-lightning/pull/10350))


- Removed deprecated property `configure_slurm_dpp` from accelerator connector ([#10370](https://github.com/PyTorchLightning/pytorch-lightning/pull/10370))


- Removed deprecated arguments `num_nodes` and `sync_batchnorm` from `DDPPlugin`, `DDPSpawnPlugin`, `DeepSpeedPlugin` ([#10357](https://github.com/PyTorchLightning/pytorch-lightning/pull/10357))


Expand Down
6 changes: 0 additions & 6 deletions pytorch_lightning/trainer/connectors/accelerator_connector.py
Original file line number Diff line number Diff line change
Expand Up @@ -993,12 +993,6 @@ def update_device_type_if_training_type_plugin_passed(self) -> None:
elif self.has_gpu:
self._device_type = DeviceType.GPU

def configure_slurm_ddp(self) -> None:
rank_zero_deprecation(
"`AcceleratorConnector.configure_slurm_ddp()` was deprecated in v1.5 and will be removed in v1.6."
)
self._configure_slurm_ddp()

def _configure_slurm_ddp(self):
# extract SLURM flag vars
# whenever we have the correct number of tasks, we let slurm manage processes
Expand Down
6 changes: 0 additions & 6 deletions tests/deprecated_api/test_remove_1-6.py
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,6 @@ def test_v1_6_0_deprecated_accelerator_pass_through_functions():
accelerator.on_train_batch_start(batch=None, batch_idx=0)


def test_v1_6_0_configure_slurm_ddp():
trainer = Trainer()
with pytest.deprecated_call(match=r"`AcceleratorConnector.configure_slurm_ddp\(\)` was deprecated in v1.5"):
trainer._accelerator_connector.configure_slurm_ddp()


def test_v1_6_0_master_params():
with pytest.deprecated_call(match="`PrecisionPlugin.master_params` was deprecated in v1.5"):
PrecisionPlugin().master_params(Mock(spec=Optimizer))

0 comments on commit a9bd4fb

Please sign in to comment.