sync 1.1.2 >> feature 1.2 [full merge, no squash] #5253

Borda · 2020-12-23T22:22:45Z

What does this PR do?

Just to try if we can have all diff commits listed even after resolving conflicts...
~~effectively it is just a draft, but to see collision it has to be full PR, so ignore it atm~~

closes #5251

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?
Did you make sure to update the documentation with your changes [if needed]?
Did you write any new necessary tests [no need for typos, docs]?
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
Check that target branch and milestone are aligned!

Did you have fun?

Make sure you had fun coding 🙃

review-notebook-app · 2020-12-23T22:22:50Z

Check out this pull request on

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

Borda · 2020-12-23T22:52:05Z

rebase on release/1.2-dev and resolved conflicts...

Borda · 2020-12-23T23:44:14Z

@SeanNaren @tchaton so shall we merge it as with all commits or squash?
as the collisions were quite minimal I would rather try plain commits...

In such case we need @williamFalcon to merge it in command line as

git checkout release/1.2-dev
git merge v1.1.2
git push

codecov · 2020-12-28T13:36:42Z

Codecov Report

Merging #5253 (dfbb592) into release/1.2-dev (c72880f) will increase coverage by 4%.
The diff coverage is 97%.

@@               Coverage Diff                @@
##           release/1.2-dev   #5253    +/-   ##
================================================
+ Coverage               89%     93%    +4%     
================================================
  Files                  146     146            
  Lines                10289   10315    +26     
================================================
+ Hits                  9150    9549   +399     
+ Misses                1139     766   -373

* remove nan loss whe missing * Update pytorch_lightning/core/lightning.py Co-authored-by: Carlos Mocholí <[email protected]> * Apply suggestions from code review Co-authored-by: Carlos Mocholí <[email protected]> Co-authored-by: Rohit Gupta <[email protected]>

* add test * resolve bug * udpate test * wrongly copy / paste * update test * resolve a second bug Co-authored-by: Ubuntu <[email protected]>

* Disable pl optimizer temporarily to fix AMP issues * Add todo and enable pl optimizer in the test

* drop install FairScale for TPU * typo Co-authored-by: Roger Shieh <[email protected]>

* draft * wip * CI * drop pl geometry * copy * logo

* define tests * fix basic * fix gans * unet * test * drop * format * fix * revert Co-authored-by: Justus Schock <[email protected]> Co-authored-by: Justus Schock <[email protected]>

* docs * script * dump * desc * import * import * if * norm * t * finished * isort * typing Co-authored-by: Nicki Skafte <[email protected]> * xlabel * pandas * time Co-authored-by: Nicki Skafte <[email protected]>

* update CHANGELOG.md, increment for RC * Add missing changelog update * Added a few more * Move to added * Address code review * Missing space * Remove unreleased * Remove lines * Update CHANGELOG.md Co-authored-by: Rohit Gupta <[email protected]>

Fixed a small bug with the `WandbLogger` docs. Co-authored-by: Jirka Borovec <[email protected]> Co-authored-by: Roger Shieh <[email protected]>

* update DALIClassificationLoader to not use deprecated arguments * fix line length * dali version check added and changed args accordingly * versions * checking version using disutils.version.LooseVersion now * . * ver * import Co-authored-by: Jirka Borovec <[email protected]> Co-authored-by: Jirka Borovec <[email protected]>

* Fix deprecation call * fix Co-authored-by: Jirka Borovec <[email protected]>

Co-authored-by: Gregor Koporec <[email protected]> Co-authored-by: Jirka Borovec <[email protected]> Co-authored-by: Sean Naren <[email protected]>

* feat(wandb): offset logging step when resuming * feat(wandb): output warnings * fix(wandb): allow step to be None * test(wandb): update tests * feat(wandb): display warning only once * style: fix PEP issues * tests(wandb): fix tests * tests(wandb): improve test * style: fix whitespace * feat: improve warning Co-authored-by: Adrian Wälchli <[email protected]> * feat(wandb): use variable from class instance Co-authored-by: Jirka Borovec <[email protected]> * tests(wandb): check warnings * feat(wandb): use WarningCache * tests(wandb): fix tests * style: fix formatting Co-authored-by: Adrian Wälchli <[email protected]> Co-authored-by: Jirka Borovec <[email protected]>

* reduce verbosity level in drone * verbosity

* Remove Sourcerer * trigger Co-authored-by: Jirka Borovec <[email protected]>

* skip test * Apply suggestions from code review Co-authored-by: Rohit Gupta <[email protected]> Co-authored-by: Nicki Skafte <[email protected]>

Co-authored-by: Roger Shieh <[email protected]>

* draft * fix * drop folder Co-authored-by: chaton <[email protected]>

Borda marked this pull request as ready for review December 23, 2020 22:23

Borda requested review from SeanNaren, ananyahjha93, awaelchli, edenlightning, justusschock, tchaton, teddykoker and williamFalcon as code owners December 23, 2020 22:23

Borda changed the title ~~sync 1.1.2 >> feature 1.2~~ sync 1.1.2 >> feature 1.2 [wip] Dec 23, 2020

Borda changed the title ~~sync 1.1.2 >> feature 1.2 [wip]~~ sync 1.1.2 >> feature 1.2 [wip][draft] Dec 23, 2020

Borda force-pushed the v1.1.2 branch from 5820887 to 68ce6fd Compare December 23, 2020 22:51

Borda changed the title ~~sync 1.1.2 >> feature 1.2 [wip][draft]~~ sync 1.1.2 >> feature 1.2 Dec 23, 2020

Borda added priority: 1 Medium priority task productivity labels Dec 23, 2020

Borda added this to the 1.2 milestone Dec 23, 2020

Borda force-pushed the v1.1.2 branch from e4d3151 to f15dca2 Compare December 23, 2020 23:18

Borda changed the title ~~sync 1.1.2 >> feature 1.2~~ sync 1.1.2 >> feature 1.2 [do not merge] Dec 24, 2020

Borda assigned Borda, SeanNaren and tchaton Dec 27, 2020

tchaton approved these changes Dec 28, 2020

View reviewed changes

SeanNaren approved these changes Dec 28, 2020

View reviewed changes

Borda added the ready PRs ready to be merged label Dec 29, 2020

Borda changed the title ~~sync 1.1.2 >> feature 1.2 [do not merge]~~ sync 1.1.2 >> feature 1.2 [full merge, no squash] Dec 29, 2020

Borda force-pushed the v1.1.2 branch from abbe7ec to fa9bb76 Compare December 29, 2020 18:40

tchaton and others added 26 commits January 5, 2021 09:58

[bug-fix] Metric reduction with Logging (#5150)

6b19198

* add test * resolve bug * udpate test * wrongly copy / paste * update test * resolve a second bug Co-authored-by: Ubuntu <[email protected]>

Disable pl optimizer temporarily to fix AMP issues (#5163)

0211f7f

* Disable pl optimizer temporarily to fix AMP issues * Add todo and enable pl optimizer in the test

drop install FairScale for TPU (#5113)

5119013

* drop install FairScale for TPU * typo Co-authored-by: Roger Shieh <[email protected]>

temporarily suspend all mergify rules (#5112)

5bae639

prune ecosystem example (#5085)

3b83666

* draft * wip * CI * drop pl geometry * copy * logo

add doctests for example 1/n (#5079)

518d915

* define tests * fix basic * fix gans * unet * test * drop * format * fix * revert Co-authored-by: Justus Schock <[email protected]> Co-authored-by: Justus Schock <[email protected]>

Document speed comparison (#2072)

3c5dad7

* docs * script * dump * desc * import * import * if * norm * t * finished * isort * typing Co-authored-by: Nicki Skafte <[email protected]> * xlabel * pandas * time Co-authored-by: Nicki Skafte <[email protected]>

Prelease 1.1.2rc (#5171)

cb45ab0

* update CHANGELOG.md, increment for RC * Add missing changelog update * Added a few more * Move to added * Address code review * Missing space * Remove unreleased * Remove lines * Update CHANGELOG.md Co-authored-by: Rohit Gupta <[email protected]>

Fixed docs for WandbLogger (#5128)

ac996fb

Fixed a small bug with the `WandbLogger` docs. Co-authored-by: Jirka Borovec <[email protected]> Co-authored-by: Roger Shieh <[email protected]>

Github Actions deprecation (#5183)

d72ba90

* Fix deprecation call * fix Co-authored-by: Jirka Borovec <[email protected]>

[bugfix] Correct call to torch.no_grad (#5124)

d0b23f7

Co-authored-by: Gregor Koporec <[email protected]> Co-authored-by: Jirka Borovec <[email protected]> Co-authored-by: Sean Naren <[email protected]>

reduce verbosity level in drone ci (#5190)

3b0197f

* reduce verbosity level in drone * verbosity

Remove Sourcerer (#5172)

cd83829

* Remove Sourcerer * trigger Co-authored-by: Jirka Borovec <[email protected]>

skip multi-gpu test when running on single-gpu machine (#5186)

cc14fc1

* skip test * Apply suggestions from code review Co-authored-by: Rohit Gupta <[email protected]> Co-authored-by: Nicki Skafte <[email protected]>

Update warning if ckpt directory is not empty (#5209)

fd5322d

add make cmd - clean (#5204)

12d6437

Co-authored-by: Roger Shieh <[email protected]>

add doctests for example 2/n segmentation (#5083)

2438d74

* draft * fix * drop folder Co-authored-by: chaton <[email protected]>

Update README.md

64f9b4d

Update README.md

2ddd36b

Tighten up mypy config (#5237)

1c8ad3a

update for v1.1.2 (#5240)

365b9b5

flake8 ++

74d0652

fix test - reduce metric

dfbb592

Borda force-pushed the v1.1.2 branch from 523d492 to dfbb592 Compare January 5, 2021 08:59

williamFalcon merged commit dfbb592 into release/1.2-dev Jan 5, 2021

williamFalcon deleted the v1.1.2 branch January 5, 2021 23:12

Borda mentioned this pull request Jan 6, 2021

Release cycle document #5379

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

sync 1.1.2 >> feature 1.2 [full merge, no squash] #5253

sync 1.1.2 >> feature 1.2 [full merge, no squash] #5253

Uh oh!

Borda commented Dec 23, 2020 •

edited

Loading

Uh oh!

review-notebook-app bot commented Dec 23, 2020

Uh oh!

Borda commented Dec 23, 2020

Uh oh!

Borda commented Dec 23, 2020 •

edited

Loading

Uh oh!

codecov bot commented Dec 28, 2020 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

16 participants

sync 1.1.2 >> feature 1.2 [full merge, no squash] #5253

sync 1.1.2 >> feature 1.2 [full merge, no squash] #5253

Uh oh!

Conversation

Borda commented Dec 23, 2020 • edited 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!

review-notebook-app bot commented Dec 23, 2020

Uh oh!

Borda commented Dec 23, 2020

Uh oh!

Borda commented Dec 23, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Dec 28, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

16 participants

Borda commented Dec 23, 2020 •

edited

Loading

Borda commented Dec 23, 2020 •

edited

Loading

codecov bot commented Dec 28, 2020 •

edited

Loading