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

Move max_batches definition to the Loops #16820

Merged
merged 9 commits into from
Feb 22, 2023
Merged

Move max_batches definition to the Loops #16820

merged 9 commits into from
Feb 22, 2023

Conversation

carmocca
Copy link
Contributor

@carmocca carmocca commented Feb 20, 2023 •
edited by github-actions bot
Loading

What does this PR do?

See title. Resolves TODO

For backwards compatibility, Trainer properties are added.

The only breaking change is that the properties are read-only.

Follow-up to #16726

cc @justusschock @awaelchli @Borda

@carmocca carmocca added refactor data handling Generic data-related topic pl Generic label for PyTorch Lightning package labels Feb 20, 2023
@carmocca carmocca added this to the 2.0 milestone Feb 20, 2023
@carmocca carmocca self-assigned this Feb 20, 2023
@carmocca carmocca mentioned this pull request Feb 20, 2023
Merged
10 tasks
@carmocca carmocca changed the title Each loop defines it's max_batches Move max_batches definition to the Loops Feb 20, 2023
@carmocca carmocca added the breaking change Includes a breaking change label Feb 20, 2023
@carmocca carmocca marked this pull request as ready for review February 20, 2023 15:10
@github-actions
Copy link
Contributor

github-actions bot commented Feb 20, 2023 •
edited
Loading

⚡ Required checks status: All passing 🟢

Groups summary

🟢 pytorch_lightning: Tests workflow
Check ID Status
pl-cpu (macOS-11, lightning, 3.8, 1.11) success ✅
pl-cpu (macOS-11, lightning, 3.9, 1.12) success ✅
pl-cpu (macOS-11, lightning, 3.10, 1.13) success ✅
pl-cpu (macOS-11, lightning, 3.8, 1.11, oldest) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.9, 1.11) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.10, 1.12) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.10, 1.13) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.8, 1.11, oldest) success ✅
pl-cpu (windows-2022, lightning, 3.9, 1.11) success ✅
pl-cpu (windows-2022, lightning, 3.10, 1.12) success ✅
pl-cpu (windows-2022, lightning, 3.10, 1.13) success ✅
pl-cpu (windows-2022, lightning, 3.8, 1.11, oldest) success ✅
pl-cpu (macOS-11, pytorch, 3.8, 1.13) success ✅
pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.13) success ✅
pl-cpu (windows-2022, pytorch, 3.8, 1.13) success ✅

These checks are required after the changes to src/lightning/pytorch/callbacks/stochastic_weight_avg.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/loops/fit_loop.py, src/lightning/pytorch/loops/prediction_loop.py, src/lightning/pytorch/trainer/connectors/data_connector.py, src/lightning/pytorch/trainer/trainer.py, tests/tests_pytorch/checkpointing/test_model_checkpoint.py, tests/tests_pytorch/loops/test_training_epoch_loop.py, tests/tests_pytorch/loops/test_training_loop.py, tests/tests_pytorch/trainer/test_trainer.py.

🟢 pytorch_lightning: Azure GPU
Check ID Status
pytorch-lightning (GPUs) success ✅

These checks are required after the changes to src/lightning/pytorch/callbacks/stochastic_weight_avg.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/loops/fit_loop.py, src/lightning/pytorch/loops/prediction_loop.py, src/lightning/pytorch/trainer/connectors/data_connector.py, src/lightning/pytorch/trainer/trainer.py, tests/tests_pytorch/checkpointing/test_model_checkpoint.py, tests/tests_pytorch/loops/test_training_epoch_loop.py, tests/tests_pytorch/loops/test_training_loop.py, tests/tests_pytorch/trainer/test_trainer.py.

🟢 pytorch_lightning: Azure HPU
Check ID Status
pytorch-lightning (HPUs) success ✅

These checks are required after the changes to src/lightning/pytorch/callbacks/stochastic_weight_avg.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/loops/fit_loop.py, src/lightning/pytorch/loops/prediction_loop.py, src/lightning/pytorch/trainer/connectors/data_connector.py, src/lightning/pytorch/trainer/trainer.py, tests/tests_pytorch/checkpointing/test_model_checkpoint.py, tests/tests_pytorch/loops/test_training_epoch_loop.py, tests/tests_pytorch/loops/test_training_loop.py, tests/tests_pytorch/trainer/test_trainer.py.

🟢 pytorch_lightning: Azure IPU
Check ID Status
pytorch-lightning (IPUs) success ✅

