Simplify progress bar args #1108

gerardrbentley · 2020-03-10T00:53:17Z

Before submitting

Was this discussed/approved via a Github issue? (no need for typos and docs improvements)
Did you read the contributor guideline, Pull Request section?
Did you make sure to update the docs?
Did you write any new necessary tests?
If you made a notable change (that affects users), did you update the CHANGELOG?

What does this PR do?

Fixes #1102 suggestion to collapse show_progress_bar into progress_bar_refresh_rate

Adds show_progress_bar to "to be deprecated" Trainer args (unsure on best approach here for community)

Removes show_progress_bar from tests that used it

PR review

Anyone in the community is free to review the PR once the tests have passed.
If we didn't discuss your PR in Github issues there's a high chance it will not be merged.

Did you have fun?

Make sure you had fun coding 🙃
Learned some Git 🙃

pep8speaks · 2020-03-10T00:53:24Z

Hello @gerardrbentley! Thanks for updating this PR.

In the file pytorch_lightning/trainer/distrib_data_parallel.py:

Line 284:111: E501 line too long (118 > 110 characters)

In the file pytorch_lightning/trainer/distrib_parts.py:

Line 483:111: E501 line too long (112 > 110 characters)

In the file pytorch_lightning/trainer/trainer.py:

Line 171:111: E501 line too long (119 > 110 characters)

Comment last updated at 2020-04-02 22:32:08 UTC

Borda · 2020-03-11T20:41:42Z

hey there, we have added GPU CI test, so could we kindly ask to rebase/merge master which will trigger these tests so we do not need to test it manually... Thx for your understanding 🤖

Borda

Thx for taking care of this change, here are some todos to be completed:

update changelog
could we kindly ask to rebase/merge master

pytorch_lightning/trainer/__init__.py

pytorch_lightning/trainer/trainer.py

tests/test_deprecated.py

tests/trainer/test_trainer.py

gerardrbentley · 2020-03-14T01:56:15Z

Adding your suggestions right now

gerardrbentley · 2020-03-14T02:20:36Z

Forget to add a commit for Changelog, @Borda should I add that on this PR or is there a different way the changelog is updated? (Sorry, new to contributing)

EDIT
Seems like other changelog updates aren't generally batched so I added it here

Borda · 2020-03-14T08:00:52Z

Forget to add a commit for Changelog, @Borda should I add that on this PR or is there a different way the changelog is updated? (Sorry, new to contributing)

It is kind of responsibility to edit the changelog along with the change in a particular PR
Btw, it is in the PR template - Before submitting ;)

mergify · 2020-03-24T18:51:29Z

