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.

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

Remove truncated backpropagation from loops #16172

Merged
merged 10 commits into from
Jan 11, 2023
Merged

Conversation

awaelchli
Copy link
Contributor

@awaelchli awaelchli commented Dec 22, 2022

What does this PR do?

Closes #15057
Fixes #8732
Fixes #6539

Before submitting

  • Was this discussed/approved via a GitHub issue? (not for typos and docs)
  • Did you read the contributor guideline, Pull Request section?
  • Did you make sure your PR does only one thing, instead of bundling different changes together?
  • Did you make sure to update the documentation with your changes? (if necessary)
  • Did you write any new necessary tests? (not for typos and docs)
  • Did you verify new and existing tests pass locally with your changes?
  • Did you update the CHANGELOG? (not for typos, docs, test updates, or internal minor changes/refactorings)

PR review

Anyone in the community is free to review the PR once the tests have passed.
Before you start reviewing make sure you have read Review guidelines. In short, see the following bullet-list:

  • Is this pull request ready for review? (if not, please submit in draft mode)
  • Check that all items from Before submitting are resolved
  • Make sure the title is self-explanatory and the description concisely explains the PR
  • Add labels and milestones (and optionally projects) to the PR so it can be classified

Did you have fun?

I made sure I had fun coding 🙃

cc @Borda

@github-actions github-actions bot added pl Generic label for PyTorch Lightning package and removed pl Generic label for PyTorch Lightning package labels Dec 22, 2022
Copy link
Contributor

@carmocca carmocca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good so far. Pushed a commit with a few fixes. Also added links in the docstring

@awaelchli awaelchli changed the title WIP: Remove truncated backpropagation from loops Remove truncated backpropagation from loops Dec 24, 2022
@awaelchli awaelchli marked this pull request as ready for review December 24, 2022 01:48
@github-actions
Copy link
Contributor

github-actions bot commented Dec 24, 2022

⛈️ Required checks status: Has failure 🔴

Warning
This job will need to be re-run to merge your PR. If you do not have write access to the repository, you can ask Lightning-AI/lai-frameworks to re-run it. If you push a new commit, all of CI will re-trigger.

Groups summary

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

These checks are required after the changes to src/pytorch_lightning/callbacks/progress/base.py, src/pytorch_lightning/core/module.py, src/pytorch_lightning/loops/__init__.py, src/pytorch_lightning/loops/batch/__init__.py, src/pytorch_lightning/loops/batch/training_batch_loop.py, src/pytorch_lightning/loops/epoch/training_epoch_loop.py, src/pytorch_lightning/loops/fit_loop.py, src/pytorch_lightning/loops/loop.py, src/pytorch_lightning/loops/optimization/manual_loop.py, src/pytorch_lightning/loops/optimization/optimizer_loop.py, src/pytorch_lightning/loops/utilities.py, src/pytorch_lightning/trainer/configuration_validator.py, src/pytorch_lightning/trainer/connectors/logger_connector/logger_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/tuner/batch_size_scaling.py, src/pytorch_lightning/utilities/migration/migration.py, src/pytorch_lightning/utilities/migration/utils.py, tests/tests_pytorch/callbacks/progress/test_tqdm_progress_bar.py, tests/tests_pytorch/loops/batch/__init__.py, tests/tests_pytorch/loops/batch/test_truncated_bptt.py, tests/tests_pytorch/loops/epoch/test_training_epoch_loop.py, tests/tests_pytorch/loops/test_evaluation_loop_flow.py, tests/tests_pytorch/loops/test_loop_state_dict.py, tests/tests_pytorch/loops/test_loops.py, tests/tests_pytorch/loops/test_training_loop.py, tests/tests_pytorch/loops/test_training_loop_flow_scalar.py, tests/tests_pytorch/loops/test_utilities.py, tests/tests_pytorch/trainer/test_trainer.py, tests/tests_pytorch/utilities/migration/test_migration.py, tests/tests_pytorch/utilities/test_fetching.py.

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