These checks are required after the changes to src/lightning/pytorch/callbacks/stochastic_weight_avg.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/loops/fit_loop.py, src/lightning/pytorch/loops/prediction_loop.py, src/lightning/pytorch/trainer/connectors/data_connector.py, src/lightning/pytorch/trainer/trainer.py, tests/tests_pytorch/checkpointing/test_model_checkpoint.py, tests/tests_pytorch/loops/test_training_epoch_loop.py, tests/tests_pytorch/loops/test_training_loop.py, tests/tests_pytorch/trainer/test_trainer.py.

🟢 pytorch_lightning: Docs
Check ID Status
make-doctest (pytorch) success ✅
make-html (pytorch) success ✅

These checks are required after the changes to src/lightning/pytorch/callbacks/stochastic_weight_avg.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/loops/fit_loop.py, src/lightning/pytorch/loops/prediction_loop.py, src/lightning/pytorch/trainer/connectors/data_connector.py, src/lightning/pytorch/trainer/trainer.py.

🟢 mypy
Check ID Status
mypy success ✅

These checks are required after the changes to src/lightning/pytorch/callbacks/stochastic_weight_avg.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/loops/fit_loop.py, src/lightning/pytorch/loops/prediction_loop.py, src/lightning/pytorch/trainer/connectors/data_connector.py, src/lightning/pytorch/trainer/trainer.py.

🟢 install
Check ID Status
install-pkg (ubuntu-22.04, app, 3.8) success ✅
install-pkg (ubuntu-22.04, app, 3.10) success ✅
install-pkg (ubuntu-22.04, fabric, 3.8) success ✅
install-pkg (ubuntu-22.04, fabric, 3.10) success ✅
install-pkg (ubuntu-22.04, pytorch, 3.8) success ✅
install-pkg (ubuntu-22.04, pytorch, 3.10) success ✅
install-pkg (ubuntu-22.04, lightning, 3.8) success ✅
install-pkg (ubuntu-22.04, lightning, 3.10) success ✅
install-pkg (ubuntu-22.04, notset, 3.8) success ✅
install-pkg (ubuntu-22.04, notset, 3.10) success ✅
install-pkg (macOS-12, app, 3.8) success ✅
install-pkg (macOS-12, app, 3.10) success ✅
install-pkg (macOS-12, fabric, 3.8) success ✅
install-pkg (macOS-12, fabric, 3.10) success ✅
install-pkg (macOS-12, pytorch, 3.8) success ✅
install-pkg (macOS-12, pytorch, 3.10) success ✅
install-pkg (macOS-12, lightning, 3.8) success ✅
install-pkg (macOS-12, lightning, 3.10) success ✅
install-pkg (macOS-12, notset, 3.8) success ✅
install-pkg (macOS-12, notset, 3.10) success ✅
install-pkg (windows-2022, app, 3.8) success ✅
install-pkg (windows-2022, app, 3.10) success ✅
install-pkg (windows-2022, fabric, 3.8) success ✅
install-pkg (windows-2022, fabric, 3.10) success ✅
install-pkg (windows-2022, pytorch, 3.8) success ✅
install-pkg (windows-2022, pytorch, 3.10) success ✅
install-pkg (windows-2022, lightning, 3.8) success ✅
install-pkg (windows-2022, lightning, 3.10) success ✅
install-pkg (windows-2022, notset, 3.8) success ✅
install-pkg (windows-2022, notset, 3.10) success ✅

These checks are required after the changes to src/lightning/pytorch/callbacks/stochastic_weight_avg.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/loops/fit_loop.py, src/lightning/pytorch/loops/prediction_loop.py, src/lightning/pytorch/trainer/connectors/data_connector.py, src/lightning/pytorch/trainer/trainer.py.

Thank you for your contribution! 💜

Note
This comment is automatically generated and updates for 60 minutes every 180 seconds. If you have any other questions, contact carmocca for help.

@mergify mergify bot added the ready PRs ready to be merged label Feb 22, 2023
@carmocca carmocca merged commit 565d611 into master Feb 22, 2023
@carmocca carmocca deleted the refactor/max_batches branch February 22, 2023 13:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@awaelchli awaelchli awaelchli approved these changes

@Borda Borda Borda approved these changes

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

@tchaton tchaton Awaiting requested review from tchaton tchaton is a code owner

@justusschock justusschock Awaiting requested review from justusschock justusschock is a code owner

Assignees

@carmocca carmocca

Labels
breaking change Includes a breaking change data handling Generic data-related topic pl Generic label for PyTorch Lightning package ready PRs ready to be merged refactor
Projects
None yet
Milestone
2.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@carmocca @awaelchli @Borda