8000 [FlexAttention] Remove Old Constraint on lastdim strides by drisspg · Pull Request #151959 · pytorch/pytorch · GitHub
[go: up one dir, main page]
Skip to content

[FlexAttention] Remove Old Constraint on lastdim strides #151959

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
Closed
wants to merge 5 commits into from
Closed

[FlexAttention] Remove Old Constraint on lastdim strides #151959

wants to merge 5 commits into from

Conversation

drisspg
Copy link
Contributor
@drisspg drisspg commented Apr 22, 2025 •
edited
Loading

@drisspg
Update
009e989 
[ghstack-poisoned]
@drisspg drisspg mentioned this pull request Apr 22, 2025
Closed
@pytorch-bot PyTorch Bot
Copy link
pytorch-bot bot commented Apr 22, 2025 •
edited
Loading

🔗 Helpful Links

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

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

✅ No Failures

As of commit 66f3456 with merge base cc793e8 (image):
💚 Looks good so far! There are no failures yet. 💚

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

drisspg added a commit that referenced this pull request Apr 22, 2025
@drisspg
[FlexAttention] Remove Old Constraint on lastdim strides
831eb6a 
ghstack-source-id: adbb70a
Pull Request resolved: #151959
@drisspg drisspg added this to the 2.7.1 milestone Apr 22, 2025
@drisspg
Update 8000
fc93985 
[ghstack-poisoned]
drisspg added a commit that referenced this pull request Apr 22, 2025
@drisspg
[FlexAttention] Remove Old Constraint on last dim strides
b093bb5 
ghstack-source-id: adbb70a
Pull Request resolved: #151959
@drisspg drisspg added module: nn Related to torch.nn release notes: nn release notes category topic: bug fixes topic category labels Apr 22, 2025
@drisspg drisspg mentioned this pull request Apr 22, 2025
Closed
@drisspg
Update
9468ec1 
[ghstack-poisoned]
drisspg added a commit that referenced this pull request Apr 23, 2025
@drisspg
[FlexAttention] Remove Old Constraint on last dim strides
481c2b4 
ghstack-source-id: b1b88a9
Pull Request resolved: #151959
@drisspg
Update
99b3a73 
[ghstack-poisoned]
drisspg added a commit that referenced this pull request Apr 23, 2025
@drisspg
[FlexAttention] Remove Old Constraint on last dim strides
155a653 
ghstack-source-id: 287e517
Pull Request resolved: #151959
@drisspg
Copy link
Contributor Author
drisspg commented Apr 23, 2025

@pytorchbot merge

@pytorch-bot pytorch-bot bot added the ciflow/trunk Trigger trunk jobs on your pull request label Apr 23, 2025
@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 jobs have failed, first few of them are: trunk / linux-focal-rocm-py3.10 / test (default, 2, 2, linux.rocm.gpu.2)

Details for Dev Infra team Raised by workflow job

@drisspg
Copy link
Contributor Author
drisspg commented Apr 23, 2025

@pytorchbot merge -i "flaky infra failure"

@pytorch-bot PyTorch Bot
Copy link
pytorch-bot bot commented Apr 23, 2025

❌ 🤖 pytorchbot command failed:

@pytorchbot: error: unrecognized arguments: flaky infra failure

usage: @pytorchbot [-h] {merge,revert,rebase,label,drci,cherry-pick,close} ...

Try @pytorchbot --help for more info.

@drisspg
Copy link
Contributor Author
drisspg commented Apr 23, 2025

@pytorchbot merge -i

@pytorchmergebot
Copy link
Collaborator

Merge started

Your change will be merged while ignoring the following 1 checks: trunk / linux-focal-rocm-py3.10 / test (default, 2, 2, linux.rocm.gpu.2)

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: Command git -C /home/runner/work/pytorch/pytorch cherry-pick -x 3699c862349318ea7ad08c9d50e6d1745142e516 returned non-zero exit code 1

The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
On branch main
Your branch is up to date with 'origin/main'.

You are currently cherry-picking commit 3699c862349.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean
Details for Dev Infra team Raised by workflow job

@drisspg
Update
66f3456 
[ghstack-poisoned]
drisspg added a commit that referenced this pull request Apr 23, 2025
@drisspg
[FlexAttention] Remove Old Constraint on last dim strides
cd6274e 
ghstack-source-id: 2dd8f81
Pull Request resolved: #151959
@drisspg
Copy link
Contributor Author
drisspg commented Apr 23, 2025

@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

wangkuiyi pushed a commit to wangkuiyi/pytorch that referenced this pull request Apr 25, 2025
@drisspg @wangkuiyi
[FlexAttention] Remove Old Constraint on lastdim strides (pytorch#151959
3350e8c 
)

Fixes: pytorch#148827

Pull Request resolved: pytorch#151959
Approved by: https://github.com/Chillee
ghstack dependencies: pytorch#151846
@atalman
Copy link
Contributor
atalman commented May 7, 2025

@pytorchbot cherry-pick --onto release/2.7 -c critical

@pytorchbot
Copy link
Collaborator

Cherry picking #151959

Command git -C /home/runner/work/pytorch/pytorch cherry-pick -x 4e1d4333f7a6c9335f1f6d27cc1043b0428c0e42 returned non-zero exit code 1

Auto-merging test/inductor/test_flex_attention.py
CONFLICT (content): Merge conflict in test/inductor/test_flex_attention.py
Auto-merging torch/_inductor/kernel/flex_attention.py
error: could not apply 4e1d4333f7a... [FlexAttention] Remove Old Constraint on lastdim strides (#151959)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Details for Dev Infra team Raised by workflow job

This was referenced May 7, 2025
Merged
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Chillee Chillee Chillee approved these changes

@eellison eellison Awaiting requested review from eellison

@BoyuanFeng BoyuanFeng Awaiting requested review from BoyuanFeng

Assignees
No one assigned
Labels
ciflow/inductor ciflow/trunk Trigger trunk jobs on your pull request Merged module: inductor module: nn Related to torch.nn release notes: nn release notes category topic: bug fixes topic category
Projects
None yet
Milestone
2.7.1
Development

Successfully merging this pull request may close these issues.
5 participants
@drisspg @pytorchmergebot @atalman @pytorchbot @Chillee
0