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

test_cpu and test_gpu EvalModelTemplate deprecation #4820

Merged

Conversation

gianscarpe
Copy link
Contributor

@gianscarpe gianscarpe commented Nov 23, 2020

What does this PR do?

This PR deprecates EvalModelTemplate and old pl APIs in favor of BoringModel in tests/models/test_cpu and tests/models/test_gpu . BoringModel is inherited in for test_tbptt in test_cpu. A dispatcher function guarantees EvalModelTemplate backward compatibility while completing the deprecation

Fixes # (issue)

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 your PR does only one thing, instead of bundling different changes together? Otherwise, we ask you to create a separate PR for every change.
  • Did you make sure to update the documentation with your changes?
  • Did you write any new necessary tests?
  • Did you verify new and existing tests pass locally with your changes?
  • If you made a notable change (that affects users), did you update the CHANGELOG?

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; Bugfixes should be including in bug-fix release milestones (m.f.X) and features should be included in (m.X.b) releases.

Did you have fun?

Absolutely!

@codecov
Copy link

codecov bot commented Nov 23, 2020

Codecov Report

Merging #4820 (707d820) into release/1.2-dev (8a40e80) will not change coverage.
The diff coverage is n/a.

@@               Coverage Diff               @@
##           release/1.2-dev   #4820   +/-   ##
===============================================
  Coverage               93%     93%           
===============================================
  Files                  146     146           
  Lines                10361   10361           
===============================================
  Hits                  9597    9597           
  Misses                 764     764           

@gianscarpe
Copy link
Contributor Author

First PR for refactoring tests and deprecating EvalModelTemplater is ready for review! 💯 @SeanNaren

@Borda Borda added the ci Continuous Integration label Nov 24, 2020
tests/base/boring_model.py Outdated Show resolved Hide resolved
tests/base/boring_model.py Outdated Show resolved Hide resolved
tests/base/boring_model.py Outdated Show resolved Hide resolved
tests/base/boring_model.py Outdated Show resolved Hide resolved
tests/base/develop_pipelines.py Outdated Show resolved Hide resolved
@rohitgr7
Copy link
Contributor

@gianscarpe it's not required to update the branch every time it gets out-of-date with the base :]

@pep8speaks
Copy link

pep8speaks commented Nov 24, 2020

Hello @gianscarpe! Thanks for updating this PR.

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2021-01-07 09:39:58 UTC

@gianscarpe gianscarpe requested review from Borda and rohitgr7 November 25, 2020 08:28
tests/base/boring_model.py Outdated Show resolved Hide resolved
tests/base/boring_model.py Outdated Show resolved Hide resolved
tests/base/develop_pipelines.py Outdated Show resolved Hide resolved
tests/base/develop_pipelines.py Outdated Show resolved Hide resolved
tests/base/develop_pipelines.py Show resolved Hide resolved
tests/models/test_cpu.py Outdated Show resolved Hide resolved
tests/models/test_cpu.py Show resolved Hide resolved
tests/models/test_cpu.py Outdated Show resolved Hide resolved
tests/models/test_cpu.py Outdated Show resolved Hide resolved
tests/models/test_cpu.py Outdated Show resolved Hide resolved
@gianscarpe gianscarpe requested a review from rohitgr7 November 26, 2020 15:00
@gianscarpe
Copy link
Contributor Author

Hi @Borda , @rohitgr7 I made the suggested changes and th PR is ready for review! Thanks :)

@Borda Borda added this to the 1.1.x milestone Nov 30, 2020
Copy link
Contributor

@rohitgr7 rohitgr7 left a comment

Choose a reason for hiding this comment

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

Just some more suggestions. Else LGTM.

tests/models/test_horovod.py Outdated Show resolved Hide resolved
tests/models/test_cpu.py Outdated Show resolved Hide resolved
tests/models/test_cpu.py Outdated Show resolved Hide resolved
tests/models/test_cpu.py Outdated Show resolved Hide resolved
tests/models/test_cpu.py Outdated Show resolved Hide resolved
tests/models/test_cpu.py Show resolved Hide resolved
tests/models/test_cpu.py Outdated Show resolved Hide resolved
tests/base/develop_pipelines.py Show resolved Hide resolved
@gianscarpe
Copy link
Contributor Author

@Borda Hi, I merged master branch and solved the issues :)

@gianscarpe
Copy link
Contributor Author

@rohitgr7 Thank you for the effort in reviewing my PR! I really appreciated it :)

@gianscarpe gianscarpe force-pushed the issue3827_test_gpu_and_cpu branch from b728f86 to 6423611 Compare January 5, 2021 09:46
pytorch_lightning/trainer/supporters.py Outdated Show resolved Hide resolved
@gianscarpe gianscarpe requested a review from Borda January 5, 2021 10:57
@Borda
Copy link
Member

Borda commented Jan 5, 2021

@tchaton mind re-review? ^^

@Borda Borda merged commit 7464aca into Lightning-AI:release/1.2-dev Jan 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci Continuous Integration ready PRs ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants