Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed the deprecated trainer_data_loading_mixin #14888

Merged
merged 4 commits into from
Sep 26, 2022
Merged

Removed the deprecated trainer_data_loading_mixin #14888

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2e5024
Removed the trainer_data_loading_mixin
NeoKish Sep 25, 2022
e6d67b7
Modified changelog.md with PR number
NeoKish Sep 25, 2022
756d0f2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 25, 2022
3fa0983
remove unused import
awaelchli Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/pytorch_lightning/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

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

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


### Fixed

Expand Down
62 changes: 0 additions & 62 deletions src/pytorch_lightning/trainer/data_loading.py
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/pytorch_lightning/trainer/trainer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
from pytorch_lightning.trainer.connectors.logger_connector import LoggerConnector
from pytorch_lightning.trainer.connectors.logger_connector.result import _ResultCollection
from pytorch_lightning.trainer.connectors.signal_connector import SignalConnector
from pytorch_lightning.trainer.data_loading import TrainerDataLoadingMixin
from pytorch_lightning.trainer.optimizers import TrainerOptimizersMixin
from pytorch_lightning.trainer.states import RunningStage, TrainerFn, TrainerState, TrainerStatus
from pytorch_lightning.trainer.supporters import CombinedLoader
Expand Down Expand Up @@ -112,7 +111,6 @@

class Trainer(
TrainerOptimizersMixin, # TODO: Remove in v1.8
TrainerDataLoadingMixin, # TODO: Remove in v1.8
):
@_defaults_from_env_vars
def __init__(
Expand Down
16 changes: 0 additions & 16 deletions tests/tests_pytorch/deprecated_api/test_remove_1-8.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,22 +93,6 @@ def test_v1_8_0_trainer_optimizers_mixin():
trainer.convert_to_lightning_optimizers()


def test_v1_8_0_deprecate_trainer_data_loading_mixin():
trainer = Trainer(max_epochs=1)
model = BoringModel()
dm = BoringDataModule()
trainer.fit(model, datamodule=dm)

with pytest.deprecated_call(
match=r"`TrainerDataLoadingMixin.prepare_dataloader` was deprecated in v1.6 and will be removed in v1.8.",
):
trainer.prepare_dataloader(dataloader=model.train_dataloader, shuffle=False)
with pytest.deprecated_call(
match=r"`TrainerDataLoadingMixin.request_dataloader` was deprecated in v1.6 and will be removed in v1.8.",
):
trainer.request_dataloader(stage=RunningStage.TRAINING)


def test_v_1_8_0_deprecated_device_stats_monitor_prefix_metric_keys():
from pytorch_lightning.callbacks.device_stats_monitor import prefix_metric_keys

Expand Down