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

Support all CombinedLoader modes during evaluation #17163

Merged
merged 8 commits into from
Apr 16, 2023
Merged

Support all CombinedLoader modes during evaluation #17163

merged 8 commits into from
Apr 16, 2023

Conversation

carmocca
Copy link
Contributor

@carmocca carmocca commented Mar 21, 2023 •
edited by awaelchli
Loading

What does this PR do?

Fixes (don't close) #16830 for evaluation

Fixes #16015

cc @Borda @justusschock @awaelchli @carmocca

@carmocca carmocca added feature Is an improvement or enhancement data handling Generic data-related topic loops Related to the Loop API labels Mar 21, 2023
@carmocca carmocca added this to the 2.1 milestone Mar 21, 2023
@carmocca carmocca self-assigned this Mar 21, 2023
@github-actions github-actions bot added the pl Generic label for PyTorch Lightning package label Mar 21, 2023
@carmocca carmocca marked this pull request as ready for review March 28, 2023 23:10
@github-actions
Copy link
Contributor

github-actions bot commented Mar 28, 2023 •
edited
Loading

⚡ 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 ✅

These checks are required after the changes to src/lightning/pytorch/callbacks/model_checkpoint.py, src/lightning/pytorch/callbacks/progress/progress_bar.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/profilers/pytorch.py, src/lightning/pytorch/trainer/trainer.py, tests/tests_pytorch/loops/test_evaluation_loop.py.

🟢 pytorch_lightning: Azure GPU
Check ID Status
pytorch-lightning (GPUs) success ✅

These checks are required after the changes to src/lightning/pytorch/callbacks/model_checkpoint.py, src/lightning/pytorch/callbacks/progress/progress_bar.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/profilers/pytorch.py, src/lightning/pytorch/trainer/trainer.py, tests/tests_pytorch/loops/test_evaluation_loop.py.

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

These checks are required after the changes to src/lightning/pytorch/callbacks/model_checkpoint.py, src/lightning/pytorch/callbacks/progress/progress_bar.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/profilers/pytorch.py, src/lightning/pytorch/trainer/trainer.py, docs/source-pytorch/data/iterables.rst.

🟢 mypy
Check ID Status
mypy success ✅

These checks are required after the changes to src/lightning/pytorch/callbacks/model_checkpoint.py, src/lightning/pytorch/callbacks/progress/progress_bar.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/profilers/pytorch.py, src/lightning/pytorch/trainer/trainer.py.

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

These checks are required after the changes to src/lightning/pytorch/callbacks/model_checkpoint.py, src/lightning/pytorch/callbacks/progress/progress_bar.py, src/lightning/pytorch/loops/evaluation_loop.py, src/lightning/pytorch/profilers/pytorch.py, src/lightning/pytorch/trainer/trainer.py.

🟢 link-check
Check ID Status
check-md-links / markdown-link-check success ✅

These checks are required after the changes to src/lightning/pytorch/CHANGELOG.md.

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.

@carmocca carmocca mentioned this pull request Mar 28, 2023
Open
3 tasks
@mergify mergify bot removed the has conflicts label Apr 12, 2023
@awaelchli awaelchli mentioned this pull request Apr 14, 2023
Closed
@mergify mergify bot added the ready PRs ready to be merged label Apr 16, 2023
@carmocca carmocca enabled auto-merge (squash) April 16, 2023 18:01
@carmocca carmocca merged commit 13905a3 into master Apr 16, 2023
@carmocca carmocca deleted the carmocca/evaluation-all-modes branch April 16, 2023 18:01
@surya-narayanan
Copy link

Hi, does this mean that if I install the nightly version, I will be able to use this feature?

@carmocca
Copy link
Contributor Author

Yes @surya-narayanan

@cweniger cweniger mentioned this pull request Sep 4, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Borda Borda Borda approved these changes

@awaelchli awaelchli awaelchli approved these changes

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

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

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

@edenlightning edenlightning Awaiting requested review from edenlightning

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

Assignees

@carmocca carmocca

Labels
data handling Generic data-related topic feature Is an improvement or enhancement loops Related to the Loop API pl Generic label for PyTorch Lightning package ready PRs ready to be merged
Projects
None yet
Milestone
2.1
Development

Successfully merging this pull request may close these issues.

Dict specified val_dataloader, test_dataloader and predict_dataloader
4 participants
@carmocca @surya-narayanan @awaelchli @Borda