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 special handling of loss in progress bar #16192

Merged
merged 16 commits into from
Jan 16, 2023

Conversation

awaelchli
Copy link
Contributor

@awaelchli awaelchli commented Dec 24, 2022

What does this PR do?

Fixes #9372
Fixes #15831
Fixes issue 2 in #15884

cc @Borda @carmocca

Does your PR introduce any breaking changes? If yes, please list them.

  • Removed loop.running_loss
  • Removed loop.accumulated_loss
  • Removed TensorRunningAccum class
  • Removed "loss" item being logged by default in progress bar

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 🙃

Did you have fun?

Make sure you had fun coding 🙃

@github-actions github-actions bot added the pl Generic label for PyTorch Lightning package label Dec 24, 2022
@awaelchli awaelchli force-pushed the lite/debug-remove-tbptt branch 2 times, most recently from 4baf805 to 3e112bf Compare January 6, 2023 00:42
Base automatically changed from lite/debug-remove-tbptt to lite/debug January 11, 2023 17:28
@awaelchli awaelchli force-pushed the lite/debug-remove-running-loss branch from 292fa2c to 00977f0 Compare January 13, 2023 09:23
@awaelchli awaelchli force-pushed the lite/debug-remove-running-loss branch from 63a458f to 67557c4 Compare January 13, 2023 09:34
@awaelchli awaelchli marked this pull request as ready for review January 13, 2023 09:51
@github-actions
Copy link
Contributor

github-actions bot commented Jan 13, 2023

⚡ Required checks status: All passing 🟢

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/loops/epoch/training_epoch_loop.py, src/pytorch_lightning/loops/fit_loop.py, src/pytorch_lightning/loops/optimization/optimizer_loop.py, src/pytorch_lightning/trainer/supporters.py, src/pytorch_lightning/tuner/lr_finder.py, tests/tests_pytorch/callbacks/progress/test_rich_progress_bar.py, tests/tests_pytorch/callbacks/progress/test_tqdm_progress_bar.py, tests/tests_pytorch/trainer/logging_/test_logger_connector.py, tests/tests_pytorch/trainer/logging_/test_progress_bar_logging.py, tests/tests_pytorch/trainer/test_supporters.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/loops/epoch/training_epoch_loop.py, src/pytorch_lightning/loops/fit_loop.py, src/pytorch_lightning/loops/optimization/optimizer_loop.py, src/pytorch_lightning/trainer/supporters.py, src/pytorch_lightning/tuner/lr_finder.py, tests/tests_pytorch/callbacks/progress/test_rich_progress_bar.py, tests/tests_pytorch/callbacks/progress/test_tqdm_progress_bar.py, tests/tests_pytorch/trainer/logging_/test_logger_connector.py, tests/tests_pytorch/trainer/logging_/test_progress_bar_logging.py, tests/tests_pytorch/trainer/test_supporters.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/loops/epoch/training_epoch_loop.py, src/pytorch_lightning/loops/fit_loop.py, src/pytorch_lightning/loops/optimization/optimizer_loop.py, src/pytorch_lightning/trainer/supporters.py, src/pytorch_lightning/tuner/lr_finder.py, tests/tests_pytorch/callbacks/progress/test_rich_progress_bar.py, tests/tests_pytorch/callbacks/progress/test_tqdm_progress_bar.py, tests/tests_pytorch/trainer/logging_/test_logger_connector.py, tests/tests_pytorch/trainer/logging_/test_progress_bar_logging.py, tests/tests_pytorch/trainer/test_supporters.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/loops/epoch/training_epoch_loop.py, src/pytorch_lightning/loops/fit_loop.py, src/pytorch_lightning/loops/optimization/optimizer_loop.py, src/pytorch_lightning/trainer/supporters.py, src/pytorch_lightning/tuner/lr_finder.py, tests/tests_pytorch/callbacks/progress/test_rich_progress_bar.py, tests/tests_pytorch/callbacks/progress/test_tqdm_progress_bar.py, tests/tests_pytorch/trainer/logging_/test_logger_connector.py, tests/tests_pytorch/trainer/logging_/test_progress_bar_logging.py, tests/tests_pytorch/trainer/test_supporters.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/loops/epoch/training_epoch_loop.py, src/pytorch_lightning/loops/fit_loop.py, src/pytorch_lightning/loops/optimization/optimizer_loop.py, src/pytorch_lightning/trainer/supporters.py, src/pytorch_lightning/tuner/lr_finder.py.

🟢 mypy
Check ID Status
mypy success

These checks are required after the changes to src/pytorch_lightning/callbacks/progress/base.py, src/pytorch_lightning/loops/epoch/training_epoch_loop.py, src/pytorch_lightning/loops/fit_loop.py, src/pytorch_lightning/loops/optimization/optimizer_loop.py, src/pytorch_lightning/trainer/supporters.py, src/pytorch_lightning/tuner/lr_finder.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/pytorch_lightning/callbacks/progress/base.py, src/pytorch_lightning/loops/epoch/training_epoch_loop.py, src/pytorch_lightning/loops/fit_loop.py, src/pytorch_lightning/loops/optimization/optimizer_loop.py, src/pytorch_lightning/trainer/supporters.py, src/pytorch_lightning/tuner/lr_finder.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.

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.

The description says "part of #9372". Doesn't this close it? What would be left?

src/lightning_fabric/CHANGELOG.md Outdated Show resolved Hide resolved
src/pytorch_lightning/callbacks/progress/base.py Outdated Show resolved Hide resolved
@awaelchli
Copy link
Contributor Author

The description says "part of #9372". Doesn't this close it? What would be left?

In this PR, I only intend to remove the moving average. The other item in the issue is about removing the loss from the progress bar. I think it's not something I want to do, maybe someone else could do it.

@carmocca carmocca force-pushed the lite/debug-remove-running-loss branch from 1ab4701 to 9aa71a2 Compare January 13, 2023 16:30
@carmocca
Copy link
Contributor

I think it's not something I want to do, maybe someone else could do it.

We are kind of "forced" to do it, because we cannot assume the key train_loss to get a loss as I commented above.

@github-actions github-actions bot removed the pl Generic label for PyTorch Lightning package label Jan 13, 2023
@awaelchli awaelchli changed the title Remove running loss computation Remove special handling of loss in progress bar Jan 14, 2023
@mergify mergify bot added ready PRs ready to be merged has conflicts and removed ready PRs ready to be merged labels Jan 16, 2023
@github-actions github-actions bot added the pl Generic label for PyTorch Lightning package label Jan 16, 2023
@awaelchli awaelchli enabled auto-merge (squash) January 16, 2023 11:01
@mergify mergify bot added ready PRs ready to be merged and removed has conflicts ready PRs ready to be merged labels Jan 16, 2023
@awaelchli awaelchli merged commit b3b9486 into lite/debug Jan 16, 2023
@awaelchli awaelchli deleted the lite/debug-remove-running-loss branch January 16, 2023 13:15
carmocca added a commit that referenced this pull request Jan 17, 2023
carmocca added a commit that referenced this pull request Jan 17, 2023
carmocca added a commit that referenced this pull request Jan 17, 2023
Borda pushed a commit that referenced this pull request Jan 18, 2023
@carmocca carmocca added this to the 2.0 milestone Jan 19, 2023
carmocca added a commit that referenced this pull request Jan 19, 2023
carmocca added a commit that referenced this pull request Jan 19, 2023
carmocca added a commit that referenced this pull request Jan 19, 2023
lantiga pushed a commit that referenced this pull request Jan 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pl Generic label for PyTorch Lightning package ready PRs ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants