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

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

Merged
merged 4 commits into from
Jul 20, 2022
Merged

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

merged 4 commits into from
Jul 20, 2022

Conversation

rohitgr7
Copy link
Contributor

@rohitgr7 rohitgr7 commented Apr 21, 2022 •
edited
Loading

What does this PR do?

  1. Add docs after Support val_check_interval values higher than number of training batches  #11993
  2. Fix the main progress bar for these cases
  3. 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

@rohitgr7 rohitgr7 added the docs Documentation related label Apr 21, 2022
@rohitgr7 rohitgr7 added this to the 1.7 milestone Apr 21, 2022
@rohitgr7 rohitgr7 marked this pull request as draft April 21, 2022 10:28
akihironitta
akihironitta approved these changes May 4, 2022
View reviewed changes
Copy link
Contributor

@akihironitta akihironitta left a comment

Choose a reason for hiding this comment

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

LGTM!

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
@rohitgr7 rohitgr7 force-pushed the docs/val_check_interval branch from c15d70e to 138603c Compare July 20, 2022 09:14
@github-actions github-actions bot added the pl Generic label for PyTorch Lightning package label Jul 20, 2022
@rohitgr7 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 rohitgr7 added progress tracking (internal) Related to the progress tracking dataclasses bug Something isn't working labels Jul 20, 2022
@rohitgr7 rohitgr7 marked this pull request as ready for review July 20, 2022 09:20
@codecov
Copy link

codecov bot commented Jul 20, 2022 •
edited
Loading

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

carmocca
carmocca reviewed Jul 20, 2022
View reviewed changes
docs/source-pytorch/common/trainer.rst Outdated Show resolved Hide resolved
docs/source-pytorch/common/trainer.rst Outdated Show resolved Hide resolved
src/pytorch_lightning/trainer/trainer.py Outdated Show resolved Hide resolved
tests/tests_pytorch/callbacks/progress/test_base_progress.py Outdated Show resolved Hide resolved
src/pytorch_lightning/callbacks/progress/base.py Outdated Show resolved Hide resolved
src/pytorch_lightning/callbacks/progress/base.py Outdated Show resolved Hide resolved
@rohitgr7 rohitgr7 requested review from carmocca and awaelchli July 20, 2022 11:41
@mergify mergify bot added the ready PRs ready to be merged label Jul 20, 2022
@carmocca carmocca enabled auto-merge (squash) July 20, 2022 19:34
@carmocca carmocca merged commit e451fa2 into master Jul 20, 2022
@carmocca 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
@rohitgr7 @justusschock
Fix main progress bar counter when val_check_interval=int and `chec…
94cb590 
…k_val_every_n_epoch=None` (#12832)
justusschock added a commit that referenced this pull request Jul 25, 2022
@justusschock @rohitgr7
@pre-commit-ci @Borda @raoakarsha @dependabot @carmocca @manskx @awaelchli @Jungwon-Lee @NathanielDamours @jxtngx @otaj @gautierdag @akihironitta
Merge different gpu backends with accelerator='gpu' (#13642)
2278719 
* 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 <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Akarsha Rao <[email protected]>

* 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] <[email protected]>

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 <[email protected]>
Co-authored-by: Adrian Wälchli <[email protected]>

* Fix mypy typing errors in pytorch_lightning/callbacks/model_checkpoint.py (#13617)

Co-authored-by: Carlos Mocholí <[email protected]>

* Fix typos initialize in docs (#13557)


Co-authored-by: Carlos Mocholí <[email protected]>
Co-authored-by: Adrian Wälchli <[email protected]>

* 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 <[email protected]>
Co-authored-by: Rohit Gupta <[email protected]>
Co-authored-by: Carlos Mocholí <[email protected]>

* Fix mypy errors attributed to `pytorch_lightning.loggers.mlflow` (#13691)

Co-authored-by: Jirka Borovec <[email protected]>
Co-authored-by: otaj <[email protected]>

* fix mypy errors for loggers/wandb.py (#13483)


Co-authored-by: Carlos Mocholí <[email protected]>
Co-authored-by: Rohit Gupta <[email protected]>
Co-authored-by: Akihiro Nitta <[email protected]>

* Fix gatekeeper minimum check (#13769)

* changelog

* changelog

* fix order

* move up again

* add missing test

Co-authored-by: rohitgr7 <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Jirka Borovec <[email protected]>
Co-authored-by: arao <[email protected]>
Co-authored-by: Akarsha Rao <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sean Naren <[email protected]>
Co-authored-by: Carlos Mocholí <[email protected]>
Co-authored-by: Mansy <[email protected]>
Co-authored-by: mansy <[email protected]>
Co-authored-by: Adrian Wälchli <[email protected]>
Co-authored-by: Lee Jungwon <[email protected]>
Co-authored-by: Nathaniel D'Amours <[email protected]>
Co-authored-by: Justin Goheen <[email protected]>
Co-authored-by: otaj <[email protected]>
Co-authored-by: Gautier Dagan <[email protected]>
Co-authored-by: Akihiro Nitta <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akihironitta akihironitta akihironitta approved these changes

@carmocca carmocca carmocca approved these changes

@awaelchli awaelchli awaelchli approved these changes

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

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

@edenlightning edenlightning Awaiting requested review from edenlightning

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

@kaushikb11 kaushikb11 Awaiting requested review from kaushikb11

@Felonious-Spellfire Felonious-Spellfire Awaiting requested review from Felonious-Spellfire

@SeanNaren SeanNaren Awaiting requested review from SeanNaren

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

Assignees

@rohitgr7 rohitgr7

Labels
bug Something isn't working docs Documentation related pl Generic label for PyTorch Lightning package progress tracking (internal) Related to the progress tracking dataclasses ready PRs ready to be merged
Projects
None yet
Milestone
pl:1.7
Development

Successfully merging this pull request may close these issues.
4 participants
@rohitgr7 @awaelchli @carmocca @akihironitta