This pull request is now in conflict... :(

codecov · 2020-03-24T20:00:25Z

Codecov Report

❗ No coverage uploaded for pull request base (master@724b787). Click here to learn what that means.
The diff coverage is n/a.

@@           Coverage Diff            @@
##             master   #1108   +/-   ##
========================================
  Coverage          ?     91%           
========================================
  Files             ?      61           
  Lines             ?    3153           
  Branches          ?       0           
========================================
  Hits              ?    2880           
  Misses            ?     273           
  Partials          ?       0

Borda · 2020-03-24T23:40:18Z

@gerardrbentley how is it going? could you please rebase on master so it is clear what are the changes...

gerardrbentley · 2020-03-25T00:09:16Z

@Borda Hopefully done. Rebased and I think I cut down all the erroneous things I tried today in my git log.

Apologies, definitely made some errors around the flake8 checking and autopep8 -v -r --max-line-length 120 --in-place . command.

Borda

pls move the deprecated attributes to deprecated API

pytorch_lightning/trainer/trainer.py

pytorch_lightning/trainer/training_loop.py

mergify · 2020-03-25T11:47:21Z

This pull request is now in conflict... :(

mergify · 2020-03-27T13:23:47Z

This pull request is now in conflict... :(

mergify · 2020-04-02T16:21:34Z

This pull request is now in conflict... :(

CHANGELOG.md

pytorch_lightning/trainer/__init__.py

Co-Authored-By: Jirka Borovec <Borda@users.noreply.github.com>

CHANGELOG.md

tests/models/test_amp.py

Borda · 2020-04-02T20:29:34Z

some issues with GitHub, need to accept commits...

gerardrbentley

Trying to Commit Suggestions, but it's telling me the diff is outdated

Co-Authored-By: Jirka Borovec <Borda@users.noreply.github.com>

Borda

LGTM 🚀

gerardrbentley · 2020-04-02T21:55:41Z

I think I might have missed that /test_amp.py fix. Bulk commit suggestions didn't work and only one went through I believe

ethanwharris

LGTM :)

Borda · 2020-04-02T22:11:35Z

Trying to Commit Suggestions, but it's telling me the diff is outdated

there was as incident recently... https://www.githubstatus.com/

pytorch_lightning/trainer/__init__.py

pytorch_lightning/trainer/trainer.py

* show progress bar dependent on refresh_rate * test progress_bar_refresh control show bar * remove show_progress_bar from other tests * borda fixes * flake8 fix * changelog update prog bar refresh rate * move show_progress_bar to deprecated 0.9 api * rm show_progress_bar references, test deprecated * Update pytorch_lightning/trainer/__init__.py * fix test * changelog * minor CHANGELOG.md format * Update pytorch_lightning/trainer/__init__.py * Update pytorch_lightning/trainer/trainer.py Co-authored-by: Gerard Bentley <gbkh2015@mymail.pomona.edu> Co-authored-by: William Falcon <waf2107@columbia.edu> Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> Co-authored-by: J. Borovec <jirka.borovec@seznam.cz>

Borda requested changes Mar 12, 2020

View reviewed changes

Borda added the feature Is an improvement or enhancement label Mar 13, 2020

Borda added this to the 0.7.2 milestone Mar 13, 2020

gerardrbentley force-pushed the simplify_progbar_arg branch from 0b84ec0 to ffe7595 Compare March 14, 2020 02:15

gerardrbentley force-pushed the simplify_progbar_arg branch from 9fc6f82 to bedb285 Compare March 25, 2020 00:05

Borda requested changes Mar 25, 2020

View reviewed changes

Gerard Bentley added 7 commits March 26, 2020 12:02

show progress bar dependent on refresh_rate

18018b3

test progress_bar_refresh control show bar

ee7338f

remove show_progress_bar from other tests

e6672b4

borda fixes

0948b36

flake8 fix

ced1994

changelog update prog bar refresh rate

cc48912

move show_progress_bar to deprecated 0.9 api

be80603

gerardrbentley force-pushed the simplify_progbar_arg branch from db9dcdf to be80603 Compare March 26, 2020 19:04

rm show_progress_bar references, test deprecated

4251c9e

mergify bot requested a review from a team March 30, 2020 22:33

Merge branch 'master' into simplify_progbar_arg

024e24c

williamFalcon added the ready PRs ready to be merged label Apr 2, 2020

williamFalcon approved these changes Apr 2, 2020

View reviewed changes

Borda requested a review from a team April 2, 2020 16:02

Borda requested changes Apr 2, 2020

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

CHANGELOG.md Show resolved Hide resolved

CHANGELOG.md Outdated Show resolved Hide resolved

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

williamFalcon and others added 2 commits April 2, 2020 13:53

Update pytorch_lightning/trainer/__init__.py

bec0a54

Co-Authored-By: Jirka Borovec <Borda@users.noreply.github.com>

Merge branch 'master' into simplify_progbar_arg

ddc4888

mergify bot requested a review from a team April 2, 2020 18:55

fix test

a8fd323

Borda reviewed Apr 2, 2020

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

CHANGELOG.md Outdated Show resolved Hide resolved

tests/models/test_amp.py Outdated Show resolved Hide resolved

changelog

8c5b505

gerardrbentley commented Apr 2, 2020

View reviewed changes

minor CHANGELOG.md format

54282ca

Co-Authored-By: Jirka Borovec <Borda@users.noreply.github.com>

Borda approved these changes Apr 2, 2020

View reviewed changes

Borda requested a review from a team April 2, 2020 21:53

ethanwharris approved these changes Apr 2, 2020

View reviewed changes

Borda reviewed Apr 2, 2020

View reviewed changes

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

Update pytorch_lightning/trainer/__init__.py

d8f1e85

Borda reviewed Apr 2, 2020

View reviewed changes

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

Update pytorch_lightning/trainer/trainer.py

3a9456d

Borda merged commit f33b5a8 into Lightning-AI:master Apr 2, 2020

Borda modified the milestones: v0.7., v0.7.x Apr 18, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Simplify progress bar args #1108

Simplify progress bar args #1108

gerardrbentley commented Mar 10, 2020 •

edited

Loading

pep8speaks commented Mar 10, 2020 •

edited

Loading

Borda commented Mar 11, 2020

Borda left a comment •

edited

Loading

gerardrbentley commented Mar 14, 2020

gerardrbentley commented Mar 14, 2020 •

edited

Loading

Borda commented Mar 14, 2020 •

edited

Loading

mergify bot commented Mar 24, 2020

codecov bot commented Mar 24, 2020 •

edited

Loading

Borda commented Mar 24, 2020

gerardrbentley commented Mar 25, 2020 •

edited

Loading

Borda left a comment

mergify bot commented Mar 25, 2020

mergify bot commented Mar 27, 2020

mergify bot commented Apr 2, 2020

Borda commented Apr 2, 2020

gerardrbentley left a comment

Borda left a comment

gerardrbentley commented Apr 2, 2020

ethanwharris left a comment

Borda commented Apr 2, 2020

Simplify progress bar args #1108

Simplify progress bar args #1108

Conversation

gerardrbentley commented Mar 10, 2020 • edited Loading

Before submitting

What does this PR do?

PR review

Did you have fun?

pep8speaks commented Mar 10, 2020 • edited Loading

Comment last updated at 2020-04-02 22:32:08 UTC

Borda commented Mar 11, 2020

Borda left a comment • edited Loading

Choose a reason for hiding this comment

gerardrbentley commented Mar 14, 2020

gerardrbentley commented Mar 14, 2020 • edited Loading

Borda commented Mar 14, 2020 • edited Loading

mergify bot commented Mar 24, 2020

codecov bot commented Mar 24, 2020 • edited Loading

Codecov Report

Borda commented Mar 24, 2020

gerardrbentley commented Mar 25, 2020 • edited Loading

Borda left a comment

Choose a reason for hiding this comment

mergify bot commented Mar 25, 2020

mergify bot commented Mar 27, 2020

mergify bot commented Apr 2, 2020

Borda commented Apr 2, 2020

gerardrbentley left a comment

Choose a reason for hiding this comment

Borda left a comment

Choose a reason for hiding this comment

gerardrbentley commented Apr 2, 2020

ethanwharris left a comment

Choose a reason for hiding this comment

Borda commented Apr 2, 2020

gerardrbentley commented Mar 10, 2020 •

edited

Loading

pep8speaks commented Mar 10, 2020 •

edited

Loading

Borda left a comment •

edited

Loading

gerardrbentley commented Mar 14, 2020 •

edited

Loading

Borda commented Mar 14, 2020 •

edited

Loading

codecov bot commented Mar 24, 2020 •

edited

Loading

gerardrbentley commented Mar 25, 2020 •

edited

Loading