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

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

Merged
merged 27 commits into from
Jan 26, 2021
Merged

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

merged 27 commits into from
Jan 26, 2021

Conversation

SeanNaren
Copy link
Contributor

@SeanNaren SeanNaren commented Jan 12, 2021 •
edited by Borda
Loading

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 🙃

@SeanNaren SeanNaren changed the title releast/1.2-devmV1.1.4 release/1.2-dev <- v1.1.4 Jan 12, 2021
@Borda 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 Borda marked this pull request as draft January 12, 2021 13:27
@SeanNaren SeanNaren added this to the 1.2 milestone Jan 12, 2021
@SeanNaren SeanNaren marked this pull request as ready for review January 12, 2021 15:57
@SeanNaren SeanNaren self-assigned this Jan 12, 2021
@Borda
Copy link
Member

Borda commented Jan 12, 2021

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

@SeanNaren
Copy link
Contributor Author

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

Should I drop the commits/merge?

@Borda
Copy link
Member

Borda commented Jan 12, 2021

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
Copy link
Contributor Author

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

Borda
Borda reviewed Jan 12, 2021
View reviewed changes
CHANGELOG.md Outdated 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
@SeanNaren SeanNaren force-pushed the v1.1.4 branch 3 times, most recently from 5397e1c to e286736 Compare January 19, 2021 19:23
@SeanNaren
Copy link
Contributor Author

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

@SeanNaren SeanNaren closed this Jan 19, 2021
@carmocca carmocca mentioned this pull request Jan 19, 2021
Merged
@rohitgr7 rohitgr7 deleted the v1.1.4 branch January 20, 2021 07:17
@rohitgr7 rohitgr7 restored the v1.1.4 branch January 20, 2021 07:17
@Borda Borda reopened this Jan 23, 2021
arnaudgelas and others added 22 commits January 26, 2021 14:27
@arnaudgelas @Borda
Fix pre-commit trailing-whitespace and end-of-file-fixer hooks. (#5387)
fb6c33a 
(cherry picked from commit 4c6f36e)
@Borda
tests for legacy checkpoints (#5223)
9dd0402 
* 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)
@carmocca @Borda
Add 1.1.4 section to CHANGELOG (#5378)
26e7e58 
(cherry picked from commit 019e4ff)
@tchaton @Borda
[bug-fix] Call transfer_batch_to_device in DDPlugin (#5195)
f2f4a49 
* 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 <[email protected]>

* update on comments

* Update pytorch_lightning/plugins/ddp_plugin.py

Co-authored-by: Rohit Gupta <[email protected]>

* Update pytorch_lightning/plugins/ddp_plugin.py

Co-authored-by: Rohit Gupta <[email protected]>

* resolve pep8

* add device_ids to pipe

* update on comments

* update

* resolve

* update

* update

* update

Co-authored-by: Ubuntu <[email protected]>
Co-authored-by: Rohit Gupta <[email protected]>
Co-authored-by: Sean Naren <[email protected]>

(cherry picked from commit d510707)
@tchaton @Borda
[bugfix] Logging only on not should_accumulate() during training (#…
f422d93 
…5417)

* resolve bug

* resolve tests

* update

* Update tests/loggers/test_tensorboard.py

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

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

(cherry picked from commit a053d75)
@Borda
GH action - label conflicts (#5450)
64b701f 
* GH action - label conflicts

* .

* trigger

* trigger

* .

(cherry picked from commit f1e28d1)
@thepooons @Borda
fix typos in validation_step and test_step docs (#5438)
defbeec 
* fixed docs in lightning.py

* few more

Co-authored-by: Rohit Gupta <[email protected]>
Co-authored-by: Nicki Skafte <[email protected]>
(cherry picked from commit 499d503)
@Borda
GH action - auto-update PRs (#5451)
fd49795 
* GH action - auto-update PRs

* .

(cherry picked from commit 92bbf2f)
@ananthsub @Borda
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 <[email protected]>
(cherry picked from commit 8748293)
@Borda
populate some more legacy checkpoints (#5457)
ee934de 
* populate some more legacy checkpoints

* .

* pt freeze

* .

* skip

Co-authored-by: chaton <[email protected]>
(cherry picked from commit f065ea6)
@SeanNaren @Borda
[BUG] Check environ before selecting a seed to prevent warning message (
0c370ad 
#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 <[email protected]>
Co-authored-by: Carlos Mocholí <[email protected]>
Co-authored-by: chaton <[email protected]>
(cherry picked from commit 635df27)
@ananthsub @Borda
[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)
@tchaton @Borda
deprecate enable_pl_optimizer as it is not restored properly (#5244)
0435e23 
* 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 <[email protected]>

* Update tests/trainer/optimization/test_parity_automatic_optimization.py

Co-authored-by: Jirka Borovec <[email protected]>

* 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 <[email protected]>

* Update tests/deprecated_api/test_remove_1-3.py

Co-authored-by: Jirka Borovec <[email protected]>

* Update pytorch_lightning/trainer/connectors/optimizer_connector.py

Co-authored-by: Jirka Borovec <[email protected]>

* Update pytorch_lightning/trainer/trainer.py

Co-authored-by: Jirka Borovec <[email protected]>

* Update pytorch_lightning/trainer/trainer.py

Co-authored-by: Jirka Borovec <[email protected]>

* Update tests/trainer/optimization/test_parity_automatic_optimization.py

Co-authored-by: Jirka Borovec <[email protected]>

* 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 <[email protected]>

* Update tests/trainer/optimization/test_parity_automatic_optimization.py

Co-authored-by: Adrian Wälchli <[email protected]>

* Update tests/trainer/optimization/test_parity_automatic_optimization.py

Co-authored-by: Adrian Wälchli <[email protected]>

* Update tests/trainer/optimization/test_parity_automatic_optimization.py

Co-authored-by: Adrian Wälchli <[email protected]>

* mofidy import

* update changelog

* resolve flake8

* update

* update

* clean doc

Co-authored-by: SeanNaren <[email protected]>
Co-authored-by: Ubuntu <[email protected]>
Co-authored-by: Jirka Borovec <[email protected]>
Co-authored-by: Jirka Borovec <[email protected]>
Co-authored-by: Adrian Wälchli <[email protected]>
Co-authored-by: Sean Naren <[email protected]>

(cherry picked from commit f2e99d6)
@Borda
Fix merge issue
127e041
@tchaton @Borda
bugfix: Resolve interpolation bug with Hydra (#5406)
8e75f2c 
* 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 <[email protected]>
Co-authored-by: Sean Naren <[email protected]>

(cherry picked from commit bb5031b)
@Borda
Add hydra experimental to correct location
a80e37b
@Borda
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)
@Borda
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)
@Borda
Fix imports & issues in lightning optimizer refactor merge
df3c170
@Borda
drop duplicated func _module_available
17cf6b4
@Borda
Fix merge _module_available
f33db67
@SeanNaren @Borda
update CHANGELOG.md (#5482)
942488b 
(cherry picked from commit 652df18)
@mergify mergify bot removed the has conflicts label Jan 26, 2021
@williamFalcon williamFalcon merged commit 4e7e1df into release/1.2-dev Jan 26, 2021
@williamFalcon williamFalcon deleted the v1.1.4 branch January 26, 2021 14:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@awaelchli awaelchli awaelchli approved these changes

@Borda Borda Borda approved these changes

@tchaton tchaton tchaton approved these changes

@justusschock justusschock justusschock approved these changes

@edenlightning edenlightning edenlightning approved these changes

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

Assignees

@Borda Borda

@SeanNaren SeanNaren

Labels
priority: 0 High priority task
Projects
None yet
Milestone
pl:1.2
Development

Successfully merging this pull request may close these issues.