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

simplify training phase as Enum #5419

Merged
merged 17 commits into from
Jan 13, 2021
Merged

simplify training phase as Enum #5419

merged 17 commits into from
Jan 13, 2021

Conversation

Borda
Copy link
Member

@Borda Borda commented Jan 8, 2021 •
edited
Loading

What does this PR do?

simplify the training phase logic
application in code will follow

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 update the CHANGELOG? (not for typos, docs, test updates, or internal minor changes/refactorings)

PR review

Anyone in the community is free to review the PR once the tests have passed.
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
  • Check that target branch and milestone match!

Did you have fun?

Make sure you had fun coding 🙃

@Borda Borda added the refactor label Jan 8, 2021
@Borda Borda added this to the 1.2 milestone Jan 8, 2021
@Borda Borda requested a review from awaelchli January 8, 2021 15:08
@Borda Borda self-assigned this Jan 8, 2021
@Borda Borda mentioned this pull request Jan 8, 2021
Merged
12 tasks
@carmocca
Copy link
Contributor

carmocca commented Jan 9, 2021

Can we unify this with LoggerStages?

Borda and others added 2 commits January 10, 2021 11:57
@Borda Borda requested a review from carmocca January 10, 2021 10:58
@Borda Borda marked this pull request as ready for review January 10, 2021 10:58
@codecov
Copy link

codecov bot commented Jan 10, 2021 •
edited
Loading

Codecov Report

Merging #5419 (aea5882) into release/1.2-dev (7e4d6cb) will increase coverage by 0%.
The diff coverage is 96%.

@@               Coverage Diff               @@
##           release/1.2-dev   #5419   +/-   ##
===============================================
  Coverage               93%     93%           
===============================================
  Files                  151     151           
  Lines                10617   10641   +24     
===============================================
+ Hits                  9835    9858   +23     
- Misses                 782     783    +1

carmocca
carmocca reviewed Jan 10, 2021
View reviewed changes
pytorch_lightning/trainer/deprecated_api.py Outdated Show resolved Hide resolved
pytorch_lightning/trainer/states.py Outdated Show resolved Hide resolved
pytorch_lightning/trainer/states.py Show resolved Hide resolved
@Borda Borda requested a review from carmocca January 10, 2021 17:45
@Borda Borda added the ready PRs ready to be merged label Jan 10, 2021
@Borda Borda enabled auto-merge (squash) January 10, 2021 18:17
tchaton
tchaton reviewed Jan 11, 2021
View reviewed changes
Copy link
Contributor

@tchaton tchaton left a comment

Choose a reason for hiding this comment

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

Great addition ! Let's use this to refactor LoggerConnector internal Stage.
Also, we should provided context manager or stage stack as we can run evaluation in training.

pytorch_lightning/trainer/states.py Show resolved Hide resolved
@Borda
Copy link
Member Author

Borda commented Jan 11, 2021

Great addition ! Let's use this to refactor LoggerConnector internal Stage.
Also, we should provided context manager or stage stack as we can run evaluation in training.

yes, that is my goal, but as it is widely requested we shall do these changes in smaller steps :]

@Borda Borda requested a review from tchaton January 11, 2021 12:23
@Borda
Copy link
Member Author

Borda commented Jan 11, 2021

@tchaton mind recheck...

awaelchli
awaelchli reviewed Jan 11, 2021
View reviewed changes
pytorch_lightning/trainer/states.py Outdated Show resolved Hide resolved
pytorch_lightning/trainer/deprecated_api.py Outdated Show resolved Hide resolved
@Borda Borda requested a review from awaelchli January 12, 2021 08:22
@Borda Borda merged commit 7449ce2 into release/1.2-dev Jan 13, 2021
@Borda Borda deleted the refactor/train-phase branch January 13, 2021 01:33
@Borda Borda mentioned this pull request Jan 13, 2021
Merged
3 tasks
Borda added a commit that referenced this pull request Jan 13, 2021
@Borda @carmocca
simplify training phase as Enum (#5419)
f989558 
* simplify training phase as Enum

* tests

* .

* .

* rename

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* rename

* flake8

Co-authored-by: Carlos Mocholí <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@s-rog s-rog s-rog approved these changes

@SkafteNicki SkafteNicki SkafteNicki approved these changes

@justusschock justusschock justusschock approved these changes

@tchaton tchaton tchaton approved these changes

@carmocca carmocca carmocca approved these changes

@SeanNaren SeanNaren Awaiting requested review from SeanNaren

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

@awaelchli awaelchli Awaiting requested review from awaelchli

Assignees

@Borda Borda

Labels
ready PRs ready to be merged refactor
Projects
None yet
Milestone
pl:1.2
Development

Successfully merging this pull request may close these issues.
7 participants
@Borda @carmocca @awaelchli @tchaton @justusschock @SkafteNicki @s-rog