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

Use the local batch_idx to update the progress bar #16760

Merged

carmocca merged 4 commits into master from refactor/pbar-use-batch-idx

Feb 16, 2023

Contributor

carmocca commented Feb 15, 2023 •

edited

Loading

What does this PR do?

Part of #16726. That PR will require using these over the progress tracking values.

The unused batch_idx properties are removed.

Fixes #12901

cc @justusschock @awaelchli @Borda


          Use the local batch_idx to update the progress bar

82ff7a9

carmocca added refactor breaking change progress bar: rich progress bar: tqdm labels

carmocca added this to the 2.0 milestone

carmocca self-assigned this

github-actions bot added the pl label


          CHANGELOG

5f7ee30

carmocca marked this pull request as ready for review

February 15, 2023 04:38

carmocca requested review from williamFalcon, awaelchli and justusschock as code owners

February 15, 2023 04:38

Contributor

github-actions bot commented Feb 15, 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/progress/base.py, src/lightning/pytorch/callbacks/progress/rich_progress.py, src/lightning/pytorch/callbacks/progress/tqdm_progress.py.

🟢 pytorch_lightning: Azure GPU

Check ID	Status
pytorch-lightning (GPUs)	success	✅

These checks are required after the changes to src/lightning/pytorch/callbacks/progress/base.py, src/lightning/pytorch/callbacks/progress/rich_progress.py, src/lightning/pytorch/callbacks/progress/tqdm_progress.py.

🟢 pytorch_lightning: Azure HPU

Check ID	Status
pytorch-lightning (HPUs)	success	✅

These checks are required after the changes to src/lightning/pytorch/callbacks/progress/base.py, src/lightning/pytorch/callbacks/progress/rich_progress.py, src/lightning/pytorch/callbacks/progress/tqdm_progress.py.

🟢 pytorch_lightning: Azure IPU

Check ID	Status
pytorch-lightning (IPUs)	success	✅

These checks are required after the changes to src/lightning/pytorch/callbacks/progress/base.py, src/lightning/pytorch/callbacks/progress/rich_progress.py, src/lightning/pytorch/callbacks/progress/tqdm_progress.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/progress/base.py, src/lightning/pytorch/callbacks/progress/rich_progress.py, src/lightning/pytorch/callbacks/progress/tqdm_progress.py.

🟢 mypy

Check ID	Status
mypy	success	✅

These checks are required after the changes to src/lightning/pytorch/callbacks/progress/base.py, src/lightning/pytorch/callbacks/progress/rich_progress.py, src/lightning/pytorch/callbacks/progress/tqdm_progress.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/progress/base.py, src/lightning/pytorch/callbacks/progress/rich_progress.py, src/lightning/pytorch/callbacks/progress/tqdm_progress.py.

🟢 link-check

Check ID	Status
markdown-link-check	success	✅

These checks are required after the changes to src/lightning/pytorch/CHANGELOG.md.

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.


          Update

e114bac

awaelchli reviewed

View reviewed changes

src/lightning/pytorch/callbacks/progress/rich_progress.py Show resolved Hide resolved

src/lightning/pytorch/callbacks/progress/tqdm_progress.py Show resolved Hide resolved


          Merge branch 'master' into refactor/pbar-use-batch-idx

e08c386

awaelchli approved these changes

View reviewed changes

justusschock approved these changes

View reviewed changes

mergify bot added the ready label

carmocca merged commit f6cad32 into master

carmocca deleted the refactor/pbar-use-batch-idx branch

February 16, 2023 14:08

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

breaking change pl progress bar: rich progress bar: tqdm ready refactor