Skip to content

Commit 35419b5

Browse files
authored
Removed the deprecated trainer_data_loading_mixin (#14888)
1 parent 2ef1f0a commit 35419b5

File tree

4 files changed

+2
-81
lines changed

4 files changed

+2
-81
lines changed

src/pytorch_lightning/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
232232

233233
- Remove the deprecated `Trainer.should_rank_save_checkpoint` ([#14885](https://github.com/Lightning-AI/lightning/pull/14885))
234234

235+
- Removed the deprecated `TrainerDataLoadingMixin` ([#14888](https://github.com/Lightning-AI/lightning/pull/14888))
236+
235237

236238
### Fixed
237239

src/pytorch_lightning/trainer/data_loading.py

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

src/pytorch_lightning/trainer/trainer.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
from pytorch_lightning.trainer.connectors.logger_connector import LoggerConnector
7676
from pytorch_lightning.trainer.connectors.logger_connector.result import _ResultCollection
7777
from pytorch_lightning.trainer.connectors.signal_connector import SignalConnector
78-
from pytorch_lightning.trainer.data_loading import TrainerDataLoadingMixin
7978
from pytorch_lightning.trainer.optimizers import TrainerOptimizersMixin
8079
from pytorch_lightning.trainer.states import RunningStage, TrainerFn, TrainerState, TrainerStatus
8180
from pytorch_lightning.trainer.supporters import CombinedLoader
@@ -112,7 +111,6 @@
112111

113112
class Trainer(
114113
TrainerOptimizersMixin, # TODO: Remove in v1.8
115-
TrainerDataLoadingMixin, # TODO: Remove in v1.8
116114
):
117115
@_defaults_from_env_vars
118116
def __init__(

tests/tests_pytorch/deprecated_api/test_remove_1-8.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
from pytorch_lightning.demos.boring_classes import BoringDataModule, BoringModel
2323
from pytorch_lightning.strategies.ipu import LightningIPUModule
2424
from pytorch_lightning.trainer.configuration_validator import _check_datamodule_checkpoint_hooks
25-
from pytorch_lightning.trainer.states import RunningStage
2625

2726

2827
def test_v1_8_0_on_init_start_end(tmpdir):
@@ -93,22 +92,6 @@ def test_v1_8_0_trainer_optimizers_mixin():
9392
trainer.convert_to_lightning_optimizers()
9493

9594

96-
def test_v1_8_0_deprecate_trainer_data_loading_mixin():
97-
trainer = Trainer(max_epochs=1)
98-
model = BoringModel()
99-
dm = BoringDataModule()
100-
trainer.fit(model, datamodule=dm)
101-
102-
with pytest.deprecated_call(
103-
match=r"`TrainerDataLoadingMixin.prepare_dataloader` was deprecated in v1.6 and will be removed in v1.8.",
104-
):
105-
trainer.prepare_dataloader(dataloader=model.train_dataloader, shuffle=False)
106-
with pytest.deprecated_call(
107-
match=r"`TrainerDataLoadingMixin.request_dataloader` was deprecated in v1.6 and will be removed in v1.8.",
108-
):
109-
trainer.request_dataloader(stage=RunningStage.TRAINING)
110-
111-
11295
def test_v_1_8_0_deprecated_device_stats_monitor_prefix_metric_keys():
11396
from pytorch_lightning.callbacks.device_stats_monitor import prefix_metric_keys
11497

0 commit comments

Comments
 (0)