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.

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

Support multiple dataloaders with dataloader_iter #18390

Merged
merged 22 commits into from
Sep 5, 2023

Conversation

carmocca
Copy link
Contributor

@carmocca carmocca commented Aug 25, 2023

What does this PR do?

Support multiple dataloaders with dataloader_iter

This unblocks the NeMo team.

cc @justusschock @awaelchli @tchaton @Borda

@carmocca carmocca added data handling Generic data-related topic design Includes a design discussion breaking change Includes a breaking change pl Generic label for PyTorch Lightning package labels Aug 25, 2023
@carmocca carmocca added this to the 2.1 milestone Aug 25, 2023
@carmocca carmocca self-assigned this Aug 25, 2023
@carmocca carmocca marked this pull request as ready for review August 30, 2023 01:44
@github-actions
Copy link
Contributor

github-actions bot commented Aug 30, 2023

⚡ Required checks status: All passing 🟢

Groups summary

🟢 pytorch_lightning: Tests workflow
Check ID Status
pl-cpu (macOS-11, lightning, 3.8, 1.11) success
pl-cpu (macOS-11, lightning, 3.9, 1.12) success
pl-cpu (macOS-11, lightning, 3.10, 1.13) success
pl-cpu (macOS-11, lightning, 3.10, 2.0) success
pl-cpu (macOS-11, lightning, 3.8, 1.11, oldest) success
pl-cpu (ubuntu-20.04, lightning, 3.8, 1.11) success
pl-cpu (ubuntu-20.04, lightning, 3.9, 1.12) success
pl-cpu (ubuntu-20.04, lightning, 3.10, 1.13) success
pl-cpu (ubuntu-20.04, lightning, 3.10, 2.0) success
pl-cpu (ubuntu-20.04, lightning, 3.8, 1.11, oldest) success
pl-cpu (windows-2022, lightning, 3.8, 1.11) success
pl-cpu (windows-2022, lightning, 3.9, 1.12) success
pl-cpu (windows-2022, lightning, 3.10, 1.13) success
pl-cpu (windows-2022, lightning, 3.10, 2.0) success
pl-cpu (windows-2022, lightning, 3.8, 1.11, oldest) success
pl-cpu (macOS-11, pytorch, 3.8, 1.13) success
pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.13) success
pl-cpu (windows-2022, pytorch, 3.8, 1.13) success
pl-cpu (macOS-12, pytorch, 3.11, 2.0) success
pl-cpu (ubuntu-22.04, pytorch, 3.11, 2.0) success
pl-cpu (windows-2022, pytorch, 3.11, 2.0) success

These checks are required after the changes to src/lightning/pytorch/callbacks/prediction_writer.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/loops/fetchers.py, src/lightning/pytorch/loops/fit_loop.py, src/lightning/pytorch/loops/prediction_loop.py, src/lightning/pytorch/loops/training_epoch_loop.py, src/lightning/pytorch/loops/utilities.py, src/lightning/pytorch/utilities/combined_loader.py, tests/tests_pytorch/loops/test_evaluation_loop.py, tests/tests_pytorch/loops/test_fetchers.py, tests/tests_pytorch/loops/test_prediction_loop.py, tests/tests_pytorch/loops/test_training_epoch_loop.py, tests/tests_pytorch/utilities/test_combined_loader.py, tests/tests_pytorch/utilities/test_signature_utils.py.