These checks are required after the changes to src/pytorch_lightning/callbacks/progress/base.py, src/pytorch_lightning/core/module.py, src/pytorch_lightning/loops/__init__.py, src/pytorch_lightning/loops/batch/__init__.py, src/pytorch_lightning/loops/batch/training_batch_loop.py, src/pytorch_lightning/loops/epoch/training_epoch_loop.py, src/pytorch_lightning/loops/fit_loop.py, src/pytorch_lightning/loops/loop.py, src/pytorch_lightning/loops/optimization/manual_loop.py, src/pytorch_lightning/loops/optimization/optimizer_loop.py, src/pytorch_lightning/loops/utilities.py, src/pytorch_lightning/trainer/configuration_validator.py, src/pytorch_lightning/trainer/connectors/logger_connector/logger_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/tuner/batch_size_scaling.py, src/pytorch_lightning/utilities/migration/migration.py, src/pytorch_lightning/utilities/migration/utils.py, tests/tests_pytorch/callbacks/progress/test_tqdm_progress_bar.py, tests/tests_pytorch/loops/batch/__init__.py, tests/tests_pytorch/loops/batch/test_truncated_bptt.py, tests/tests_pytorch/loops/epoch/test_training_epoch_loop.py, tests/tests_pytorch/loops/test_evaluation_loop_flow.py, tests/tests_pytorch/loops/test_loop_state_dict.py, tests/tests_pytorch/loops/test_loops.py, tests/tests_pytorch/loops/test_training_loop.py, tests/tests_pytorch/loops/test_training_loop_flow_scalar.py, tests/tests_pytorch/loops/test_utilities.py, tests/tests_pytorch/trainer/test_trainer.py, tests/tests_pytorch/utilities/migration/test_migration.py, tests/tests_pytorch/utilities/test_fetching.py.

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

These checks are required after the changes to src/pytorch_lightning/callbacks/progress/base.py, src/pytorch_lightning/core/module.py, src/pytorch_lightning/loops/__init__.py, src/pytorch_lightning/loops/batch/__init__.py, src/pytorch_lightning/loops/batch/training_batch_loop.py, src/pytorch_lightning/loops/epoch/training_epoch_loop.py, src/pytorch_lightning/loops/fit_loop.py, src/pytorch_lightning/loops/loop.py, src/pytorch_lightning/loops/optimization/manual_loop.py, src/pytorch_lightning/loops/optimization/optimizer_loop.py, src/pytorch_lightning/loops/utilities.py, src/pytorch_lightning/trainer/configuration_validator.py, src/pytorch_lightning/trainer/connectors/logger_connector/logger_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/tuner/batch_size_scaling.py, src/pytorch_lightning/utilities/migration/migration.py, src/pytorch_lightning/utilities/migration/utils.py, tests/tests_pytorch/callbacks/progress/test_tqdm_progress_bar.py, tests/tests_pytorch/loops/batch/__init__.py, tests/tests_pytorch/loops/batch/test_truncated_bptt.py, tests/tests_pytorch/loops/epoch/test_training_epoch_loop.py, tests/tests_pytorch/loops/test_evaluation_loop_flow.py, tests/tests_pytorch/loops/test_loop_state_dict.py, tests/tests_pytorch/loops/test_loops.py, tests/tests_pytorch/loops/test_training_loop.py, tests/tests_pytorch/loops/test_training_loop_flow_scalar.py, tests/tests_pytorch/loops/test_utilities.py, tests/tests_pytorch/trainer/test_trainer.py, tests/tests_pytorch/utilities/migration/test_migration.py, tests/tests_pytorch/utilities/test_fetching.py.

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

These checks are required after the changes to src/pytorch_lightning/callbacks/progress/base.py, src/pytorch_lightning/core/module.py, src/pytorch_lightning/loops/__init__.py, src/pytorch_lightning/loops/batch/__init__.py, src/pytorch_lightning/loops/batch/training_batch_loop.py, src/pytorch_lightning/loops/epoch/training_epoch_loop.py, src/pytorch_lightning/loops/fit_loop.py, src/pytorch_lightning/loops/loop.py, src/pytorch_lightning/loops/optimization/manual_loop.py, src/pytorch_lightning/loops/optimization/optimizer_loop.py, src/pytorch_lightning/loops/utilities.py, src/pytorch_lightning/trainer/configuration_validator.py, src/pytorch_lightning/trainer/connectors/logger_connector/logger_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/tuner/batch_size_scaling.py, src/pytorch_lightning/utilities/migration/migration.py, src/pytorch_lightning/utilities/migration/utils.py, tests/tests_pytorch/callbacks/progress/test_tqdm_progress_bar.py, tests/tests_pytorch/loops/batch/__init__.py, tests/tests_pytorch/loops/batch/test_truncated_bptt.py, tests/tests_pytorch/loops/epoch/test_training_epoch_loop.py, tests/tests_pytorch/loops/test_evaluation_loop_flow.py, tests/tests_pytorch/loops/test_loop_state_dict.py, tests/tests_pytorch/loops/test_loops.py, tests/tests_pytorch/loops/test_training_loop.py, tests/tests_pytorch/loops/test_training_loop_flow_scalar.py, tests/tests_pytorch/loops/test_utilities.py, tests/tests_pytorch/trainer/test_trainer.py, tests/tests_pytorch/utilities/migration/test_migration.py, tests/tests_pytorch/utilities/test_fetching.py.

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

These checks are required after the changes to src/pytorch_lightning/callbacks/progress/base.py, src/pytorch_lightning/core/module.py, src/pytorch_lightning/loops/__init__.py, src/pytorch_lightning/loops/batch/__init__.py, src/pytorch_lightning/loops/batch/training_batch_loop.py, src/pytorch_lightning/loops/epoch/training_epoch_loop.py, src/pytorch_lightning/loops/fit_loop.py, src/pytorch_lightning/loops/loop.py, src/pytorch_lightning/loops/optimization/manual_loop.py, src/pytorch_lightning/loops/optimization/optimizer_loop.py, src/pytorch_lightning/loops/utilities.py, src/pytorch_lightning/trainer/configuration_validator.py, src/pytorch_lightning/trainer/connectors/logger_connector/logger_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/tuner/batch_size_scaling.py, src/pytorch_lightning/utilities/migration/migration.py, src/pytorch_lightning/utilities/migration/utils.py, docs/source-pytorch/api_references.rst, docs/source-pytorch/common/lightning_module.rst, docs/source-pytorch/common/trainer.rst, docs/source-pytorch/extensions/loops.rst, docs/source-pytorch/guides/data.rst.

🔴 lightning_app: Tests workflow
Check ID Status
app-pytest (macOS-11, app, 3.8, latest) cancelled 🚫
app-pytest (macOS-11, app, 3.8, oldest) cancelled 🚫
app-pytest (macOS-11, lightning, 3.9, latest) success
app-pytest (ubuntu-20.04, app, 3.8, latest) failure
app-pytest (ubuntu-20.04, app, 3.8, oldest) failure
app-pytest (ubuntu-20.04, lightning, 3.9, latest) success
app-pytest (windows-2022, app, 3.8, latest) failure
app-pytest (windows-2022, app, 3.8, oldest) failure
app-pytest (windows-2022, lightning, 3.8, latest) success

These checks are required after the changes to src/lightning_app/utilities/introspection.py, tests/tests_app/core/scripts/lightning_overrides.py, tests/tests_app/utilities/test_introspection.py.

🟢 lightning_app: Examples
Check ID Status
app-examples (macOS-11, app, 3.9, latest) success
app-examples (macOS-11, app, 3.9, oldest) success
app-examples (macOS-11, lightning, 3.9, latest) success
app-examples (ubuntu-20.04, app, 3.9, latest) success
app-examples (ubuntu-20.04, app, 3.9, oldest) success
app-examples (ubuntu-20.04, lightning, 3.9, latest) success
app-examples (windows-2022, app, 3.9, latest) success
app-examples (windows-2022, app, 3.9, oldest) success
app-examples (windows-2022, lightning, 3.9, latest) success

These checks are required after the changes to src/lightning_app/utilities/introspection.py.

🔴 lightning_app: Azure
Check ID Status
App.cloud-e2e failure

These checks are required after the changes to src/lightning_app/utilities/introspection.py.

🟢 lightning_app: Docs
Check ID Status
make-doctest (app) success
make-html (app) success

These checks are required after the changes to src/lightning_app/utilities/introspection.py.

🟢 mypy
Check ID Status
mypy success

