[FSDP] Fix nn.Parameter usage for 2D and use_orig_params=True
#89782
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ghstack-poisoned]
awgu
requested review from
mrshenli,
zhaojuanmao,
pritamdamania87,
rohan-varma,
H-Huang and
kwen2501
as code owners
pytorch-bot
bot
added
the
release notes: distributed (fsdp)
🔗 Helpful Links🧪 See artifacts and rendered test results at hud.pytorch.org/pr/89782
Note: Links to docs will display an error until the docs builds have been completed. ✅ No FailuresAs of commit 93cccd0: This comment was automatically generated by Dr. CI and updates every 15 minutes. |
awgu
added a commit
that referenced
this pull request
Nov 28, 2022
ghstack-source-id: 5830e8be3148aa7fc3514136ae02f81b7417d50e Pull Request resolved: #89782
awgu
commented
Nov 28, 2022
| @@ -1307,7 +1317,10 @@ def _use_unsharded_views(self, as_params: bool) -> None: | |||
| assert tensor is not None # mypy | |||
| param_var = tensor | |||
| setattr(module, param_name, param_var) | |||
| if self._use_orig_params and self._training_state == HandleTrainingState.FORWARD: | |||
| if ( | |||
There was a problem hiding this comment.
This change and below is just ufmt.
|
@pytorchbot rebase -s |
|
@pytorchbot successfully started a rebase job. Check the current status here |
…s=True`" This ensures that all elements of `FlatParameter._params` and `FlatParameter._shared_params` are `nn.Parameter`s (as expected). This was violated by the local tensor of a `DTensor` when using 2D parallelism. To fix the breakage, we simply wrap with `nn.Parameter` if needed. [ghstack-poisoned]
|
Successfully rebased |
pytorchmergebot
pushed a commit
that referenced
this pull request
Nov 28, 2022
ghstack-source-id: 6282e9a1d4fa734eb46ab8a4f9ed6166208a335f Pull Request resolved: #89782
|
@pytorchbot merge |
Merge startedYour change will be merged once all checks pass (ETA 0-4 Hours). Learn more about merging in the wiki. Questions? Feedback? Please reach out to the PyTorch DevX Team |
kulinseth
pushed a commit
to kulinseth/pytorch
that referenced
this pull request
Dec 10, 2022
…torch#89782) This ensures that all elements of `FlatParameter._params` and `FlatParameter._shared_params` are `nn.Parameter`s (as expected). This was violated by the local tensor of a `DTensor` when using 2D parallelism. To fix the breakage, we simply wrap with `nn.Parameter` if needed. Pull Request resolved: pytorch#89782 Approved by: https://github.com/fduwjj
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Stack from ghstack (oldest at bottom):
nn.Parameterusage for 2D anduse_orig_params=True#89782This ensures that all elements of
FlatParameter._paramsandFlatParameter._shared_paramsarenn.Parameters (as expected). This was violated by the local tensor of aDTensorwhen using 2D parallelism. To fix the breakage, we simply wrap withnn.Parameterif needed.