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

[Nested Tensor]fix sdpa backward for the special case with ragged second batch dim and constant length #128349

Closed
wants to merge 5 commits into from

Conversation

YuqingJ
Copy link
Contributor

@YuqingJ YuqingJ commented Jun 10, 2024

…ond batch dim and constant length

[ghstack-poisoned]
Copy link

pytorch-bot bot commented Jun 10, 2024

🔗 Helpful Links

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

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

✅ You can merge normally! (2 Unrelated Failures)

As of commit 9fdcb0e with merge base 920ebcc (image):

FLAKY - The following jobs failed but were likely due to flakiness present on trunk:

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

YuqingJ added a commit that referenced this pull request Jun 10, 2024
…ond batch dim and constant length

ghstack-source-id: 71c901331e6ded792c76bf719efa1b6df60ff928
Pull Request resolved: #128349
@YuqingJ YuqingJ requested a review from jbschlosser June 10, 2024 21:27
@YuqingJ YuqingJ marked this pull request as ready for review June 10, 2024 21:39
Copy link
Contributor

@jbschlosser jbschlosser left a comment

Choose a reason for hiding this comment

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

Looks great, thanks for the fix!

@davidberard98 davidberard98 added the release notes: nested tensor Changes that have a direct impact on nested tensors label Jun 12, 2024
@YuqingJ
Copy link
Contributor Author

YuqingJ commented Jun 14, 2024

@pytorchbot rebase

@pytorchmergebot
Copy link
Collaborator

@pytorchbot started a rebase job onto refs/remotes/origin/viable/strict. Check the current status here

@pytorchmergebot
Copy link
Collaborator

Rebase failed due to Command git -C /home/runner/work/pytorch/pytorch rebase refs/remotes/origin/viable/strict gh/yuqingj/1/orig returned non-zero exit code 1

Rebasing (1/1)
Auto-merging test/test_nestedtensor.py
CONFLICT (content): Merge conflict in test/test_nestedtensor.py
error: could not apply dc2c1ba22a1... [Nested Tensor]fix sdpa backward for the special case with ragged second batch dim and constant length
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Could not apply dc2c1ba22a1... [Nested Tensor]fix sdpa backward for the special case with ragged second batch dim and constant length

Raised by https://github.com/pytorch/pytorch/actions/runs/9522329915

… ragged second batch dim and constant length"

[ghstack-poisoned]
@YuqingJ
Copy link
Contributor Author

YuqingJ commented Jun 17, 2024

@pytorchbot rebase

@pytorchmergebot
Copy link
Collaborator

@pytorchbot started a rebase job onto refs/remotes/origin/viable/strict. Check the current status here

[ghstack-poisoned]
@pytorchmergebot
Copy link
Collaborator

Successfully rebased gh/yuqingj/1/orig onto refs/remotes/origin/viable/strict, please pull locally before adding more changes (for example, via ghstack checkout https://github.com/pytorch/pytorch/pull/128349)

pytorchmergebot pushed a commit that referenced this pull request Jun 17, 2024
…ond batch dim and constant length

ghstack-source-id: 8933edaaa9716b42193fb9cb31122e6da14267b5
Pull Request resolved: #128349
@YuqingJ
Copy link
Contributor Author

YuqingJ commented Jun 17, 2024

@pytorchbot merge

@pytorch-bot pytorch-bot bot added the ciflow/trunk Trigger trunk jobs on your pull request label Jun 17, 2024
@pytorchmergebot
Copy link
Collaborator

Merge started

Your 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

Advanced Debugging
Check the merge workflow status
here

@pytorchmergebot
Copy link
Collaborator

Merge failed

Reason: 1 mandatory check(s) failed. The first few are:

Dig deeper by viewing the failures on hud

Details for Dev Infra team Raised by workflow job

Failing merge rule: Core Maintainers

@YuqingJ
Copy link
Contributor Author

YuqingJ commented Jun 18, 2024

@pytorchbot rebase

@pytorchmergebot
Copy link
Collaborator

@pytorchbot started a rebase job onto refs/remotes/origin/viable/strict. Check the current status here

[ghstack-poisoned]
@pytorchmergebot
Copy link
Collaborator

Successfully rebased gh/yuqingj/1/orig onto refs/remotes/origin/viable/strict, please pull locally before adding more changes (for example, via ghstack checkout https://github.com/pytorch/pytorch/pull/128349)

pytorchmergebot pushed a commit that referenced this pull request Jun 18, 2024
…ond batch dim and constant length

ghstack-source-id: a06244b981b7614105fcd7c1c5782702f3c56564
Pull Request resolved: #128349
… ragged second batch dim and constant length"

[ghstack-poisoned]
YuqingJ added a commit that referenced this pull request Jun 24, 2024
…ond batch dim and constant length

ghstack-source-id: 7d30bba1c0eb5a16aba3ffd30e8a3c5fa74064f5
Pull Request resolved: #128349
@YuqingJ
Copy link
Contributor Author

YuqingJ commented Jun 24, 2024

@pytorchbot merge

@pytorchmergebot
Copy link
Collaborator

Merge started

Your 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

Advanced Debugging
Check the merge workflow status
here

@github-actions github-actions bot deleted the gh/yuqingj/1/head branch July 25, 2024 01:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ciflow/trunk Trigger trunk jobs on your pull request Merged release notes: nested tensor Changes that have a direct impact on nested tensors
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants