Skip to content

Avoid moving the model to device if move_to_device=False #19152

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 7 commits into from
Dec 14, 2023
Merged

Avoid moving the model to device if move_to_device=False #19152

merged 7 commits into from
Dec 14, 2023

Conversation

carmocca
Copy link
Contributor

@carmocca carmocca commented Dec 13, 2023 •
edited by github-actions bot
Loading

What does this PR do?

See added test

cc @Borda @carmocca @justusschock @awaelchli

@carmocca carmocca added bug Something isn't working fabric lightning.fabric.Fabric labels Dec 13, 2023
@carmocca carmocca added this to the 2.1.x milestone Dec 13, 2023
@carmocca carmocca self-assigned this Dec 13, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 13, 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.12, oldest) 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.10, 2.1) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.8, 1.12, oldest) 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.10, 2.1) success ✅
pl-cpu (windows-2022, lightning, 3.8, 1.12, oldest) 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.10, 2.1) 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/fabric.py, src/lightning/fabric/utilities/device_dtype_mixin.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/fabric/fabric.py, src/lightning/fabric/utilities/device_dtype_mixin.py.

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

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

🟢 lightning_fabric: CPU workflow
Check ID Status
fabric-cpu (macOS-11, lightning, 3.8, 1.12, oldest) 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.10, 2.0) success ✅
fabric-cpu (macOS-11, lightning, 3.11, 2.1) success ✅
fabric-cpu (ubuntu-20.04, lightning, 3.8, 1.12, oldest) success ✅
fabric-cpu (ubuntu-20.04, lightning, 3.9, 1.12) success ✅
fabric-cpu (ubuntu-20.04, lightning, 3.10, 1.13) success ✅
fabric-cpu (ubuntu-20.04, lightning, 3.10, 2.0) success ✅
fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.1) success ✅
fabric-cpu (windows-2022, lightning, 3.8, 1.12, oldest) success ✅
fabric-cpu (windows-2022, lightning, 3.9, 1.12) success ✅
fabric-cpu (windows-2022, lightning, 3.10, 1.13) success ✅
fabric-cpu (windows-2022, lightning, 3.10, 2.0) success ✅
fabric-cpu (windows-2022, lightning, 3.11, 2.1) 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/fabric.py, src/lightning/fabric/utilities/device_dtype_mixin.py, tests/tests_fabric/strategies/test_fsdp_integration.py, tests/tests_fabric/strategies/test_xla_fsdp_integration.py, tests/tests_fabric/test_fabric.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/fabric.py, src/lightning/fabric/utilities/device_dtype_mixin.py, tests/tests_fabric/strategies/test_fsdp_integration.py, tests/tests_fabric/strategies/test_xla_fsdp_integration.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/device_dtype_mixin.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/fabric.py, src/lightning/fabric/utilities/device_dtype_mixin.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 commented Dec 13, 2023
View reviewed changes
@codecov Codecov
Copy link

codecov bot commented Dec 13, 2023 •
edited
Loading

Codecov Report

Merging #19152 (f8ca5ad) into master (df869c9) will decrease coverage by 29%.
Report is 4 commits behind head on master.
The diff coverage is 100%.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #19152      +/-   ##
==========================================
- Coverage      83%      54%     -29%     
==========================================
  Files         443      438       -5     
  Lines       36764    36665      -99     
==========================================
- Hits        30617    19819   -10798     
- Misses       6147    16846   +10699

awaelchli
awaelchli reviewed Dec 14, 2023
View reviewed changes
@mergify mergify bot removed the has conflicts label Dec 14, 2023
@carmocca carmocca requested a review from awaelchli December 14, 2023 17:02
awaelchli
awaelchli approved these changes Dec 14, 2023
View reviewed changes
@mergify mergify bot added the ready PRs ready to be merged label Dec 14, 2023
@carmocca carmocca merged commit 234ded8 into master Dec 14, 2023
@carmocca carmocca deleted the carmocca/fabric-move-false branch December 14, 2023 23:00
@carmocca carmocca mentioned this pull request Dec 15, 2023
Merged
Borda pushed a commit that referenced this pull request Dec 19, 2023
@carmocca @Borda
Avoid moving the model to device if move_to_device=False (#19152)
662b1ec 
(cherry picked from commit 234ded8)
lantiga pushed a commit that referenced this pull request Dec 20, 2023
@carmocca @lantiga
Avoid moving the model to device if move_to_device=False (#19152)
88ae43e 
(cherry picked from commit 234ded8)
@awaelchli awaelchli mentioned this pull request Apr 10, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@awaelchli awaelchli awaelchli approved these changes

@Borda Borda Borda approved these changes

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

Assignees

@carmocca carmocca

Labels
bug Something isn't working fabric lightning.fabric.Fabric ready PRs ready to be merged
Projects
None yet
Milestone
2.1.x
Development

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