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

Bugfix/Multiple dataloaders #7433

Merged
merged 20 commits into from
May 11, 2021
Merged

Bugfix/Multiple dataloaders #7433

merged 20 commits into from
May 11, 2021

Conversation

justusschock
Copy link
Member

@justusschock justusschock commented May 7, 2021 •
edited by carmocca
Loading

What does this PR do?

Fixes an issue where multiple loaders were not parsed correctly (discovered by @carmocca )

The following modes are now supported

DataLoader
List[DataLoader]
Dict[str, DataLoader]
Dict[str, Dict[str, DataLoader]  # (FIXED)
List[Dict[str, DataLoader]]  # (FIXED)
List[List[DataLoader]  # (FIXED)
Dict[str, List[DataLoader]]  # (FIXED)

Before submitting

  • Did you make sure your PR does only one thing, instead of bundling different changes together?
  • 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

Did you have fun?

Make sure you had fun coding 🙃

@pep8speaks
Copy link

pep8speaks commented May 7, 2021 •
edited
Loading

Hello @justusschock! Thanks for updating this PR.

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

Comment last updated at 2021-05-11 13:46:55 UTC

@codecov
Copy link

codecov bot commented May 7, 2021 •
edited
Loading

Codecov Report

Merging #7433 (b84a3ac) into master (d7c44cc) will decrease coverage by 0%.
The diff coverage is 83%.

@@          Coverage Diff           @@
##           master   #7433   +/-   ##
======================================
- Coverage      92%     92%   -0%     
======================================
  Files         199     199           
  Lines       13051   13060    +9     
======================================
- Hits        12013   11977   -36     
- Misses       1038    1083   +45

@Borda Borda added bug Something isn't working data handling Generic data-related topic labels May 7, 2021
@Borda Borda added this to the v1.3.x milestone May 7, 2021
awaelchli
awaelchli approved these changes May 7, 2021
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
tests/base/model_train_dataloaders.py Outdated Show resolved Hide resolved
@awaelchli awaelchli added the ready PRs ready to be merged label May 7, 2021
justusschock and others added 2 commits May 8, 2021 18:56
@justusschock @awaelchli
Apply suggestions from code review
5522483 
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
a8d11d1 
for more information, see https://pre-commit.ci
tchaton
tchaton reviewed May 10, 2021
View reviewed changes
pytorch_lightning/trainer/supporters.py Outdated Show resolved Hide resolved
pytorch_lightning/trainer/supporters.py Outdated Show resolved Hide resolved
@justusschock @akihironitta
Update tests/trainer/test_dataloaders.py
27f8394 
Co-authored-by: Akihiro Nitta <nitta@akihironitta.com>
edgarriba
edgarriba reviewed May 10, 2021
View reviewed changes
pytorch_lightning/trainer/supporters.py Outdated Show resolved Hide resolved
pytorch_lightning/trainer/supporters.py Outdated Show resolved Hide resolved
justusschock and others added 3 commits May 10, 2021 10:40
@carmocca carmocca mentioned this pull request May 10, 2021
Merged
11 tasks
carmocca
carmocca reviewed May 10, 2021
View reviewed changes
pytorch_lightning/trainer/supporters.py Outdated Show resolved Hide resolved
pytorch_lightning/trainer/supporters.py Outdated Show resolved Hide resolved
@justusschock @carmocca
Apply suggestions from code review
6295aed 
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
@Borda Borda requested review from tchaton, carmocca and edgarriba May 11, 2021 09:12
@Borda Borda merged commit 7b283e3 into master May 11, 2021
@Borda Borda deleted the multiple_dataloaders branch May 11, 2021 14:33
@carmocca carmocca mentioned this pull request May 17, 2021
Closed
edgarriba added a commit that referenced this pull request May 18, 2021
@justusschock @awaelchli
@pre-commit-ci @akihironitta @edgarriba @carmocca
Bugfix/Multiple dataloaders (#7433)
976f223 
* Update supporters.py

* Update apply_func.py

* Update supporters.py

* Update model_train_dataloaders.py

* Update model_train_steps.py

* Update test_dataloaders.py

* Update CHANGELOG.md

* Update model_train_steps.py

* Update test_dataloaders.py

* Update test_dataloaders.py

* Update supporters.py

* Update test_supporters.py

* Apply suggestions from code review

Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update tests/trainer/test_dataloaders.py

Co-authored-by: Akihiro Nitta <nitta@akihironitta.com>

* Apply suggestions from code review

Co-authored-by: Edgar Riba <edgar.riba@gmail.com>

* Update supporters.py

* Update supporters.py

* Apply suggestions from code review

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

Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Akihiro Nitta <nitta@akihironitta.com>
Co-authored-by: Edgar Riba <edgar.riba@gmail.com>
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
Borda pushed a commit that referenced this pull request May 18, 2021
@justusschock @awaelchli
@pre-commit-ci @akihironitta @edgarriba @carmocca @Borda
Bugfix/Multiple dataloaders (#7433)
c627040 
* Update supporters.py

* Update apply_func.py

* Update supporters.py

* Update model_train_dataloaders.py

* Update model_train_steps.py

* Update test_dataloaders.py

* Update CHANGELOG.md

* Update model_train_steps.py

* Update test_dataloaders.py

* Update test_dataloaders.py

* Update supporters.py

* Update test_supporters.py

* Apply suggestions from code review

Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update tests/trainer/test_dataloaders.py

Co-authored-by: Akihiro Nitta <nitta@akihironitta.com>

* Apply suggestions from code review

Co-authored-by: Edgar Riba <edgar.riba@gmail.com>

* Update supporters.py

* Update supporters.py

* Apply suggestions from code review

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

Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Akihiro Nitta <nitta@akihironitta.com>
Co-authored-by: Edgar Riba <edgar.riba@gmail.com>
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
lexierule pushed a commit that referenced this pull request May 19, 2021
@justusschock @awaelchli
@pre-commit-ci @akihironitta @edgarriba @carmocca @lexierule
Bugfix/Multiple dataloaders (#7433)
40bc8c1 
* Update supporters.py

* Update apply_func.py

* Update supporters.py

* Update model_train_dataloaders.py

* Update model_train_steps.py

* Update test_dataloaders.py

* Update CHANGELOG.md

* Update model_train_steps.py

* Update test_dataloaders.py

* Update test_dataloaders.py

* Update supporters.py

* Update test_supporters.py

* Apply suggestions from code review

Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update tests/trainer/test_dataloaders.py

Co-authored-by: Akihiro Nitta <nitta@akihironitta.com>

* Apply suggestions from code review

Co-authored-by: Edgar Riba <edgar.riba@gmail.com>

* Update supporters.py

* Update supporters.py

* Apply suggestions from code review

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

Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Akihiro Nitta <nitta@akihironitta.com>
Co-authored-by: Edgar Riba <edgar.riba@gmail.com>
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akihironitta akihironitta akihironitta left review comments

@carmocca carmocca carmocca approved these changes

@Borda Borda Borda approved these changes

@awaelchli awaelchli awaelchli approved these changes

@kaushikb11 kaushikb11 Awaiting requested review from kaushikb11

@SeanNaren SeanNaren Awaiting requested review from SeanNaren

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

@tchaton tchaton Awaiting requested review from tchaton tchaton is a code owner

@edgarriba edgarriba Awaiting requested review from edgarriba

Assignees
No one assigned
Labels
bug Something isn't working data handling Generic data-related topic ready PRs ready to be merged
Projects
None yet
Milestone
pl:1.3.x
Development

Successfully merging this pull request may close these issues.
8 participants
@justusschock @pep8speaks @edgarriba @awaelchli @Borda @carmocca @tchaton @akihironitta