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

Allow a CombinedLoader as the training data in DDP #11648

Merged
merged 17 commits into from
Feb 3, 2022
Merged

Allow a CombinedLoader as the training data in DDP #11648

merged 17 commits into from
Feb 3, 2022

Conversation

ant0nsc
Copy link
Contributor

@ant0nsc ant0nsc commented Jan 27, 2022 •
edited by rohitgr7
Loading

What does this PR do?

This PR allows to use a CombinedLoader as training data, and ensures that the right samplers are added when used in DDP

Fixes #11632
Fixes: #11475

Does your PR introduce any breaking changes? If yes, please list them.

None that I'm aware of.

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 list all the breaking changes introduced by this pull request?
  • Did you update the CHANGELOG? (not for typos, docs, test updates, or internal minor changes/refactorings)

PR review

Anyone in the community is welcome to review the PR.
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 🙃

@ant0nsc ant0nsc marked this pull request as ready for review January 28, 2022 13:50
rohitgr7
rohitgr7 reviewed Jan 28, 2022
View reviewed changes
Copy link
Contributor

@rohitgr7 rohitgr7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LG!

pytorch_lightning/trainer/trainer.py Outdated Show resolved Hide resolved
pytorch_lightning/trainer/trainer.py Outdated Show resolved Hide resolved
@rohitgr7 rohitgr7 added data handling Generic data-related topic feature Is an improvement or enhancement labels Jan 28, 2022
@rohitgr7 rohitgr7 added this to the 1.6 milestone Jan 28, 2022
@rohitgr7
Copy link
Contributor

also fixes: #11475?

also, would you mind updating the docs too: https://pytorch-lightning.readthedocs.io/en/latest/guides/data.html#return-multiple-dataloaders?

ant0nsc and others added 9 commits January 28, 2022 15:09
@ant0nsc @rohitgr7
PR suggestion: prepare dataloader can handle combinedloader
cfcc4b0 
Co-authored-by: Rohit Gupta <[email protected]>
@ant0nsc @rohitgr7
PR suggestion
d6ec67b 
Co-authored-by: Rohit Gupta <[email protected]>
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
216fd04 
for more information, see https://pre-commit.ci
@ant0nsc
Revert "PR suggestion"
bdb8f6b 
This reverts commit d6ec67b.
@ant0nsc
Revert "PR suggestion: prepare dataloader can handle combinedloader"
8d82d97 
This reverts commit cfcc4b0.
@ant0nsc
Revert "Revert "PR suggestion: prepare dataloader can handle combined…
1d17f38 
…loader""

This reverts commit 8d82d97.
@ant0nsc
Revert "Revert "PR suggestion""
04c80a5 
This reverts commit bdb8f6b.
@ant0nsc
fix and docu update
a4abda3
@ant0nsc
Merge branch 'combinedloader' of https://github.com/ant0nsc/pytorch-l…
f086ea1 
…ightning into combinedloader
@ant0nsc ant0nsc requested a review from rohitgr7 January 28, 2022 19:54
@ant0nsc
Copy link
Contributor Author

ant0nsc commented Jan 29, 2022

Can I have more reviews here please? @rohitgr7 @tchaton for example. Also, one testing pipeline timed out, I did not find a way of re-queuing it.

@rohitgr7
Copy link
Contributor

Can I have more reviews here please? @rohitgr7 @tchaton for example. Also, one testing pipeline timed out, I did not find a way of re-queuing it.

hey @ant0nsc, you can ignore the timeout. happens sometimes. will review this on Monday, although looks great. Just needs some more doc updates. Will push some commits if required.

tchaton
tchaton approved these changes Jan 31, 2022
View reviewed changes
Copy link
Contributor

@tchaton tchaton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM !

tests/trainer/test_supporters.py Show resolved Hide resolved
tests/trainer/test_supporters.py Show resolved Hide resolved
rohitgr7
rohitgr7 approved these changes Jan 31, 2022
View reviewed changes
Copy link
Contributor

@rohitgr7 rohitgr7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added an example

@mergify mergify bot added the ready PRs ready to be merged label Jan 31, 2022
carmocca
carmocca approved these changes Jan 31, 2022
View reviewed changes
docs/source/guides/data.rst Show resolved Hide resolved
@carmocca carmocca enabled auto-merge (squash) February 3, 2022 03:56
@carmocca carmocca merged commit f935319 into Lightning-AI:master Feb 3, 2022
@ant0nsc ant0nsc mentioned this pull request Mar 17, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rohitgr7 rohitgr7 rohitgr7 approved these changes

@tchaton tchaton tchaton approved these changes

@carmocca carmocca carmocca approved these changes

@Borda Borda Borda approved these changes

@awaelchli awaelchli Awaiting requested review from awaelchli

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

@kaushikb11 kaushikb11 Awaiting requested review from kaushikb11

@SeanNaren SeanNaren Awaiting requested review from SeanNaren

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

@edenlightning edenlightning Awaiting requested review from edenlightning

Assignees
No one assigned
Labels
data handling Generic data-related topic feature Is an improvement or enhancement ready PRs ready to be merged
Projects
None yet
Milestone
pl:1.6
5 participants
@ant0nsc @rohitgr7 @Borda @carmocca @tchaton