sync 1.1.4 >> feature 1.2 [full merge, no squash] by SeanNaren · Pull Request #5483 · Lightning-AI/pytorch-lightning

SeanNaren · 2021-01-12T13:05:49Z

What does this PR do?

Update release branch with latest commits from master.

Fixes # (issue) <- this links related issue to this PR

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 · 2021-01-12T20:05:35Z

pls, do not merge the target branch, this shall be always rebase only...

SeanNaren · 2021-01-12T20:19:55Z

pls, do not merge the target branch, this shall be always rebase only...

Should I drop the commits/merge?

Borda · 2021-01-12T20:41:45Z

pls, do not merge the target branch, this shall be always rebase only...

Should I drop the commits/merge?

I would say yes, otherwise, it can bite us later when merging mack to master
(if we would do squash-merge as all other PRs then this merge does not matter but with full merge, it can be a problem)

SeanNaren · 2021-01-12T20:54:14Z

Done @Borda, just did a rebase on top of the 1.2-dev branch.

CHANGELOG.md

pytorch_lightning/utilities/package_utils.py

pytorch_lightning/utilities/parsing.py

SeanNaren · 2021-01-19T22:17:08Z

@carmocca is setting up a new PR with 1.1.5 changes as well.

(cherry picked from commit 4c6f36e)

* wip * generate * clean * tests * copy * download * download * download * download * download * download * download * download * download * download * download * flake8 * extend * aws * extension * pull * pull * pull * pull * pull * pull * pull * try * try * try * got it * Apply suggestions from code review (cherry picked from commit 72525f0)

(cherry picked from commit 019e4ff)

* hacking out * update * remove useless on_before_forward * update * remove overriden * iremove os * use on_before_forward * resolve flake8 * add test * update * add single_process_per_device * resolve flake8 * update * resolve * update * update * update * add comment * resolve bug with sharded * update * remove property * update * resolve test * resolve bug * update on comments * update doc * Update pytorch_lightning/core/hooks.py Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com> * update on comments * Update pytorch_lightning/plugins/ddp_plugin.py Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com> * Update pytorch_lightning/plugins/ddp_plugin.py Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com> * resolve pep8 * add device_ids to pipe * update on comments * update * resolve * update * update * update Co-authored-by: Ubuntu <ubuntu@ip-172-31-62-109.ec2.internal> Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com> Co-authored-by: Sean Naren <sean.narenthiran@gmail.com> (cherry picked from commit d510707)

…5417) * resolve bug * resolve tests * update * Update tests/loggers/test_tensorboard.py Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com> Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com> (cherry picked from commit a053d75)

* GH action - label conflicts * . * trigger * trigger * . (cherry picked from commit f1e28d1)

* fixed docs in lightning.py * few more Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com> Co-authored-by: Nicki Skafte <skaftenicki@gmail.com> (cherry picked from commit 499d503)

* GH action - auto-update PRs * . (cherry picked from commit 92bbf2f)

* add automatic optimization property setter to lightning module * Update test_manual_optimization.py Co-authored-by: chaton <thomas@grid.ai> (cherry picked from commit 8748293)

* populate some more legacy checkpoints * . * pt freeze * . * skip Co-authored-by: chaton <thomas@grid.ai> (cherry picked from commit f065ea6)

#4743) * Check environment var independently to selecting a seed to prevent unnecessary warning message * Add if statement to check if PL_GLOBAL_SEED has been set * Added seed test to ensure that the seed stays the same, in case * if * Delete global seed after test has finished * Fix code, add tests * Ensure seed does not exist before tests start * Refactor test based on review, add log call * Ensure we clear the os environ in patched dict Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com> Co-authored-by: chaton <thomas@grid.ai> (cherry picked from commit 635df27)

* Update test_manual_optimization.py * Update governance.rst * Update test_manual_optimization.py * Update test_manual_optimization.py (cherry picked from commit d30e316)

* update * clean test * still in progress * udpdate test * update * update * resolve flake * add test for zero_grad * update * works without accumulated_grad * update * update * resolve amp * revert back to True * update * clean tests * cleaned out * typo * update test * git repare bug * remove print * udpate * Fix formatting/optimizer imports * Refactor the test for cleanliness * Add vanilla model to the test, better var names * Fixed var names, let's clean up these mock tests * repare test * update test * resolve flake8 * add manual_optimization * update tests * resolve flake8 * add random accumulate_grad_batches * improve test * Update tests/trainer/optimization/test_parity_automatic_optimization.py Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> * Update tests/trainer/optimization/test_parity_automatic_optimization.py Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> * update * clean tests * correct bug * Apply suggestions from code review * format * adress comments * update on comments * wip * typo * depreceate enable_pl_optimizer * resolve latest bugs * update * resolve merge * add comment * Update pytorch_lightning/core/lightning.py Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> * Update tests/deprecated_api/test_remove_1-3.py Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> * Update pytorch_lightning/trainer/connectors/optimizer_connector.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> * Update pytorch_lightning/trainer/trainer.py Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> * Update tests/trainer/optimization/test_parity_automatic_optimization.py Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> * update on comments * update restore * add a property * remove setstate as not needed anymore * update test * provide optimizer to on_before_zero_grad * update on comments * update on comments * Update pytorch_lightning/trainer/trainer.py Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com> * Update tests/trainer/optimization/test_parity_automatic_optimization.py Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com> * Update tests/trainer/optimization/test_parity_automatic_optimization.py Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com> * Update tests/trainer/optimization/test_parity_automatic_optimization.py Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com> * mofidy import * update changelog * resolve flake8 * update * update * clean doc Co-authored-by: SeanNaren <sean@grid.ai> Co-authored-by: Ubuntu <ubuntu@ip-172-31-62-109.ec2.internal> Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> Co-authored-by: Jirka Borovec <jirka.borovec@seznam.cz> Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com> Co-authored-by: Sean Naren <sean.narenthiran@gmail.com> (cherry picked from commit f2e99d6)

* resolve bug * Apply suggestions from code review * resolve package import * resolve import * update on comments * update on comments * hacky fix * update * exit * update * to_container * typo * resolve import * update * resolve pep8 Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> Co-authored-by: Sean Naren <sean.narenthiran@gmail.com> (cherry picked from commit bb5031b)

* update used Twine * . * . * install * install * . * . * . * . * . * . Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit 9611a7f)

* ci: update recurent events * split events * . * . Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit c00d570)

(cherry picked from commit 652df18)

SeanNaren requested review from Borda, awaelchli, edenlightning, justusschock, tchaton and williamFalcon as code owners January 12, 2021 13:05

SeanNaren changed the title ~~releast/1.2-devmV1.1.4~~ release/1.2-dev <- v1.1.4 Jan 12, 2021

Borda changed the title ~~release/1.2-dev <- v1.1.4~~ sync 1.1.4 >> feature 1.2 [full merge, no squash] Jan 12, 2021

Borda marked this pull request as draft January 12, 2021 13:27

SeanNaren added this to the 1.2 milestone Jan 12, 2021

SeanNaren marked this pull request as ready for review January 12, 2021 15:57

SeanNaren self-assigned this Jan 12, 2021

SeanNaren force-pushed the v1.1.4 branch from 6c86db6 to 32cba95 Compare January 12, 2021 20:53

SeanNaren force-pushed the v1.1.4 branch from 32cba95 to a1d71ae Compare January 12, 2021 20:55

Borda reviewed Jan 12, 2021

View reviewed changes

CHANGELOG.md Show resolved Hide resolved

pytorch_lightning/utilities/package_utils.py Outdated Show resolved Hide resolved

pytorch_lightning/utilities/parsing.py Outdated Show resolved Hide resolved

github-actions bot added the has conflicts label Jan 13, 2021

SeanNaren force-pushed the v1.1.4 branch 3 times, most recently from 5397e1c to e286736 Compare January 19, 2021 19:23

SeanNaren removed the has conflicts label Jan 19, 2021

SeanNaren closed this Jan 19, 2021

carmocca mentioned this pull request Jan 19, 2021

Sync master/1.1.5 into release/1.2 [full merge, no squash] #5583

Merged

rohitgr7 deleted the v1.1.4 branch January 20, 2021 07:17

rohitgr7 restored the v1.1.4 branch January 20, 2021 07:17

Borda reopened this Jan 23, 2021

arnaudgelas and others added 22 commits January 26, 2021 14:27

Fix pre-commit trailing-whitespace and end-of-file-fixer hooks. (#5387)

fb6c33a

(cherry picked from commit 4c6f36e)

Add 1.1.4 section to CHANGELOG (#5378)

26e7e58

(cherry picked from commit 019e4ff)

GH action - label conflicts (#5450)

64b701f

* GH action - label conflicts * . * trigger * trigger * . (cherry picked from commit f1e28d1)

fix typos in validation_step and test_step docs (#5438)

defbeec

* fixed docs in lightning.py * few more Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com> Co-authored-by: Nicki Skafte <skaftenicki@gmail.com> (cherry picked from commit 499d503)

GH action - auto-update PRs (#5451)

fd49795

* GH action - auto-update PRs * . (cherry picked from commit 92bbf2f)

Add automatic optimization property setter to lightning module (#5169)

b4d1129

* add automatic optimization property setter to lightning module * Update test_manual_optimization.py Co-authored-by: chaton <thomas@grid.ai> (cherry picked from commit 8748293)

populate some more legacy checkpoints (#5457)

ee934de

* populate some more legacy checkpoints * . * pt freeze * . * skip Co-authored-by: chaton <thomas@grid.ai> (cherry picked from commit f065ea6)

[docs] Add ananthsub to core (#5476)

cccbcc5

* Update test_manual_optimization.py * Update governance.rst * Update test_manual_optimization.py * Update test_manual_optimization.py (cherry picked from commit d30e316)

Fix merge issue

127e041

Add hydra experimental to correct location

a80e37b

update nightly & upgrade Twine (#5458)

8db2b2d

* update used Twine * . * . * install * install * . * . * . * . * . * . Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit 9611a7f)

ci: update recurent events (#5480)

bee7d31

* ci: update recurent events * split events * . * . Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit c00d570)

Fix imports & issues in lightning optimizer refactor merge

df3c170

drop duplicated func _module_available

17cf6b4

Fix merge _module_available

f33db67

update CHANGELOG.md (#5482)

942488b

(cherry picked from commit 652df18)

Borda force-pushed the v1.1.4 branch from 86f89b0 to d9ef235 Compare January 26, 2021 13:30

mergify bot removed the has conflicts label Jan 26, 2021

Borda added 3 commits January 26, 2021 14:57

fix imports / isort / flake8

53b0ae4

fix logging test

2b71acc

chlog

4e7e1df

Borda force-pushed the v1.1.4 branch from d9ef235 to 4e7e1df Compare January 26, 2021 13:57

williamFalcon merged commit 4e7e1df into release/1.2-dev Jan 26, 2021

williamFalcon deleted the v1.1.4 branch January 26, 2021 14:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

sync 1.1.4 >> feature 1.2 [full merge, no squash]#5483

sync 1.1.4 >> feature 1.2 [full merge, no squash]#5483
williamFalcon merged 27 commits intorelease/1.2-devfrom
v1.1.4

SeanNaren commented Jan 12, 2021 •

edited by Borda

Loading

Uh oh!

Borda commented Jan 12, 2021

Uh oh!

SeanNaren commented Jan 12, 2021

Uh oh!

Borda commented Jan 12, 2021

Uh oh!

SeanNaren commented Jan 12, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

SeanNaren commented Jan 19, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Conversation

SeanNaren commented Jan 12, 2021 • edited by Borda Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Before submitting

PR review

Did you have fun?

Uh oh!

Borda commented Jan 12, 2021

Uh oh!

SeanNaren commented Jan 12, 2021

Uh oh!

Borda commented Jan 12, 2021

Uh oh!

SeanNaren commented Jan 12, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

SeanNaren commented Jan 19, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

SeanNaren commented Jan 12, 2021 •

edited by Borda

Loading