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.

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

Support for unsharded parameters in state_dict APIs #2023

Merged
merged 4 commits into from
Nov 19, 2024

Conversation

RdoubleA
Copy link
Contributor

@RdoubleA RdoubleA commented Nov 18, 2024

Context

What is the purpose of this PR? Is it to

  • add a new feature
  • fix a bug
  • update tests and/or documentation
  • other (please add here)

Credit goes to @ifed-ucsd for the original commit, I've adapted it a bit to our latest APIs. Original summary:

"This diff adds functionality to shard the model separately from the vocabulary pruning, which allows us to run training keeping the model in bf16 and the vocab pruning in fp32"

Changelog

What are the changes made in this PR?
*

Test plan

Please make sure to do each of the following if applicable to your PR. If you're unsure about any one of these just ask and we will happily help. We also have a contributing page for some guidance on contributing.

  • run pre-commit hooks and linters (make sure you've first installed via pre-commit install)
  • add unit tests for any new functionality
  • update docstrings for any new or updated methods or classes
  • run unit tests via pytest tests
  • run recipe tests via pytest tests -m integration_test
  • manually run any new or modified recipes with sufficient proof of correctness
  • include relevant commands and any other artifacts in this summary (pastes of loss curves, eval results, etc.)

UX

If your function changed a public API, please add a dummy example of what the user experience will look like when calling it.
Here is a docstring example
and a tutorial example

  • I did not change any public API
  • I have added an example to docs or docstrings

Copy link

pytorch-bot bot commented Nov 18, 2024

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/torchtune/2023

Note: Links to docs will display an error until the docs builds have been completed.

❗ 1 Active SEVs

There are 1 currently active SEVs. If your PR is affected, please view them below:

✅ No Failures

As of commit 687e0a0 with merge base d5c54f3 (image):
💚 Looks good so far! There are no failures yet. 💚

This comment was automatically generated by Dr. CI and updates every 15 minutes.

@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Nov 18, 2024
Copy link
Contributor

@pbontrager pbontrager left a comment

Choose a reason for hiding this comment

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

Added some questions around edge cases.

@@ -242,7 +245,9 @@ def gather_cpu_state_dict(
if sharded_param.is_cpu:
# Move back to device if offloaded to CPU
sharded_param = sharded_param.to(device)
if isinstance(sharded_param._local_tensor, NF4Tensor):
if hasattr(sharded_param, "_local_tensor") and isinstance(
Copy link
Contributor

Choose a reason for hiding this comment

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

If the tensor isn't sharded but it still a NF4Tensor, we still need to upcast the datatype as is done on line 271

Copy link
Contributor Author

Choose a reason for hiding this comment

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

so maybe another elif in the case that the tensor is unsharded, but still NF4Tensor, and just need to call line 271?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think this would be much cleaner if at the top of the loop we do:

if hasattr(...):
	# get full tensor (NF4 or .full_tensor)
if full_param is NF4:
	# upcast
if is_rank_zero:
	# the rest the same

This code still seems to assume that the unsharded param is on rank0 which isn't guaranteed

torchtune/training/_distributed.py Outdated Show resolved Hide resolved
Copy link
Contributor

@SLR722 SLR722 left a comment

Choose a reason for hiding this comment

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

Looks good to me

@RdoubleA RdoubleA merged commit 352cf4b into pytorch:main Nov 19, 2024
17 checks passed
@RdoubleA RdoubleA deleted the igor branch November 19, 2024 18:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants