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

Fix the Gemma generation #1094

Merged
merged 5 commits into from
Jun 18, 2024
Merged

Fix the Gemma generation #1094

merged 5 commits into from
Jun 18, 2024

Conversation

solitude-alive
Copy link
Contributor

@solitude-alive solitude-alive commented Jun 16, 2024

Fix the problem in generation.
Aligned with https://github.com/pytorch/torchtune/blob/main/torchtune/modules/transformer.py .

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)

Please link to any issues this PR addresses.

Changelog

What are the changes made in this PR?

  • Change mask = self.causal_mask[None, None, input_pos] to mask = self.causal_mask[None, input_pos].
    Make GemmaTransformerDecoder aligned with TransformerDecoder in TransformerDecoder.py .

Test plan

Please make sure to do each of the following if applicable to your PR. (If you're not sure about any one of these just ask and we will happily help.)

  • 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.)

Copy link

pytorch-bot bot commented Jun 16, 2024

🔗 Helpful Links

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

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

✅ No Failures

As of commit 1b204e2 with merge base 66d1a9c (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 Jun 16, 2024
@solitude-alive
Copy link
Contributor Author

Using tune generate does not seem to cause any problems, but if I reproduce and rewrite a generation method, the mask will have an extra dimension at that point. After the modification, the problem will not occur.
Actually I'm not sure if this repository needs this modification, if you have any questions, please let me know.

Copy link
Contributor

@RdoubleA RdoubleA left a comment

Choose a reason for hiding this comment

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

You're right that this should match the core TransformerDecoder module, since Gemma's is using the shared TransformerDecoderLayer and CausalSelfAttention. We enforced that the mask be a certain shape after the sample packing updates.

Actually while you're here, do you mind updating the docstrings as well to match TransformerDecoder? I'll approve and run CI in the meantime.

Update docstring.
@solitude-alive
Copy link
Contributor Author

Yeah, I Update the docstrings.

@solitude-alive
Copy link
Contributor Author

Yeah, I Update the docstrings.

Sorry, there are some problems with docstring. I will modify it soon.

Copy link
Contributor Author

@solitude-alive solitude-alive left a comment

Choose a reason for hiding this comment

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

Fix the issue.

@joecummings
Copy link
Contributor

joecummings commented Jun 17, 2024

Workflow test failure is related to tensorflow/tensorboard#6869, not anything wrong with this PR. Investigating now

@joecummings
Copy link
Contributor

@solitude-alive Can you rebase on main? I just merged #1095, which should allow the workflows here to pass.

@solitude-alive
Copy link
Contributor Author

Yeah, I merged main manually, is this work?

@RdoubleA RdoubleA merged commit ef6e196 into pytorch:main Jun 18, 2024
29 checks passed
@solitude-alive solitude-alive deleted the Gemma branch June 18, 2024 07:58
maximegmd pushed a commit to maximegmd/torchtune that referenced this pull request Jul 13, 2024
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