Fix main progress bar counter when `val_check_interval=int` and `check_val_every_n_epoch=None` #12832

rohitgr7 · 2022-04-21T10:25:41Z

What does this PR do?

Add docs after Support val_check_interval values higher than number of training batches #11993
Fix the main progress bar for these cases
consider total batches processed instead of _batches_that_stepped for validation check.

point 3 was found during review in the PR, so I included that change here since it's not a big one. Let me know if it needs another PR. Will pull it out.

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

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 list all the breaking changes introduced by this pull request?
Did you update the CHANGELOG? (not for typos, docs, test updates, or minor internal changes/refactors)

PR review

Anyone in the community is welcome to review the PR.
Before you start reviewing, make sure you have read the 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?

Make sure you had fun coding 🙃

cc @Borda @rohitgr7 @carmocca @awaelchli @akihironitta

docs/source/common/trainer.rst

akihironitta

LGTM!

docs/source/common/trainer.rst

pytorch_lightning/trainer/trainer.py

codecov · 2022-07-20T09:42:32Z

Codecov Report

Merging #12832 (6fd7082) into master (c67b075) will decrease coverage by 10%.
The diff coverage is 100%.

@@            Coverage Diff            @@
##           master   #12832     +/-   ##
=========================================
- Coverage      86%      76%    -10%     
=========================================
  Files         327      327             
  Lines       25432    25600    +168     
=========================================
- Hits        21862    19487   -2375     
- Misses       3570     6113   +2543

docs/source-pytorch/common/trainer.rst

src/pytorch_lightning/trainer/trainer.py

tests/tests_pytorch/callbacks/progress/test_base_progress.py

src/pytorch_lightning/callbacks/progress/base.py