🟢 pytorch_lightning: Azure GPU
Check ID Status
[pytorch-lightning (GPUs) (testing Lightning latest)](https://dev.azure.com/Lightning-AI/72ab7ed8-b00f-4b6e-b131-3388f7ffafa7/_build/results?buildId=173206&view=logs&jobId=47e66f3c-897a-5428-da11-bf5c7745762e) success
[pytorch-lightning (GPUs) (testing PyTorch latest)](https://dev.azure.com/Lightning-AI/72ab7ed8-b00f-4b6e-b131-3388f7ffafa7/_build/results?buildId=173206&view=logs&jobId=3f274fac-2e11-54ca-487e-194c91f3ae9f) success

These checks are required after the changes to src/lightning/pytorch/callbacks/prediction_writer.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/loops/fetchers.py, src/lightning/pytorch/loops/fit_loop.py, src/lightning/pytorch/loops/prediction_loop.py, src/lightning/pytorch/loops/training_epoch_loop.py, src/lightning/pytorch/loops/utilities.py, src/lightning/pytorch/utilities/combined_loader.py, tests/tests_pytorch/loops/test_evaluation_loop.py, tests/tests_pytorch/loops/test_fetchers.py, tests/tests_pytorch/loops/test_prediction_loop.py, tests/tests_pytorch/loops/test_training_epoch_loop.py, tests/tests_pytorch/utilities/test_combined_loader.py, tests/tests_pytorch/utilities/test_signature_utils.py.

🟢 pytorch_lightning: Benchmarks
Check ID Status
lightning.Benchmarks success

These checks are required after the changes to src/lightning/pytorch/callbacks/prediction_writer.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/loops/fetchers.py, src/lightning/pytorch/loops/fit_loop.py, src/lightning/pytorch/loops/prediction_loop.py, src/lightning/pytorch/loops/training_epoch_loop.py, src/lightning/pytorch/loops/utilities.py, src/lightning/pytorch/utilities/combined_loader.py.

🟢 pytorch_lightning: Docs
Check ID Status
docs-make (pytorch, doctest) success
docs-make (pytorch, html) success

These checks are required after the changes to src/lightning/pytorch/callbacks/prediction_writer.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/loops/fetchers.py, src/lightning/pytorch/loops/fit_loop.py, src/lightning/pytorch/loops/prediction_loop.py, src/lightning/pytorch/loops/training_epoch_loop.py, src/lightning/pytorch/loops/utilities.py, src/lightning/pytorch/utilities/combined_loader.py.

🟢 mypy
Check ID Status
mypy success

These checks are required after the changes to src/lightning/pytorch/callbacks/prediction_writer.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/loops/fetchers.py, src/lightning/pytorch/loops/fit_loop.py, src/lightning/pytorch/loops/prediction_loop.py, src/lightning/pytorch/loops/training_epoch_loop.py, src/lightning/pytorch/loops/utilities.py, src/lightning/pytorch/utilities/combined_loader.py.

🟢 install
Check ID Status
install-pkg (ubuntu-22.04, app, 3.8) success
install-pkg (ubuntu-22.04, app, 3.11) success
install-pkg (ubuntu-22.04, fabric, 3.8) success
install-pkg (ubuntu-22.04, fabric, 3.11) success
install-pkg (ubuntu-22.04, pytorch, 3.8) success
install-pkg (ubuntu-22.04, pytorch, 3.11) success
install-pkg (ubuntu-22.04, lightning, 3.8) success
install-pkg (ubuntu-22.04, lightning, 3.11) success
install-pkg (ubuntu-22.04, notset, 3.8) success
install-pkg (ubuntu-22.04, notset, 3.11) success
install-pkg (macOS-12, app, 3.8) success
install-pkg (macOS-12, app, 3.11) success
install-pkg (macOS-12, fabric, 3.8) success
install-pkg (macOS-12, fabric, 3.11) success
install-pkg (macOS-12, pytorch, 3.8) success
install-pkg (macOS-12, pytorch, 3.11) success
install-pkg (macOS-12, lightning, 3.8) success
install-pkg (macOS-12, lightning, 3.11) success
install-pkg (macOS-12, notset, 3.8) success
install-pkg (macOS-12, notset, 3.11) success
install-pkg (windows-2022, app, 3.8) success
install-pkg (windows-2022, app, 3.11) success
install-pkg (windows-2022, fabric, 3.8) success
install-pkg (windows-2022, fabric, 3.11) success
install-pkg (windows-2022, pytorch, 3.8) success
install-pkg (windows-2022, pytorch, 3.11) success
install-pkg (windows-2022, lightning, 3.8) success
install-pkg (windows-2022, lightning, 3.11) success
install-pkg (windows-2022, notset, 3.8) success
install-pkg (windows-2022, notset, 3.11) success

These checks are required after the changes to src/lightning/pytorch/callbacks/prediction_writer.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/loops/fetchers.py, src/lightning/pytorch/loops/fit_loop.py, src/lightning/pytorch/loops/prediction_loop.py, src/lightning/pytorch/loops/training_epoch_loop.py, src/lightning/pytorch/loops/utilities.py, src/lightning/pytorch/utilities/combined_loader.py.


Thank you for your contribution! 💜

Note
This comment is automatically generated and updates for 60 minutes every 180 seconds. If you have any other questions, contact carmocca for help.

@codecov
Copy link

codecov bot commented Aug 31, 2023

Codecov Report

Merging #18390 (3704fb6) into master (b3ee0df) will decrease coverage by 35%.
The diff coverage is 99%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #18390      +/-   ##
==========================================
- Coverage      85%      50%     -35%     
==========================================
  Files         427      419       -8     
  Lines       33289    33186     -103     
==========================================
- Hits        28291    16655   -11636     
- Misses       4998    16531   +11533     

@mergify mergify bot added the ready PRs ready to be merged label Sep 5, 2023
@carmocca carmocca merged commit ea0f6ba into master Sep 5, 2023
@carmocca carmocca deleted the carmocca/dataloader_iter_multiple_dataloaders branch September 5, 2023 23:24
if isinstance(data_fetcher, _DataLoaderIterDataFetcher):
dataloader_iter = next(data_fetcher)
# hook's batch_idx and dataloader_idx arguments correctness cannot be guaranteed in this setting
batch = data_fetcher._batch
Copy link
Contributor

Choose a reason for hiding this comment

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

Did we store the fetched batch in memory before this PR as well? I think that previously the "batch" variable was actually the dataloader_iter. My understanding is that we need to store the batch so we can pass it to the callback hooks. An argument could probably be made that in case of dataloader_iter, the loop should probably not hold onto a batch (and perhaps pass None to the hooks).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking change Includes a breaking change data handling Generic data-related topic design Includes a design discussion pl Generic label for PyTorch Lightning package ready PRs ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants