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.

Sign up for GitHub

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

Jump to bottom

switch causal mask for is_causal flag #91171

Closed

mikekgfb wants to merge 1 commit into pytorch:master from mikekgfb:export-D42089340

Contributor

mikekgfb commented Dec 20, 2022

Summary: switch causal mask for is_causal flag

Test Plan: sandcastle & github

Differential Revision: D42089340

mikekgfb requested review from albanD and jbschlosser as code owners

December 20, 2022 15:44

pytorch-bot bot commented Dec 20, 2022 •

edited

🔗 Helpful Links

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

📄 Preview Python docs built from this PR
📄 Preview C++ docs built from this PR
❓ Need help or want to give feedback on the CI? Visit the bot commands wiki or our office hours

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

✅ No Failures

As of commit 200dc51:
💚 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 added the fb-exported label

Contributor

facebook-github-bot commented Dec 20, 2022

This pull request was exported from Phabricator. Differential Revision: D42089340

mikekgfb requested review from cpuhrsch and drisspg

December 24, 2022 21:37

Contributor

facebook-github-bot commented Dec 24, 2022

This pull request was exported from Phabricator. Differential Revision: D42089340

mikekgfb force-pushed the export-D42089340 branch from 7c975d8 to 58177dc Compare

December 24, 2022 21:42

mikekgfb added a commit to mikekgfb/pytorch that referenced this pull request


          switch causal mask for is_causal flag (pytorch#91171)

58177dc

Summary:
Pull Request resolved: pytorch#91171

switch causal mask for is_causal flag

Test Plan: sandcastle & github

Differential Revision: D42089340

fbshipit-source-id: 02c012ee38591216da46b1d5bfe2ae91a7343c74

Contributor

facebook-github-bot commented Dec 25, 2022

This pull request was exported from Phabricator. Differential Revision: D42089340

mikekgfb added a commit to mikekgfb/pytorch that referenced this pull request


          switch causal mask for is_causal flag (pytorch#91171)

4c47d16

Summary:
Pull Request resolved: pytorch#91171

switch causal mask for is_causal flag

Test Plan: sandcastle & github

Differential Revision: D42089340

fbshipit-source-id: a6f79e35c105b509c372d89298e00b261d813cf4

mikekgfb force-pushed the export-D42089340 branch from 58177dc to 4c47d16 Compare

December 25, 2022 00:25

albanD removed their request for review

December 25, 2022 17:48

Contributor

facebook-github-bot commented Dec 28, 2022

This pull request was exported from Phabricator. Differential Revision: D42089340

mikekgfb force-pushed the export-D42089340 branch from 4c47d16 to 030eae5 Compare

December 28, 2022 04:33

mikekgfb requested review from ezyang and Chillee as code owners

December 28, 2022 04:33

mikekgfb added a commit to mikekgfb/pytorch that referenced this pull request


          switch causal mask for is_causal flag (pytorch#91171)

030eae5

Summary:
Pull Request resolved: pytorch#91171

switch causal mask for is_causal flag

Test Plan: sandcastle & github

Differential Revision: D42089340

fbshipit-source-id: 729b6e35dcd419249b6dcf13f68030322ba94ab5

mikekgfb added a commit to mikekgfb/pytorch that referenced this pull request


          switch causal mask for is_causal flag (pytorch#91171)

97b6440

Summary:
Pull Request resolved: pytorch#91171

switch causal mask for is_causal flag

Test Plan: sandcastle & github

Differential Revision: D42089340

fbshipit-source-id: 3172b6cd8fe548fa3b409f92f34356abe1c3b878

mikekgfb force-pushed the export-D42089340 branch from 030eae5 to 97b6440 Compare

December 28, 2022 05:39

Contributor

facebook-github-bot commented Dec 28, 2022

This pull request was exported from Phabricator. Differential Revision: D42089340

1 similar comment

Contributor

facebook-github-bot commented Dec 28, 2022

This pull request was exported from Phabricator. Differential Revision: D42089340

mikekgfb added a commit to mikekgfb/pytorch that referenced this pull request


          switch causal mask for is_causal flag (pytorch#91171)

f955e6b

Summary:
Pull Request resolved: pytorch#91171

switch causal mask for is_causal flag

Test Plan: sandcastle & github

Differential Revision: D42089340

fbshipit-source-id: 81127b0aed62df069b2d0d06ae7cf1ee2152caf4

mikekgfb force-pushed the export-D42089340 branch from 97b6440 to f955e6b Compare

December 28, 2022 05:49

bdhirsh reviewed

View reviewed changes

test/functorch/test_aotdispatch.py Show resolved Hide resolved

Contributor

facebook-github-bot commented Dec 28, 2022

This pull request was exported from Phabricator. Differential Revision: D42089340

mikekgfb force-pushed the export-D42089340 branch from f955e6b to fe5fc74 Compare

December 28, 2022 20:25

mikekgfb added a commit to mikekgfb/pytorch that referenced this pull request


          switch causal mask for is_causal flag (pytorch#91171)

fe5fc74

Summary:
Pull Request resolved: pytorch#91171

switch causal mask for is_causal flag

Test Plan: sandcastle & github

Differential Revision: D42089340

fbshipit-source-id: f2859beec34efea0ca60a70d0dd41c739a27d2f8

mikekgfb added a commit to mikekgfb/pytorch that referenced this pull request


          switch causal mask for is_causal flag (pytorch#91171)

859180b

Summary:
Pull Request resolved: pytorch#91171

switch causal mask for is_causal flag

Test Plan: sandcastle & github

Differential Revision: D42089340

fbshipit-source-id: c38778f29c50b1a25b12669acb2d23aa00c28b32

mikekgfb force-pushed the export-D42089340 branch from db5835a to 79d8d2e Compare

December 28, 2022 23:32

Contributor

facebook-github-bot commented Dec 28, 2022

This pull request was exported from Phabricator. Differential Revision: D42089340

1 similar comment

Contributor

facebook-github-bot commented Dec 29, 2022

This pull request was exported from Phabricator. Differential Revision: D42089340

mikekgfb added a commit to mikekgfb/pytorch that referenced this pull request


          switch causal mask for is_causal flag (pytorch#91171)

7282d68

Summary:
Pull Request resolved: pytorch#91171

switch causal mask for is_causal flag

Test Plan: sandcastle & github

Differential Revision: D42089340

fbshipit-source-id: 2587282fa344cceff7c8a72e521510ea215d3c5c

mikekgfb force-pushed the export-D42089340 branch from 79d8d2e to 7282d68 Compare

December 29, 2022 01:13

albanD reviewed

View reviewed changes

test/functorch/test_aotdispatch.py Show resolved Hide resolved

torch/testing/_internal/common_modules.py Show resolved Hide resolved

jbschlosser reviewed

View reviewed changes

torch/testing/_internal/common_modules.py Outdated Show resolved Hide resolved

jbschlosser reviewed

View reviewed changes

torch/testing/_internal/common_modules.py Show resolved Hide resolved

mikekgfb added a commit to mikekgfb/pytorch that referenced this pull request


          switch causal mask for is_causal flag (pytorch#91171)

7d84fb6

Summary:
Pull Request resolved: pytorch#91171

switch causal mask for is_causal flag

Test Plan: sandcastle & github

Differential Revision: D42089340

fbshipit-source-id: 1497599d3d686ea857c2d4ef4facd079e15a6223

mikekgfb force-pushed the export-D42089340 branch from 7282d68 to 7d84fb6 Compare

December 29, 2022 19:05

Contributor

facebook-github-bot commented Dec 29, 2022

This pull request was exported from Phabricator. Differential Revision: D42089340

jbschlosser reviewed

View reviewed changes

torch/nn/modules/transformer.py Show resolved Hide resolved

wushirong approved these changes

View reviewed changes

mikekgfb added a commit to mikekgfb/pytorch that referenced this pull request


          switch causal mask for is_causal flag (pytorch#91171)

9fd432c

Summary:
Pull Request resolved: pytorch#91171

switch causal mask for is_causal flag

Test Plan: sandcastle & github

Differential Revision: D42089340

fbshipit-source-id: 2cf78877c34c9b1988e8c00607e19d551f0ff88e

mikekgfb force-pushed the export-D42089340 branch from 7d84fb6 to 9fd432c Compare

December 29, 2022 22:14

Contributor

facebook-github-bot commented Dec 29, 2022

This pull request was exported from Phabricator. Differential Revision: D42089340


          switch causal mask for is_causal flag (pytorch#91171)

200dc51

Summary:
Pull Request resolved: pytorch#91171

switch causal mask for is_causal flag

Test Plan: sandcastle & github

Differential Revision: D42089340

fbshipit-source-id: 7c665db6878edf1e9cfc831096b8189612c2b8bb

mikekgfb force-pushed the export-D42089340 branch from 9fd432c to 200dc51 Compare

December 29, 2022 22:51

Contributor

facebook-github-bot commented Dec 29, 2022

This pull request was exported from Phabricator. Differential Revision: D42089340

drisspg reviewed

View reviewed changes

test/test_transformers.py

+                  def test_train_with_is_causal(self, device):
+                      iters = 100
+                      layer = nn.TransformerEncoderLayer(
+                          d_model=2,

Contributor

drisspg Dec 30, 2022

If we want to exercise the fused kernels I would change the d_model to be 16 hence 16/2 heads = 8. Also, the failure initially occurred for fp16 right? Maybe we should do this test with that.

Would this test fail prior to this PR? I am not 100% what its testing, besides more of an end-to-end exercise. Not sure what failures this shows though

drisspg reviewed

View reviewed changes

torch/nn/functional.py

    
            @@ -4847,7 +4847,7 @@ def _in_projection(
          
                   dropout_p (float): Dropout probability; if greater than 0.0, dropout is applied

                   need_attn_weights (bool): If true, the second return value will contain the attention weights used;

                       otherwise, the second return value is unspecified

                   is_causal (bool): If true, assumes causal attention masking; for this case, attn_mask should not be set.

                   is_causal (bool): If true, assumes causal attention masking and ignores attn_mask.

Contributor

drisspg Dec 30, 2022

Just a heads up I know there is a PR for xformers; facebookresearch/xformers#587 that I think will allow for both casual plus additive attn bias. But I think for now this is the right way to go

drisspg reviewed

View reviewed changes

torch/nn/modules/transformer.py

+                      make_causal = (is_causal is True)
+                      if is_causal is None:
+                          if mask is not None:

Contributor

drisspg Dec 30, 2022

nit: if causal and mask is not None

drisspg approved these changes

View reviewed changes

Contributor

drisspg left a comment

One small comment about the test but this looks good

Contributor Author

mikekgfb commented Dec 30, 2022

@pytorchbot merge -f "merge"

pytorch-bot bot commented Dec 30, 2022

You need to provide a reason for using force merge, in the format @pytorchbot merge -f 'Explanation'.
The explanation needs to be clear on why this is needed. Here are some good examples:

Bypass checks due to unrelated upstream failures from ...
This is a minor fix to ..., which shouldn't break anything
This is pre-tested in a previous CI run
Bypass flaky ... check

Contributor Author

mikekgfb commented Dec 30, 2022

@pytorchbot merge -f "This is pre-tested in a previous CI run"

Collaborator

pytorchmergebot commented Dec 30, 2022

Merge started

Your change will be merged immediately since you used the force (-f) flag, bypassing any CI checks (ETA: 1-5 minutes).

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging

Check the merge workflow status
here

pytorchmergebot added the Merged label

pytorchmergebot closed this in

af589b3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

albanD albanD left review comments

bdhirsh bdhirsh left review comments

jbschlosser jbschlosser left review comments

wushirong wushirong approved these changes

drisspg drisspg approved these changes

cpuhrsch Awaiting requested review from cpuhrsch

ezyang Awaiting requested review from ezyang

Chillee Awaiting requested review from Chillee