Skip to content

Rename replace_sampler_ddp|replace_sampler to use_distributed_sampler #16829

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
Merged
merged 4 commits into from
Feb 22, 2023
Merged

Rename replace_sampler_ddp|replace_sampler to use_distributed_sampler #16829

merged 4 commits into from
Feb 22, 2023

Conversation

carmocca
Copy link
Contributor

@carmocca carmocca commented Feb 21, 2023 •
edited by github-actions bot
Loading

What does this PR do?

The name is agnostic to DDP
Fabric and the Trainer now match

cc @justusschock @awaelchli @Borda @carmocca

@carmocca carmocca added refactor breaking change Includes a breaking change fabric lightning.fabric.Fabric trainer: argument pl Generic label for PyTorch Lightning package labels Feb 21, 2023
@carmocca carmocca added this to the 2.0 milestone Feb 21, 2023
@carmocca carmocca self-assigned this Feb 21, 2023
@carmocca carmocca marked this pull request as ready for review February 21, 2023 17:47
@github-actions
Copy link
Contributor

github-actions bot commented Feb 21, 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.8, 1.11, oldest) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.9, 1.11) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.10, 1.12) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.10, 1.13) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.8, 1.11, oldest) success ✅
pl-cpu (windows-2022, lightning, 3.9, 1.11) success ✅
pl-cpu (windows-2022, lightning, 3.10, 1.12) success ✅
pl-cpu (windows-2022, lightning, 3.10, 1.13) 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/fabric/fabric.py, src/lightning/fabric/utilities/distributed.py, src/lightning/pytorch/trainer/connectors/accelerator_connector.py, src/lightning/pytorch/trainer/connectors/data_connector.py, src/lightning/pytorch/trainer/trainer.py, tests/tests_pytorch/benchmarks/test_basic_parity.py, tests/tests_pytorch/benchmarks/test_sync_batchnorm_parity.py, tests/tests_pytorch/trainer/connectors/test_data_connector.py, tests/tests_pytorch/trainer/test_dataloaders.py, tests/tests_pytorch/utilities/test_combined_loader.py.

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

These checks are required after the changes to src/lightning/pytorch/trainer/connectors/accelerator_connector.py, src/lightning/pytorch/trainer/connectors/data_connector.py, src/lightning/pytorch/trainer/trainer.py, tests/tests_pytorch/benchmarks/test_basic_parity.py, tests/tests_pytorch/benchmarks/test_sync_batchnorm_parity.py, tests/tests_pytorch/trainer/connectors/test_data_connector.py, tests/tests_pytorch/trainer/test_dataloaders.py, tests/tests_pytorch/utilities/test_combined_loader.py, src/lightning/fabric/fabric.py, src/lightning/fabric/utilities/distributed.py.

🟢 pytorch_lightning: Benchmarks
Check ID Status
pytorch-lightning.Benchmark success ✅

These checks are required after the changes to tests/tests_pytorch/benchmarks/test_basic_parity.py, tests/tests_pytorch/benchmarks/test_sync_batchnorm_parity.py.

🟢 pytorch_lightning: Azure HPU
Check ID Status
pytorch-lightning (HPUs) success ✅

These checks are required after the changes to src/lightning/fabric/fabric.py, src/lightning/fabric/utilities/distributed.py, src/lightning/pytorch/trainer/connectors/accelerator_connector.py, src/lightning/pytorch/trainer/connectors/data_connector.py, src/lightning/pytorch/trainer/trainer.py, tests/tests_pytorch/benchmarks/test_basic_parity.py, tests/tests_pytorch/benchmarks/test_sync_batchnorm_parity.py, tests/tests_pytorch/trainer/connectors/test_data_connector.py, tests/tests_pytorch/trainer/test_dataloaders.py, tests/tests_pytorch/utilities/test_combined_loader.py.

🟢 pytorch_lightning: Azure IPU
Check ID Status
pytorch-lightning (IPUs) success ✅

These checks are required after the changes to src/lightning/fabric/fabric.py, src/lightning/fabric/utilities/distributed.py, src/lightning/pytorch/trainer/connectors/accelerator_connector.py, src/lightning/pytorch/trainer/connectors/data_connector.py, src/lightning/pytorch/trainer/trainer.py, tests/tests_pytorch/benchmarks/test_basic_parity.py, tests/tests_pytorch/benchmarks/test_sync_batchnorm_parity.py, tests/tests_pytorch/trainer/connectors/test_data_connector.py, tests/tests_pytorch/trainer/test_dataloaders.py, tests/tests_pytorch/utilities/test_combined_loader.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/trainer/connectors/accelerator_connector.py, src/lightning/pytorch/trainer/connectors/data_connector.py, src/lightning/pytorch/trainer/trainer.py, docs/source-pytorch/common/trainer.rst, docs/source-pytorch/fabric/api/fabric_methods.rst.

🟢 lightning_fabric: CPU workflow
Check ID Status
fabric-cpu (macOS-11, lightning, 3.8, 1.11) success ✅
fabric-cpu (macOS-11, lightning, 3.9, 1.12) success ✅
fabric-cpu (macOS-11, lightning, 3.10, 1.13) success ✅
fabric-cpu (macOS-11, lightning, 3.8, 1.11, oldest) success ✅
fabric-cpu (ubuntu-20.04, lightning, 3.9, 1.11) success ✅
fabric-cpu (ubuntu-20.04, lightning, 3.10, 1.12) success ✅
fabric-cpu (ubuntu-20.04, lightning, 3.10, 1.13) success ✅
fabric-cpu (ubuntu-20.04, lightning, 3.8, 1.11, oldest) success ✅
fabric-cpu (windows-2022, lightning, 3.9, 1.11) success ✅
fabric-cpu (windows-2022, lightning, 3.10, 1.12) success ✅
fabric-cpu (windows-2022, lightning, 3.10, 1.13) success ✅
fabric-cpu (windows-2022, lightning, 3.8, 1.11, oldest) success ✅
fabric-cpu (macOS-11, fabric, 3.8, 1.13) success ✅
fabric-cpu (ubuntu-20.04, fabric, 3.8, 1.13) success ✅
fabric-cpu (windows-2022, fabric, 3.8, 1.13) success ✅

These checks are required after the changes to src/lightning/fabric/fabric.py, src/lightning/fabric/utilities/distributed.py, tests/tests_fabric/test_fabric.py.

🟢 lightning_fabric: Azure GPU
Check ID Status
lightning-fabric (GPUs) success ✅

These checks are required after the changes to src/lightning/fabric/fabric.py, src/lightning/fabric/utilities/distributed.py, tests/tests_fabric/test_fabric.py.

🟢 mypy
Check ID Status
mypy success ✅

These checks are required after the changes to src/lightning/fabric/fabric.py, src/lightning/fabric/utilities/distributed.py, src/lightning/pytorch/trainer/connectors/accelerator_connector.py, src/lightning/pytorch/trainer/connectors/data_connector.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/fabric/fabric.py, src/lightning/fabric/utilities/distributed.py, src/lightning/pytorch/trainer/connectors/accelerator_connector.py, src/lightning/pytorch/trainer/connectors/data_connector.py, src/lightning/pytorch/trainer/trainer.py.

🟢 link-check
Check ID Status
markdown-link-check success ✅

These checks are required after the changes to src/lightning/fabric/CHANGELOG.md, 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.

@codecov
Copy link

codecov bot commented Feb 21, 2023 •
edited
Loading

Codecov Report

Merging #16829 (ef97699) into master (0009cde) will decrease coverage by 22%.
The diff coverage is 100%.

Additional details and impacted files 
@@            Coverage Diff            @@
##           master   #16829     +/-   ##
=========================================
- Coverage      82%      59%    -22%     
=========================================
  Files         435      411     -24     
  Lines       31517    31220    -297     
=========================================
- Hits        25732    18487   -7245     
- Misses       5785    12733   +6948

awaelchli
awaelchli approved these changes Feb 22, 2023
View reviewed changes
awaelchli
awaelchli reviewed Feb 22, 2023
View reviewed changes
@mergify mergify bot added the ready PRs ready to be merged label Feb 22, 2023
@carmocca carmocca enabled auto-merge (squash) February 22, 2023 13:06
@carmocca carmocca merged commit 914effa into master Feb 22, 2023
@carmocca carmocca deleted the rename/replace_sampler_ddp branch February 22, 2023 13:07
@mzweilin mzweilin mentioned this pull request Jul 27, 2023
Merged
23 tasks
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

@justusschock justusschock justusschock approved these changes

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

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

@edenlightning edenlightning Awaiting requested review from edenlightning

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

+1 more reviewer

@awaelchli awaelchli awaelchli approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@carmocca carmocca

Labels
breaking change Includes a breaking change fabric lightning.fabric.Fabric pl Generic label for PyTorch Lightning package ready PRs ready to be merged refactor trainer: argument
Projects
None yet
Milestone
2.0
Development

Successfully merging this pull request may close these issues.
4 participants
@carmocca @awaelchli @Borda @justusschock