Skip to content

[FSDP] Generalize fsdp_modules() #73553

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

Closed
wants to merge 5 commits into from
Closed

Conversation

fegin
Copy link
Contributor

@fegin fegin commented Mar 1, 2022

Stack from ghstack (oldest at bottom):

Generalize fsdp_modules():

  1. Make fsdp_modules() a static method so that it can be called even when users have no reference to the FSDP module -- it can be wrapped inside an non-FSDP module.
  2. Add root_only option to returns only the root FSDP module(s).

Differential Revision: D34537408

Generalize fsdp_modules():
   1. Make fsdp_modules() a static method so that it can be called even when users have no reference to the FSDP module -- it can be wrapped inside an non-FSDP module.
   2. Add root_only option to returns only the root FSDP module(s).

Differential Revision: [D34537408](https://our.internmc.facebook.com/intern/diff/D34537408/)

[ghstack-poisoned]
@facebook-github-bot
Copy link
Contributor

facebook-github-bot commented Mar 1, 2022

🔗 Helpful links

💊 CI failures summary and remediations

As of commit 39a6c15 (more details on the Dr. CI page):


💚 💚 Looks good so far! There are no failures yet. 💚 💚


This comment was automatically generated by Dr. CI (expand for details).

Please report bugs/suggestions to the (internal) Dr. CI Users group.

Click here to manually regenerate this comment.

@pytorch-bot
Copy link

pytorch-bot bot commented Mar 1, 2022

CI Flow Status

⚛️ CI Flow

Ruleset - Version: v1
Ruleset - File: https://github.com/pytorch/pytorch/blob/175a7b48e4a2a200e071d002b4c9c402a5c1dea0/.github/generated-ciflow-ruleset.json
PR ciflow labels: ciflow/default
Add ciflow labels to this PR to trigger more builds:

Workflows Labels (bold enabled) Status
Triggered Workflows
linux-binary-conda ciflow/binaries, ciflow/binaries_conda, ciflow/default ✅ triggered
linux-binary-libtorch-cxx11-abi ciflow/binaries, ciflow/binaries_libtorch, ciflow/default ✅ triggered
linux-binary-libtorch-pre-cxx11 ciflow/binaries, ciflow/binaries_libtorch, ciflow/default ✅ triggered
linux-binary-manywheel ciflow/binaries, ciflow/binaries_wheel, ciflow/default ✅ triggered
linux-bionic-py3.7-clang9 ciflow/all, ciflow/cpu, ciflow/default, ciflow/linux, ciflow/noarch, ciflow/trunk ✅ triggered
linux-bionic-rocm4.5-py3.7 ciflow/all, ciflow/default, ciflow/linux, ciflow/rocm, ciflow/trunk ✅ triggered
linux-docs ciflow/all, ciflow/cpu, ciflow/default, ciflow/docs, ciflow/linux, ciflow/trunk ✅ triggered
linux-vulkan-bionic-py3.7-clang9 ciflow/all, ciflow/cpu, ciflow/default, ciflow/linux, ciflow/trunk, ciflow/vulkan ✅ triggered
linux-xenial-cuda11.3-py3.7-gcc7 ciflow/all, ciflow/cuda, ciflow/default, ciflow/linux, ciflow/trunk ✅ triggered
linux-xenial-cuda11.3-py3.7-gcc7-bazel-test ciflow/all, ciflow/bazel, ciflow/cpu, ciflow/default, ciflow/linux, ciflow/trunk ✅ triggered
linux-xenial-py3-clang5-mobile-build ciflow/all, ciflow/default, ciflow/linux, ciflow/mobile, ciflow/trunk ✅ triggered
linux-xenial-py3-clang5-mobile-custom-build-static ciflow/all, ciflow/default, ciflow/linux, ciflow/mobile, ciflow/trunk ✅ triggered
linux-xenial-py3.7-clang7-asan ciflow/all, ciflow/cpu, ciflow/default, ciflow/linux, ciflow/sanitizers, ciflow/trunk ✅ triggered
linux-xenial-py3.7-clang7-onnx ciflow/all, ciflow/cpu, ciflow/default, ciflow/linux, ciflow/onnx, ciflow/trunk ✅ triggered
linux-xenial-py3.7-gcc5.4 ciflow/all, ciflow/cpu, ciflow/default, ciflow/linux, ciflow/trunk ✅ triggered
linux-xenial-py3.7-gcc7 ciflow/all, ciflow/cpu, ciflow/default, ciflow/linux, ciflow/trunk ✅ triggered
linux-xenial-py3.7-gcc7-no-ops ciflow/all, ciflow/cpu, ciflow/default, ciflow/linux, ciflow/trunk ✅ triggered
macos-arm64-binary-conda ciflow/binaries, ciflow/binaries_conda, ciflow/default ✅ triggered
macos-arm64-binary-wheel ciflow/binaries, ciflow/binaries_wheel, ciflow/default ✅ triggered
macos-binary-conda ciflow/binaries, ciflow/binaries_conda, ciflow/default ✅ triggered
macos-binary-libtorch-cxx11-abi ciflow/binaries, ciflow/binaries_libtorch, ciflow/default ✅ triggered
macos-binary-libtorch-pre-cxx11 ciflow/binaries, ciflow/binaries_libtorch, ciflow/default ✅ triggered
macos-binary-wheel ciflow/binaries, ciflow/binaries_wheel, ciflow/default ✅ triggered
pytorch-linux-xenial-py3-clang5-android-ndk-r19c-gradle-custom-build-single ciflow/all, ciflow/android, ciflow/cpu, ciflow/default, ciflow/linux, ciflow/trunk ✅ triggered
pytorch-linux-xenial-py3-clang5-android-ndk-r19c-gradle-custom-build-single-full-jit ciflow/all, ciflow/android, ciflow/cpu, ciflow/default, ciflow/linux, ciflow/trunk ✅ triggered
win-vs2019-cpu-py3 ciflow/all, ciflow/cpu, ciflow/default, ciflow/trunk, ciflow/win ✅ triggered
win-vs2019-cuda11.3-py3 ciflow/all, ciflow/cuda, ciflow/default, ciflow/trunk, ciflow/win ✅ triggered
windows-binary-libtorch-cxx11-abi ciflow/binaries, ciflow/binaries_libtorch, ciflow/default ✅ triggered
windows-binary-libtorch-pre-cxx11 ciflow/binaries, ciflow/binaries_libtorch, ciflow/default ✅ triggered
windows-binary-wheel ciflow/binaries, ciflow/binaries_wheel, ciflow/default ✅ triggered
Skipped Workflows
caffe2-linux-xenial-py3.7-gcc5.4 ciflow/all, ciflow/cpu, ciflow/linux, ciflow/trunk 🚫 skipped
docker-builds ciflow/all, ciflow/trunk 🚫 skipped
ios-12-5-1-arm64 ciflow/all, ciflow/ios, ciflow/macos, ciflow/scheduled 🚫 skipped
ios-12-5-1-arm64-coreml ciflow/all, ciflow/ios, ciflow/macos, ciflow/scheduled 🚫 skipped
ios-12-5-1-arm64-custom-ops ciflow/all, ciflow/ios, ciflow/macos, ciflow/scheduled 🚫 skipped
ios-12-5-1-arm64-metal ciflow/all, ciflow/ios, ciflow/macos, ciflow/scheduled 🚫 skipped
ios-12-5-1-x86-64 ciflow/all, ciflow/ios, ciflow/macos, ciflow/trunk 🚫 skipped
ios-12-5-1-x86-64-coreml ciflow/all, ciflow/ios, ciflow/macos, ciflow/trunk 🚫 skipped
libtorch-linux-xenial-cuda10.2-py3.7-gcc7 ciflow/all, ciflow/cuda, ciflow/libtorch, ciflow/linux, ciflow/trunk 🚫 skipped
libtorch-linux-xenial-cuda11.3-py3.7-gcc7 ciflow/all, ciflow/cuda, ciflow/libtorch, ciflow/linux, ciflow/trunk 🚫 skipped
linux-bionic-cuda10.2-py3.9-gcc7 ciflow/all, ciflow/cuda, ciflow/linux, ciflow/slow, ciflow/trunk 🚫 skipped
linux-docs-push ciflow/all, ciflow/cpu, ciflow/linux, ciflow/scheduled 🚫 skipped
linux-xenial-cuda11.3-py3.7-gcc7-no-ops ciflow/all, ciflow/cuda, ciflow/linux, ciflow/trunk 🚫 skipped
macos-10-15-py3-arm64 ciflow/all, ciflow/macos, ciflow/trunk 🚫 skipped
macos-10-15-py3-lite-interpreter-x86-64 ciflow/all, ciflow/macos, ciflow/trunk 🚫 skipped
macos-11-py3-x86-64 ciflow/all, ciflow/macos, ciflow/trunk 🚫 skipped
parallelnative-linux-xenial-py3.7-gcc5.4 ciflow/all, ciflow/cpu, ciflow/linux, ciflow/trunk 🚫 skipped
periodic-libtorch-linux-bionic-cuda11.5-py3.7-gcc7 ciflow/all, ciflow/cuda, ciflow/libtorch, ciflow/linux, ciflow/scheduled 🚫 skipped
periodic-linux-bionic-cuda11.5-py3.7-gcc7 ciflow/all, ciflow/cuda, ciflow/linux, ciflow/scheduled 🚫 skipped
periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck ciflow/all, ciflow/cuda, ciflow/linux, ciflow/scheduled, ciflow/slow, ciflow/slow-gradcheck 🚫 skipped
periodic-linux-xenial-cuda11.3-py3.7-gcc7-debug ciflow/all, ciflow/cuda, ciflow/linux, ciflow/scheduled 🚫 skipped
periodic-win-vs2019-cuda11.5-py3 ciflow/all, ciflow/cuda, ciflow/scheduled, ciflow/win 🚫 skipped
pytorch-linux-xenial-py3-clang5-android-ndk-r19c-build ciflow/all, ciflow/android, ciflow/cpu, ciflow/linux, ciflow/trunk 🚫 skipped
pytorch-xla-linux-bionic-py3.7-clang8 ciflow/all, ciflow/cpu, ciflow/linux, ciflow/trunk, ciflow/xla 🚫 skipped

@facebook-github-bot facebook-github-bot added the oncall: distributed Add this issue/PR to distributed oncall triage queue label Mar 1, 2022
fegin added a commit that referenced this pull request Mar 1, 2022
Generalize fsdp_modules():
   1. Make fsdp_modules() a static method so that it can be called even when users have no reference to the FSDP module -- it can be wrapped inside an non-FSDP module.
   2. Add root_only option to returns only the root FSDP module(s).

Differential Revision: [D34537408](https://our.internmc.facebook.com/intern/diff/D34537408/)

ghstack-source-id: 150164370
Pull Request resolved: #73553
Copy link
Member

@rohan-varma rohan-varma left a comment

Choose a reason for hiding this comment

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

Lgtm but could we have some unit test with this change?

Copy link
Contributor

@zhaojuanmao zhaojuanmao left a comment

Choose a reason for hiding this comment

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

codes look good to me, thanks for adding this!

Generalize fsdp_modules():
   1. Make fsdp_modules() a static method so that it can be called even when users have no reference to the FSDP module -- it can be wrapped inside an non-FSDP module.
   2. Add root_only option to returns only the root FSDP module(s).

Differential Revision: [D34537408](https://our.internmc.facebook.com/intern/diff/D34537408/)

[ghstack-poisoned]
Generalize fsdp_modules():
   1. Make fsdp_modules() a static method so that it can be called even when users have no reference to the FSDP module -- it can be wrapped inside an non-FSDP module.
   2. Add root_only option to returns only the root FSDP module(s).

Differential Revision: [D34537408](https://our.internmc.facebook.com/intern/diff/D34537408/)

[ghstack-poisoned]
fegin added a commit that referenced this pull request Mar 3, 2022
Pull Request resolved: #73553

Generalize fsdp_modules():
   1. Make fsdp_modules() a static method so that it can be called even when users have no reference to the FSDP module -- it can be wrapped inside an non-FSDP module.
   2. Add root_only option to returns only the root FSDP module(s).
ghstack-source-id: 150392207

Differential Revision: [D34537408](https://our.internmc.facebook.com/intern/diff/D34537408/)
Generalize fsdp_modules():
   1. Make fsdp_modules() a static method so that it can be called even when users have no reference to the FSDP module -- it can be wrapped inside an non-FSDP module.
   2. Add root_only option to returns only the root FSDP module(s).

Differential Revision: [D34537408](https://our.internmc.facebook.com/intern/diff/D34537408/)

[ghstack-poisoned]
fegin added a commit that referenced this pull request Mar 3, 2022
Pull Request resolved: #73553

Generalize fsdp_modules():
   1. Make fsdp_modules() a static method so that it can be called even when users have no reference to the FSDP module -- it can be wrapped inside an non-FSDP module.
   2. Add root_only option to returns only the root FSDP module(s).
ghstack-source-id: 150442403

Differential Revision: [D34537408](https://our.internmc.facebook.com/intern/diff/D34537408/)
Generalize fsdp_modules():
   1. Make fsdp_modules() a static method so that it can be called even when users have no reference to the FSDP module -- it can be wrapped inside an non-FSDP module.
   2. Add root_only option to returns only the root FSDP module(s).

Differential Revision: [D34537408](https://our.internmc.facebook.com/intern/diff/D34537408/)

[ghstack-poisoned]
fegin added a commit that referenced this pull request Mar 7, 2022
Pull Request resolved: #73553

Generalize fsdp_modules():
   1. Make fsdp_modules() a static method so that it can be called even when users have no reference to the FSDP module -- it can be wrapped inside an non-FSDP module.
   2. Add root_only option to returns only the root FSDP module(s).
ghstack-source-id: 150690955

Differential Revision: [D34537408](https://our.internmc.facebook.com/intern/diff/D34537408/)
@rohan-varma rohan-varma self-requested a review March 7, 2022 20:20
Copy link
Member

@rohan-varma rohan-varma left a comment

Choose a reason for hiding this comment

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

Thanks for adding the tests!

facebook-github-bot pushed a commit that referenced this pull request Mar 8, 2022
Summary:
Pull Request resolved: #73553

Generalize fsdp_modules():
   1. Make fsdp_modules() a static method so that it can be called even when users have no reference to the FSDP module -- it can be wrapped inside an non-FSDP module.
   2. Add root_only option to returns only the root FSDP module(s).
ghstack-source-id: 150690955

Test Plan: CI

Reviewed By: rohan-varma

Differential Revision: D34537408

fbshipit-source-id: 1bf057704954e8177d0a28f2b3d0dae4da882249
@github-actions
Copy link
Contributor

github-actions bot commented Mar 8, 2022

Hey @fegin.
You've committed this PR, but it does not have both a 'release notes: ...' and 'topics: ...' label. Please add one of each to the PR. The 'release notes: ...' label should represent the part of PyTorch that this PR changes (fx, autograd, distributed, etc) and the 'topics: ...' label should represent the kind of PR it is (not user facing, new feature, bug fix, perf improvement, etc). The list of valid labels can be found here for the 'release notes: ...' and here for the 'topics: ...'.
For changes that are 'topic: not user facing' there is no need for a release notes label.

cyyever pushed a commit to cyyever/pytorch_private that referenced this pull request Mar 9, 2022
Summary:
Pull Request resolved: pytorch/pytorch#73553

Generalize fsdp_modules():
   1. Make fsdp_modules() a static method so that it can be called even when users have no reference to the FSDP module -- it can be wrapped inside an non-FSDP module.
   2. Add root_only option to returns only the root FSDP module(s).
ghstack-source-id: 150690955

Test Plan: CI

Reviewed By: rohan-varma

Differential Revision: D34537408

fbshipit-source-id: 1bf057704954e8177d0a28f2b3d0dae4da882249
(cherry picked from commit 437aad7a3b612ca275213c32c2fa6ac37f2ed3ab)
cyyever pushed a commit to cyyever/pytorch_private that referenced this pull request Mar 9, 2022
Summary:
Pull Request resolved: pytorch/pytorch#73553

Generalize fsdp_modules():
   1. Make fsdp_modules() a static method so that it can be called even when users have no reference to the FSDP module -- it can be wrapped inside an non-FSDP module.
   2. Add root_only option to returns only the root FSDP module(s).
ghstack-source-id: 150690955

Test Plan: CI

Reviewed By: rohan-varma

Differential Revision: D34537408

fbshipit-source-id: 1bf057704954e8177d0a28f2b3d0dae4da882249
(cherry picked from commit 437aad7a3b612ca275213c32c2fa6ac37f2ed3ab)
@facebook-github-bot facebook-github-bot deleted the gh/fegin/7/head branch March 11, 2022 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla signed oncall: distributed Add this issue/PR to distributed oncall triage queue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants