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

Merge load functions #995

Merged
merged 15 commits into from
Mar 3, 2020
Merged

Merge load functions #995

merged 15 commits into from
Mar 3, 2020

Conversation

awaelchli
Copy link
Contributor

@awaelchli awaelchli commented Mar 1, 2020

Before submitting

  • Was this discussed/approved via a Github issue? (no need for typos, doc improvements)
  • Did you read the contributor guideline?
  • 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?

Implements #994

Changes:

  • Added optional argument tags_csv to LightningModule.load_from_checkpoint.
  • Made load_from_metrics deprecated
  • Updated documentation
  • Updated tests

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 🙃

@pep8speaks
Copy link

pep8speaks commented Mar 1, 2020

Hello @awaelchli! Thanks for updating this PR.

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

Comment last updated at 2020-03-03 01:35:43 UTC

@awaelchli awaelchli changed the title Merge load fn Merge load_from_metrics into load_from_checkpoint Mar 1, 2020
@awaelchli awaelchli changed the title Merge load_from_metrics into load_from_checkpoint Merge load functions Mar 1, 2020
@Borda Borda added the feature Is an improvement or enhancement label Mar 2, 2020
pytorch_lightning/core/lightning.py Outdated Show resolved Hide resolved
pytorch_lightning/core/lightning.py Show resolved Hide resolved
williamFalcon and others added 3 commits March 1, 2020 22:41
* Use callable object for patching dataloaders

* Add test for ddp with dataloaders passed to fit()

* Update pytorch_lightning/trainer/trainer.py

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

* Update pytorch_lightning/trainer/trainer.py

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

Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>
@williamFalcon
Copy link
Contributor

is this good?
Last PR that isn't docs for this release :)

@Borda
Copy link
Member

Borda commented Mar 2, 2020

It is waiting for #946 @awaelchli right?

@awaelchli
Copy link
Contributor Author

no, for me it doesn't matter which one is merged first :)

Copy link
Member

@Borda Borda left a comment

Choose a reason for hiding this comment

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

Pls update CHANGELOG, then it is ready...
Anyway that for the suggestion and so quick implementation 🚀

Copy link
Member

@Borda Borda left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

@Borda Borda added the ready PRs ready to be merged label Mar 2, 2020
@Borda Borda added this to the 0.7.0 milestone Mar 2, 2020
@williamFalcon williamFalcon merged commit 5458d05 into Lightning-AI:master Mar 3, 2020
@awaelchli awaelchli deleted the merge_load_fn branch March 7, 2020 11:10
tullie pushed a commit to tullie/pytorch-lightning that referenced this pull request Apr 3, 2020
* Update README.md

* Update README.md

* Use callable object for patching dataloaders (Lightning-AI#971)

* Use callable object for patching dataloaders

* Add test for ddp with dataloaders passed to fit()

* Update pytorch_lightning/trainer/trainer.py

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

* Update pytorch_lightning/trainer/trainer.py

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

Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>

* merge load functions

* update tests

* fix documentation warnings

* fix line too long

* fix line too long

* print deprecation warning

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

* move tags_csv argument to end of signature

* fix typo, update version numbers

* fix line too long

* add typing as requested

* update changelog

Co-authored-by: William Falcon <waf2107@columbia.edu>
Co-authored-by: Sho Arora <sho854@gmail.com>
Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>
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.

5 participants