Skip to content

[BC Breaking] Remove flex + njt code paths#161734

Closed
drisspg wants to merge 4 commits intogh/drisspg/196/basefrom
gh/drisspg/196/head
Closed

[BC Breaking] Remove flex + njt code paths#161734
drisspg wants to merge 4 commits intogh/drisspg/196/basefrom
gh/drisspg/196/head

Conversation

@drisspg
Copy link
Contributor

@drisspg drisspg commented Aug 28, 2025 •
edited by pytorch-bot bot
Loading

@drisspg
Update
3f0f2c3 
[ghstack-poisoned]
drisspg added a commit that referenced this pull request Aug 28, 2025
@drisspg
[BC Breaking] Remove flex + njt code paths
f39c70e 
ghstack-source-id: 0cf08ec
Pull-Request: #161734
@drisspg drisspg mentioned this pull request Aug 28, 2025
Closed
@pytorch-bot
Copy link

pytorch-bot bot commented Aug 28, 2025 •
edited
Loading

🔗 Helpful Links

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

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

✅ No Failures

As of commit 59e56d6 with merge base 8e05749 (image):
💚 Looks good so far! There are no failures yet. 💚

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

@drisspg
Update
6aab471 
[ghstack-poisoned]
drisspg added a commit that referenced this pull request Aug 28, 2025
@drisspg
[BC Breaking] Remove flex + njt code paths
2fc7773 
ghstack-source-id: 7a81e51
Pull-Request: #161734
@drisspg drisspg mentioned this pull request Sep 3, 2025
Closed
@drisspg drisspg added module: nestedtensor NestedTensor tag see issue #25032 topic: bc breaking topic category module: flex attention suppress-bc-linter Suppresses the failures of API backward-compatibility linter (Lint/bc_linter) labels Sep 8, 2025
@drisspg drisspg requested review from soulitzer and removed request for mikaylagawarecki September 8, 2025 02:03
@drisspg
Copy link
Contributor Author

drisspg commented Sep 8, 2025

@jbschlosser Can I get a review

@drisspg
Update
2c0ea51 
[ghstack-poisoned]
drisspg added a commit that referenced this pull request Sep 8, 2025
@drisspg
[BC Breaking] Remove flex + njt code paths
85bf389 
ghstack-source-id: b63e48d
Pull-Request: #161734
@drisspg drisspg added release notes: nn release notes category ciflow/trunk Trigger trunk jobs on your pull request labels Sep 8, 2025
jbschlosser
jbschlosser approved these changes Sep 8, 2025
View reviewed changes
Copy link
Contributor

@jbschlosser jbschlosser left a comment •
edited
Loading

Choose a reason for hiding this comment

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

alright, rip off the band-aid :(

@mikaylagawarecki mikaylagawarecki mentioned this pull request Sep 12, 2025
Merged
@drisspg
Copy link
Contributor Author

drisspg commented Sep 15, 2025

@pytorchbot merge

@pytorchmergebot
Copy link
Collaborator

pytorchmergebot commented Sep 15, 2025

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

pytorchmergebot commented Sep 15, 2025

Merge failed

Reason: Command git -C /home/runner/work/pytorch/pytorch cherry-pick -x 85bf38954bb64c6bd2d912d3380a4a78aff365f5 returned non-zero exit code 1

Auto-merging docs/source/nn.attention.flex_attention.md
Auto-merging test/test_nestedtensor.py
CONFLICT (content): Merge conflict in test/test_nestedtensor.py
Auto-merging torch/_higher_order_ops/flex_attention.py
CONFLICT (content): Merge conflict in torch/_higher_order_ops/flex_attention.py
Auto-merging torch/nested/_internal/ops.py
CONFLICT (content): Merge conflict in torch/nested/_internal/ops.py
Auto-merging torch/nn/attention/flex_attention.py
error: could not apply 85bf38954bb... [BC Breaking] Remove flex + njt code paths
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

@drisspg
Update
59e56d6 
[ghstack-poisoned]
drisspg added a commit that referenced this pull request Sep 15, 2025
@drisspg
[BC Breaking] Remove flex + njt code paths
3847d45 
ghstack-source-id: 35c23d2
Pull-Request: #161734
svekars added a commit to pytorch/tutorials that referenced this pull request Sep 15, 2025
@mikaylagawarecki @svekars
Delete FlexAttention + NJT composition from tutorial (#3561)
702e642 
Fix broken CI
https://github.com/pytorch/tutorials/actions/runs/17684562516/job/50266336429?pr=3553#step:9:11267

We should delete this because NJT support will be deleted from
FlexAttention in pytorch/pytorch#161734

Co-authored-by: Svetlana Karslioglu <svekars@meta.com>
@drisspg
Copy link
Contributor Author

drisspg commented Sep 16, 2025

@pytorchbot merge

@pytorchmergebot
Copy link
Collaborator

pytorchmergebot commented Sep 16, 2025

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

markc-614 pushed a commit to markc-614/pytorch that referenced this pull request Sep 17, 2025
@drisspg @markc-614
[BC Breaking] Remove flex + njt code paths (pytorch#161734)
7b851b5 
Pull Request resolved: pytorch#161734
Approved by: https://github.com/jbschlosser
mansiag05 pushed a commit to mansiag05/pytorch that referenced this pull request Sep 22, 2025
@drisspg @mansiag05
[BC Breaking] Remove flex + njt code paths (pytorch#161734)
38e9b16 
Pull Request resolved: pytorch#161734
Approved by: https://github.com/jbschlosser
cleonard530 pushed a commit to cleonard530/pytorch that referenced this pull request Sep 22, 2025
@drisspg @cleonard530
[BC Breaking] Remove flex + njt code paths (pytorch#161734)
e85f097 
Pull Request resolved: pytorch#161734
Approved by: https://github.com/jbschlosser
dsashidh pushed a commit to dsashidh/pytorch that referenced this pull request Sep 26, 2025
@drisspg @dsashidh
[BC Breaking] Remove flex + njt code paths (pytorch#161734)
0e547b1 
Pull Request resolved: pytorch#161734
Approved by: https://github.com/jbschlosser
@github-actions github-actions bot deleted the gh/drisspg/196/head branch October 16, 2025 02:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jbschlosser jbschlosser jbschlosser approved these changes

@zou3519 zou3519 Awaiting requested review from zou3519

@albanD albanD Awaiting requested review from albanD

@soulitzer soulitzer Awaiting requested review from soulitzer

Assignees

No one assigned

Labels

ciflow/trunk Trigger trunk jobs on your pull request Merged module: flex attention module: nestedtensor NestedTensor tag see issue #25032 release notes: nn release notes category suppress-bc-linter Suppresses the failures of API backward-compatibility linter (Lint/bc_linter) topic: bc breaking topic category

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@drisspg @pytorchmergebot @jbschlosser