…k_val_every_n_epoch=None` (#12832)

* Rename GPUAccelerator to CUDAAccelerator * Add back GPUAccelerator and deprecate it * Remove temporary registration * accelerator connector reroute * accelerator_connector tests * update enums * lite support + tests * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * typo * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * move "gpu" support up before actual accelerator flag checks * Stupid arguments * fix tests * change exception type * fix registry test * pre-commit * CI: debug HPU flow (#13419) * Update the hpu-tests.yml to pull docker from vault * fire & sudo * habana-gaudi-hpus * Check the driver status on gaudi server (#13718) Co-authored-by: arao <arao@habana.ai> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Akarsha Rao <94624926+raoakarsha@users.noreply.github.com> * Update typing-extensions requirement from <4.2.1,>=4.0.0 to >=4.0.0,<4.3.1 in /requirements (#13529) Update typing-extensions requirement in /requirements Updates the requirements on [typing-extensions](https://github.com/python/typing_extensions) to permit the latest version. - [Release notes](https://github.com/python/typing_extensions/releases) - [Changelog](https://github.com/python/typing_extensions/blob/main/CHANGELOG.md) - [Commits](python/typing_extensions@4.0.0...4.3.0) --- updated-dependencies: - dependency-name: typing-extensions dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [pre-commit.ci] pre-commit suggestions (#13540) updates: - [github.com/psf/black: 22.3.0 → 22.6.0](psf/black@22.3.0...22.6.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * [FIX] Native FSDP precision + tests (#12985) * Simplify fetching's loader types (#13111) * Include app templates to the lightning and app packages (#13731) * Include app templates to the package Co-authored-by: mansy <mansy@lightning.ai> Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com> * Fix mypy typing errors in pytorch_lightning/callbacks/model_checkpoint.py (#13617) Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com> * Fix typos initialize in docs (#13557) Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com> Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com> * Fix main progress bar counter when `val_check_interval=int` and `check_val_every_n_epoch=None` (#12832) * Fix mypy errors attributed to `pytorch_lightning.loggers.tensorboard.py` (#13688) Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com> Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com> Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com> * Fix mypy errors attributed to `pytorch_lightning.loggers.mlflow` (#13691) Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> Co-authored-by: otaj <6065855+otaj@users.noreply.github.com> * fix mypy errors for loggers/wandb.py (#13483) Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com> Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com> Co-authored-by: Akihiro Nitta <nitta@akihironitta.com> * Fix gatekeeper minimum check (#13769) * changelog * changelog * fix order * move up again * add missing test Co-authored-by: rohitgr7 <rohitgr1998@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> Co-authored-by: arao <arao@habana.ai> Co-authored-by: Akarsha Rao <94624926+raoakarsha@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sean Naren <sean@grid.ai> Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com> Co-authored-by: Mansy <ahmed.mansy156@gmail.com> Co-authored-by: mansy <mansy@lightning.ai> Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com> Co-authored-by: Lee Jungwon <33821003+BongYang@users.noreply.github.com> Co-authored-by: Nathaniel D'Amours <88633026+NathanielDamours@users.noreply.github.com> Co-authored-by: Justin Goheen <26209687+JustinGoheen@users.noreply.github.com> Co-authored-by: otaj <6065855+otaj@users.noreply.github.com> Co-authored-by: Gautier Dagan <s2234411@ed.ac.uk> Co-authored-by: Akihiro Nitta <nitta@akihironitta.com>

rohitgr7 added the docs Documentation related label Apr 21, 2022

rohitgr7 added this to the 1.7 milestone Apr 21, 2022

rohitgr7 requested review from Borda, awaelchli, edenlightning, tchaton and williamFalcon as code owners April 21, 2022 10:25

rohitgr7 marked this pull request as draft April 21, 2022 10:28

awaelchli reviewed Apr 21, 2022

View reviewed changes

docs/source/common/trainer.rst Outdated Show resolved Hide resolved

akihironitta approved these changes May 4, 2022

View reviewed changes

docs/source/common/trainer.rst Outdated Show resolved Hide resolved

docs/source/common/trainer.rst Outdated Show resolved Hide resolved

pytorch_lightning/trainer/trainer.py Outdated Show resolved Hide resolved

carmocca assigned rohitgr7 May 10, 2022

rohitgr7 added 2 commits July 20, 2022 13:30

enhance docs for val_check_interval

0e5753c

fix main progress bar counter

138603c

rohitgr7 force-pushed the docs/val_check_interval branch from c15d70e to 138603c Compare July 20, 2022 09:14

github-actions bot added the pl Generic label for PyTorch Lightning package label Jul 20, 2022

rohitgr7 changed the title ~~Update docs for val_check_interval~~ Fix main progress bar counter when val_check_interval=int and check_val_every_n_epoch=None Jul 20, 2022

rohitgr7 added progress tracking (internal) Related to the progress tracking dataclasses bug Something isn't working labels Jul 20, 2022

chlog

d28e797

rohitgr7 marked this pull request as ready for review July 20, 2022 09:20

rohitgr7 requested review from Felonious-Spellfire, SeanNaren, justusschock and kaushikb11 as code owners July 20, 2022 09:20

carmocca reviewed Jul 20, 2022

View reviewed changes

rohitgr7 requested review from awaelchli and carmocca July 20, 2022 11:41

update logic and chlog

6fd7082

awaelchli approved these changes Jul 20, 2022

View reviewed changes

mergify bot added the ready PRs ready to be merged label Jul 20, 2022

carmocca approved these changes Jul 20, 2022

View reviewed changes

carmocca enabled auto-merge (squash) July 20, 2022 19:34

carmocca merged commit e451fa2 into master Jul 20, 2022

carmocca deleted the docs/val_check_interval branch July 20, 2022 20:33

justusschock pushed a commit that referenced this pull request Jul 21, 2022

Fix main progress bar counter when val_check_interval=int and `chec…

94cb590

…k_val_every_n_epoch=None` (#12832)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix main progress bar counter when `val_check_interval=int` and `check_val_every_n_epoch=None` #12832

Fix main progress bar counter when `val_check_interval=int` and `check_val_every_n_epoch=None` #12832

Uh oh!

rohitgr7 commented Apr 21, 2022 •

edited

Loading

Uh oh!

Uh oh!

akihironitta left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Jul 20, 2022 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Fix main progress bar counter when val_check_interval=int and check_val_every_n_epoch=None #12832

Fix main progress bar counter when val_check_interval=int and check_val_every_n_epoch=None #12832

Uh oh!

Conversation

rohitgr7 commented Apr 21, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

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

Before submitting

PR review

Did you have fun?

Uh oh!

Uh oh!

akihironitta left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Jul 20, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Fix main progress bar counter when `val_check_interval=int` and `check_val_every_n_epoch=None` #12832

Fix main progress bar counter when `val_check_interval=int` and `check_val_every_n_epoch=None` #12832

rohitgr7 commented Apr 21, 2022 •

edited

Loading

codecov bot commented Jul 20, 2022 •

edited

Loading