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

Avoid FSDP deprecations during save/load with newer torch versions #19463

Merged
merged 4 commits into from
Feb 14, 2024
Merged

Avoid FSDP deprecations during save/load with newer torch versions #19463

merged 4 commits into from
Feb 14, 2024

Conversation

carmocca
Copy link
Contributor

@carmocca carmocca commented Feb 13, 2024 •
edited by github-actions bot
Loading

What does this PR do?

Part of #19462

📚 Documentation preview 📚: https://pytorch-lightning--19463.org.readthedocs.build/en/19463/

cc @Borda @carmocca @justusschock @awaelchli

@carmocca carmocca added this to the 2.2.x milestone Feb 13, 2024
@carmocca carmocca self-assigned this Feb 13, 2024
@github-actions github-actions bot added fabric lightning.fabric.Fabric pl Generic label for PyTorch Lightning package labels Feb 13, 2024
@carmocca carmocca mentioned this pull request Feb 13, 2024
Open
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 13, 2024 •
edited
Loading

⚡ Required checks status: All passing 🟢

Groups summary

🟢 pytorch_lightning: Tests workflow
Check ID Status
pl-cpu (macOS-11, lightning, 3.8, 1.13, oldest) success ✅
pl-cpu (macOS-11, lightning, 3.10, 1.13) success ✅
pl-cpu (macOS-11, lightning, 3.10, 2.1) success ✅
pl-cpu (macOS-11, lightning, 3.10, 2.2) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.8, 1.13, oldest) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.10, 1.13) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.10, 2.1) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.10, 2.2) success ✅
pl-cpu (windows-2022, lightning, 3.8, 1.13, oldest) success ✅
pl-cpu (windows-2022, lightning, 3.10, 1.13) success ✅
pl-cpu (windows-2022, lightning, 3.10, 2.1) success ✅
pl-cpu (windows-2022, lightning, 3.10, 2.2) 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 (macOS-12, pytorch, 3.11, 2.1) success ✅
pl-cpu (ubuntu-22.04, pytorch, 3.11, 2.0) success ✅
pl-cpu (ubuntu-22.04, pytorch, 3.11, 2.1) success ✅
pl-cpu (windows-2022, pytorch, 3.11, 2.0) success ✅
pl-cpu (windows-2022, pytorch, 3.11, 2.1) success ✅

These checks are required after the changes to src/lightning/fabric/strategies/fsdp.py, src/lightning/fabric/utilities/imports.py, src/lightning/pytorch/strategies/fsdp.py, tests/tests_pytorch/strategies/test_fsdp.py.

🟢 pytorch_lightning: Azure GPU
Check ID Status
pytorch-lightning (GPUs) (testing Lightning | latest) success ✅
pytorch-lightning (GPUs) (testing PyTorch | latest) success ✅

These checks are required after the changes to src/lightning/pytorch/strategies/fsdp.py, tests/tests_pytorch/strategies/test_fsdp.py, src/lightning/fabric/strategies/fsdp.py, src/lightning/fabric/utilities/imports.py.

🟢 pytorch_lightning: Benchmarks
Check ID Status
lightning.Benchmarks success ✅

These checks are required after the changes to src/lightning/fabric/strategies/fsdp.py, src/lightning/fabric/utilities/imports.py, src/lightning/pytorch/strategies/fsdp.py.

🟢 fabric: Docs
Check ID Status
docs-make (fabric, doctest) success ✅
docs-make (fabric, html) success ✅

These checks are required after the changes to src/lightning/fabric/strategies/fsdp.py, src/lightning/fabric/utilities/imports.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/strategies/fsdp.py.

🟢 lightning_fabric: CPU workflow
Check ID Status
fabric-cpu (macOS-11, lightning, 3.8, 1.13, oldest) success ✅
fabric-cpu (macOS-11, lightning, 3.10, 1.13) success ✅
fabric-cpu (macOS-11, lightning, 3.11, 2.1) success ✅
fabric-cpu (macOS-11, lightning, 3.11, 2.2) success ✅
fabric-cpu (ubuntu-20.04, lightning, 3.8, 1.13, oldest) success ✅
fabric-cpu (ubuntu-20.04, lightning, 3.10, 1.13) success ✅
fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.1) success ✅
fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.2) success ✅
fabric-cpu (windows-2022, lightning, 3.8, 1.13, oldest) success ✅
fabric-cpu (windows-2022, lightning, 3.10, 1.13) success ✅
fabric-cpu (windows-2022, lightning, 3.11, 2.1) success ✅
fabric-cpu (windows-2022, lightning, 3.11, 2.2) 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 ✅
fabric-cpu (macOS-12, fabric, 3.11, 2.0) success ✅
fabric-cpu (macOS-12, fabric, 3.11, 2.1) success ✅
fabric-cpu (ubuntu-22.04, fabric, 3.11, 2.0) success ✅
fabric-cpu (ubuntu-22.04, fabric, 3.11, 2.1) success ✅
fabric-cpu (windows-2022, fabric, 3.11, 2.0) success ✅
fabric-cpu (windows-2022, fabric, 3.11, 2.1) success ✅

These checks are required after the changes to src/lightning/fabric/strategies/fsdp.py, src/lightning/fabric/utilities/imports.py, tests/tests_fabric/strategies/test_fsdp.py.

🟢 lightning_fabric: Azure GPU
Check ID Status
lightning-fabric (GPUs) (testing Fabric | latest) success ✅
lightning-fabric (GPUs) (testing Lightning | latest) success ✅

These checks are required after the changes to src/lightning/fabric/strategies/fsdp.py, src/lightning/fabric/utilities/imports.py, tests/tests_fabric/strategies/test_fsdp.py.

🟢 mypy
Check ID Status
mypy success ✅

These checks are required after the changes to src/lightning/fabric/strategies/fsdp.py, src/lightning/fabric/utilities/imports.py, src/lightning/pytorch/strategies/fsdp.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/fabric/strategies/fsdp.py, src/lightning/fabric/utilities/imports.py, src/lightning/pytorch/strategies/fsdp.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.

@carmocca carmocca force-pushed the carmocca/fsdp-new-apis branch from 0820e94 to c3269c2 Compare February 13, 2024 16:36
awaelchli
awaelchli approved these changes Feb 13, 2024
View reviewed changes
src/lightning/fabric/strategies/fsdp.py Outdated Show resolved Hide resolved
@codecov Codecov
Copy link

codecov bot commented Feb 13, 2024 •
edited
Loading

Codecov Report

Merging #19463 (ed6c702) into master (1d04c10) will decrease coverage by 30%.
The diff coverage is 86%.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #19463      +/-   ##
==========================================
- Coverage      83%      53%     -30%     
==========================================
  Files         450      445       -5     
  Lines       38100    38014      -86     
==========================================
- Hits        31810    20280   -11530     
- Misses       6290    17734   +11444

@carmocca
Copy link
Contributor Author

@awaelchli To fix failing 2.2 tests do you want that I mock the save call so that it doesn't complain about distributed not being initialized?

@awaelchli
Copy link
Contributor

@carmocca Yes that would be great. The test already mocks torch.distributed.checkpoint.save_state_dict, so we should mock the equivalent for 2.2

@carmocca carmocca requested a review from Borda as a code owner February 14, 2024 16:44
Borda
Borda approved these changes Feb 14, 2024
View reviewed changes
src/lightning/fabric/strategies/fsdp.py Show resolved Hide resolved
src/lightning/fabric/strategies/fsdp.py Show resolved Hide resolved
tests/tests_pytorch/strategies/test_fsdp.py Show resolved Hide resolved
@mergify mergify bot added the ready PRs ready to be merged label Feb 14, 2024
@carmocca carmocca merged commit 6745994 into master Feb 14, 2024
113 checks passed
@carmocca carmocca deleted the carmocca/fsdp-new-apis branch February 14, 2024 18:44
awaelchli pushed a commit that referenced this pull request Mar 1, 2024
@carmocca @awaelchli
Avoid FSDP deprecations during save/load with newer torch versions (#…
dde9818 
…19463)

* Avoid FSDP deprecations during save/load with newer torch versions

* Refactor

* Tests
lantiga pushed a commit that referenced this pull request Mar 4, 2024
@carmocca @lantiga
Avoid FSDP deprecations during save/load with newer torch versions (#…
eb90aa4 
…19463)

* Avoid FSDP deprecations during save/load with newer torch versions

* Refactor

* Tests
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

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

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

Assignees

@carmocca carmocca

Labels
fabric lightning.fabric.Fabric pl Generic label for PyTorch Lightning package ready PRs ready to be merged
Projects
None yet
Milestone
2.2.x
Development

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