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

Improvements for rich progress bar #9559

Merged
merged 5 commits into from
Sep 16, 2021
Merged

Conversation

SeanNaren
Copy link
Contributor

@SeanNaren SeanNaren commented Sep 16, 2021

What does this PR do?

Fixes #9547

Introduces a theme dataclass to control the styles, fix keyboard interrupts and sets defaults to style like the linked issue.

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 internal minor changes/refactorings)

PR review

Anyone in the community is welcome to review the PR.
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?

Make sure you had fun coding 🙃

@SeanNaren SeanNaren added the feature Is an improvement or enhancement label Sep 16, 2021
@SeanNaren SeanNaren added this to the v1.5 milestone Sep 16, 2021
@SeanNaren SeanNaren self-assigned this Sep 16, 2021
@SeanNaren SeanNaren changed the title Improvements for rich progress Improvements for rich progress bar Sep 16, 2021
@SeanNaren SeanNaren enabled auto-merge (squash) September 16, 2021 13:00
Copy link
Member

@ethanwharris ethanwharris left a comment

Choose a reason for hiding this comment

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

Love this!

@mergify mergify bot added the ready PRs ready to be merged label Sep 16, 2021
Copy link
Contributor

@kaushikb11 kaushikb11 left a comment

Choose a reason for hiding this comment

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

Thanks Sean!

Co-authored-by: Adrian Wälchli <[email protected]>
@codecov
Copy link

codecov bot commented Sep 16, 2021

Codecov Report

Merging #9559 (0ffc848) into master (e2eb832) will decrease coverage by 4%.
The diff coverage is 97%.

@@           Coverage Diff           @@
##           master   #9559    +/-   ##
=======================================
- Coverage      93%     89%    -4%     
=======================================
  Files         180     180            
  Lines       15110   15117     +7     
=======================================
- Hits        14036   13429   -607     
- Misses       1074    1688   +614     

@SeanNaren SeanNaren merged commit 45200fc into master Sep 16, 2021
@SeanNaren SeanNaren deleted the feat/rich_feat_improvements branch September 16, 2021 21:12
Comment on lines -80 to +108
STYLES: Dict[str, str] = {
"train": "red",
"sanity_check": "yellow",
"validate": "yellow",
"test": "yellow",
"predict": "yellow",
}
@dataclass
class RichProgressBarTheme:
"""Styles to associate to different base components.

https://rich.readthedocs.io/en/stable/style.html
"""

text_color: str = "white"
progress_bar_complete: Union[str, Style] = "#6206E0"
progress_bar_finished: Union[str, Style] = "#6206E0"
batch_process: str = "white"
time: str = "grey54"
processing_speed: str = "grey70"
Copy link
Contributor

Choose a reason for hiding this comment

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

@SeanNaren @kaushikb11

noob question: Why did we introduce this new class RichProgressBarTheme and pass an instance to RichProgressBar? I'm asking because if we didn't have this class and passed colours (or a dictionary of colours) directly to RichProgressBar, colour customisation would be easier for users in my opinion. (One less thing to remember :])

from pytorch_lightning.callbacks import RichProgressBar
-from pytorch_lightning.callbacks.progress.rich_progress import RichProgressBarTheme

progress_bar = RichProgressBar(
-    theme=RichProgressBarTheme(
        description="green_yellow",
        progress_bar="green1",
        progress_bar_finished="green1",
        batch_progress="green_yellow",
        time="grey82",
        processing_speed="grey82",
        metrics="grey82",
-    )
)

FYI, I'm looking at the example in the blog post: https://devblog.pytorchlightning.ai/super-charged-progress-bars-with-rich-lightning-669653d6ab97

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature Is an improvement or enhancement ready PRs ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Improve the Rich Progress Bar
6 participants