These checks are required after the changes to src/lightning_app/utilities/introspection.py, src/pytorch_lightning/callbacks/progress/base.py, src/pytorch_lightning/core/module.py, src/pytorch_lightning/loops/__init__.py, src/pytorch_lightning/loops/batch/__init__.py, src/pytorch_lightning/loops/batch/training_batch_loop.py, src/pytorch_lightning/loops/epoch/training_epoch_loop.py, src/pytorch_lightning/loops/fit_loop.py, src/pytorch_lightning/loops/loop.py, src/pytorch_lightning/loops/optimization/manual_loop.py, src/pytorch_lightning/loops/optimization/optimizer_loop.py, src/pytorch_lightning/loops/utilities.py, src/pytorch_lightning/trainer/configuration_validator.py, src/pytorch_lightning/trainer/connectors/logger_connector/logger_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/tuner/batch_size_scaling.py, src/pytorch_lightning/utilities/migration/migration.py, src/pytorch_lightning/utilities/migration/utils.py.

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

These checks are required after the changes to src/lightning_app/utilities/introspection.py, src/pytorch_lightning/callbacks/progress/base.py, src/pytorch_lightning/core/module.py, src/pytorch_lightning/loops/__init__.py, src/pytorch_lightning/loops/batch/__init__.py, src/pytorch_lightning/loops/batch/training_batch_loop.py, src/pytorch_lightning/loops/epoch/training_epoch_loop.py, src/pytorch_lightning/loops/fit_loop.py, src/pytorch_lightning/loops/loop.py, src/pytorch_lightning/loops/optimization/manual_loop.py, src/pytorch_lightning/loops/optimization/optimizer_loop.py, src/pytorch_lightning/loops/utilities.py, src/pytorch_lightning/trainer/configuration_validator.py, src/pytorch_lightning/trainer/connectors/logger_connector/logger_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/tuner/batch_size_scaling.py, src/pytorch_lightning/utilities/migration/migration.py, src/pytorch_lightning/utilities/migration/utils.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 Jan 3, 2023
Copy link
Contributor

@carmocca carmocca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. But let's wait until the fabric rename lands before merging this

src/pytorch_lightning/utilities/migration/utils.py Outdated Show resolved Hide resolved
@mergify mergify bot added has conflicts and removed ready PRs ready to be merged labels Jan 4, 2023
@lantiga lantiga deleted the branch lite/debug January 5, 2023 07:07
@lantiga lantiga closed this Jan 5, 2023
@mergify mergify bot added ready PRs ready to be merged and removed ready PRs ready to be merged labels Jan 5, 2023
@mergify mergify bot removed the ready PRs ready to be merged label Jan 5, 2023
@awaelchli
Copy link
Contributor Author

How on earth am I going to rebase this.

@awaelchli awaelchli force-pushed the lite/debug-remove-tbptt branch from 12318ac to 4baf805 Compare January 6, 2023 00:41
@mergify mergify bot added ready PRs ready to be merged and removed has conflicts ready PRs ready to be merged labels Jan 6, 2023
@awaelchli awaelchli force-pushed the lite/debug-remove-tbptt branch from 4baf805 to 3e112bf Compare January 6, 2023 00:42
@mergify mergify bot added the ready PRs ready to be merged label Jan 6, 2023
@awaelchli awaelchli requested a review from carmocca January 6, 2023 20:49
Copy link
Contributor

@tchaton tchaton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM !

@awaelchli awaelchli enabled auto-merge (squash) January 9, 2023 12:08
@Borda
Copy link
Member

Borda commented Jan 10, 2023

@awaelchli this shall be fixed with #16302

@awaelchli
Copy link
Contributor Author

@Borda Nice! Thank you for jumping onto it

@awaelchli awaelchli merged commit 90a7b58 into lite/debug Jan 11, 2023
@awaelchli awaelchli deleted the lite/debug-remove-tbptt branch January 11, 2023 17:28
@carmocca carmocca restored the lite/debug-remove-tbptt branch January 11, 2023 17:39
@carmocca carmocca deleted the lite/debug-remove-tbptt branch January 11, 2023 17:49
@carmocca carmocca added this to the 2.0 milestone Jan 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready PRs ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants