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.2 >> feature 1.2 [full merge, no squash] #5253

Merged
merged 37 commits into from
Jan 5, 2021
Merged

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

merged 37 commits into from
Jan 5, 2021

Conversation

Borda
Copy link
Member

@Borda Borda commented Dec 23, 2020 •
edited
Loading

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

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

@Borda Borda marked this pull request as ready for review December 23, 2020 22:23
@Borda Borda changed the title sync 1.1.2 >> feature 1.2 sync 1.1.2 >> feature 1.2 [wip] Dec 23, 2020
@Borda 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
Copy link
Member Author

Borda commented Dec 23, 2020

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

@Borda Borda changed the title sync 1.1.2 >> feature 1.2 [wip][draft] sync 1.1.2 >> feature 1.2 Dec 23, 2020
@Borda Borda added priority: 1 Medium priority task productivity labels Dec 23, 2020
@Borda Borda added this to the 1.2 milestone Dec 23, 2020
@Borda
Copy link
Member Author

Borda commented Dec 23, 2020 •
edited
Loading

@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

@Borda Borda changed the title sync 1.1.2 >> feature 1.2 sync 1.1.2 >> feature 1.2 [do not merge] Dec 24, 2020
@codecov
Copy link

codecov bot commented Dec 28, 2020 •
edited
Loading

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

@Borda Borda added the ready PRs ready to be merged label Dec 29, 2020
@Borda 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
tchaton and others added 26 commits January 5, 2021 09:58
@tchaton @carmocca
@rohitgr7 @Borda
[bugfix] remove nan loss in manual optimization (#5121)
9669c80 
* remove nan loss whe missing

* Update pytorch_lightning/core/lightning.py

Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>

* Apply suggestions from code review

Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com>
@tchaton @Borda
[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 <ubuntu@ip-172-31-62-109.ec2.internal>
@SeanNaren @Borda
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
@Borda @s-rog
drop install FairScale for TPU (#5113)
5119013 
* drop install FairScale for TPU

* typo

Co-authored-by: Roger Shieh <sh.rog@protonmail.ch>
@Borda
temporarily suspend all mergify rules (#5112)
5bae639
@Borda
prune ecosystem example (#5085)
3b83666 
* draft

* wip

* CI

* drop pl geometry

* copy

* logo
@Borda @justusschock
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 <12886177+justusschock@users.noreply.github.com>

Co-authored-by: Justus Schock <12886177+justusschock@users.noreply.github.com>
@Borda @SkafteNicki
Document speed comparison (#2072)
3c5dad7 
* docs

* script

* dump

* desc

* import

* import

* if

* norm

* t

* finished

* isort

* typing

Co-authored-by: Nicki Skafte <skaftenicki@gmail.com>

* xlabel

* pandas

* time

Co-authored-by: Nicki Skafte <skaftenicki@gmail.com>
@SeanNaren @rohitgr7 @Borda
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 <rohitgr1998@gmail.com>
@hassiahk @Borda @s-rog
Fixed docs for WandbLogger (#5128)
ac996fb 
Fixed a small bug with the `WandbLogger` docs.

Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>
Co-authored-by: Roger Shieh <sh.rog@protonmail.ch>
@gan3sh500 @Borda
update DALIClassificationLoader to not use deprecated arguments (#4925)
a5b2392 
* 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 <jirka.borovec@seznam.cz>
Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>
@InCogNiTo124 @Borda
Github Actions deprecation (#5183)
d72ba90 
* Fix deprecation call

* fix

Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>
@8greg8 @Borda @SeanNaren
[bugfix] Correct call to torch.no_grad (#5124)
d0b23f7 
Co-authored-by: Gregor Koporec <gregork@unicorn.gorenje.com>
Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>
Co-authored-by: Sean Naren <sean.narenthiran@gmail.com>
@borisdayma @awaelchli @Borda
feat(wandb): offset logging step when resuming (#5050)
dcd29ae 
* 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 <aedu.waelchli@gmail.com>

* feat(wandb): use variable from class instance

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

* tests(wandb): check warnings

* feat(wandb): use WarningCache

* tests(wandb): fix tests

* style: fix formatting

Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>
@awaelchli @Borda
reduce verbosity level in drone ci (#5190)
3b0197f 
* reduce verbosity level in drone

* verbosity
@rohitgr7 @Borda
Remove Sourcerer (#5172)
cd83829 
* Remove Sourcerer

* trigger

Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>
@awaelchli @rohitgr7
@SkafteNicki @Borda
skip multi-gpu test when running on single-gpu machine (#5186)
cc14fc1 
* skip test

* Apply suggestions from code review

Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com>
Co-authored-by: Nicki Skafte <skaftenicki@gmail.com>
@rohitgr7 @Borda
Update warning if ckpt directory is not empty (#5209)
fd5322d
@Borda @s-rog
add make cmd - clean (#5204)
12d6437 
Co-authored-by: Roger Shieh <sh.rog@protonmail.ch>
@Borda @tchaton
add doctests for example 2/n segmentation (#5083)
2438d74 
* draft

* fix

* drop folder

Co-authored-by: chaton <thomas@grid.ai>
@williamFalcon @Borda
Update README.md
64f9b4d
@williamFalcon @Borda
Update README.md
2ddd36b
@alanhdu @Borda
Tighten up mypy config (#5237)
1c8ad3a
@Borda
update for v1.1.2 (#5240)
365b9b5
@Borda
flake8 ++
74d0652
@Borda
fix test - reduce metric
dfbb592
@williamFalcon williamFalcon merged commit dfbb592 into release/1.2-dev Jan 5, 2021
@williamFalcon williamFalcon deleted the v1.1.2 branch January 5, 2021 23:12
@Borda Borda mentioned this pull request Jan 6, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SeanNaren SeanNaren SeanNaren approved these changes

@tchaton tchaton tchaton approved these changes

@ananyahjha93 ananyahjha93 Awaiting requested review from ananyahjha93

@awaelchli awaelchli Awaiting requested review from awaelchli

@edenlightning edenlightning Awaiting requested review from edenlightning

@justusschock justusschock Awaiting requested review from justusschock

@teddykoker teddykoker Awaiting requested review from teddykoker

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

Assignees

@Borda Borda

@SeanNaren SeanNaren

@tchaton tchaton

Labels
priority: 0 High priority task priority: 1 Medium priority task ready PRs ready to be merged
Projects
None yet
Milestone
pl:1.2
Development

Successfully merging this pull request may close these issues.