Fix FSDPv2 checkpoint saving on TPU by using recursive unwrap #41844
+5
−4
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.
What does this PR do?
This PR fixes checkpoint saving for FSDPv2 (SPMD) on TPU by properly unwrapping nested FSDP wrappers before extracting the model state dict.
When using FSDPv2 on TPU, models have nested FSDP wrappers around each transformer layer. The previous implementation only unwrapped the top-level wrapper, causing the saved checkpoint to contain wrapped state dict keys instead of the actual model parameters. This resulted in:
The fix uses
unwrap_modelwithrecursive=Truespecifically for FSDPv2 to unwrap all nested wrappers, then extracts the state dict from the fully unwrapped model. This ensures clean parameter keys in saved checkpoints while maintaining backward compatibility with FSDPv1 and other training configurations.#36004
Fixes #36004
Before submitting
Pull Request section?
to it if that's the case.
documentation guidelines, and
here are tips on formatting docstrings.
Who can review?
Anyone in the community is free to review the PR once the tests have passed. Feel free to tag
members/contributors who may be interested in your PR.
@SunMarc @muellerzr