Skip to content

Conversation

@drisspg
Copy link
Contributor

@drisspg drisspg commented Oct 7, 2024

@drisspg drisspg requested a review from zou3519 as a code owner October 7, 2024 23:09
@pytorch-bot
Copy link

pytorch-bot bot commented Oct 7, 2024

🔗 Helpful Links

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

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

✅ No Failures

As of commit 4d89d3c with merge base 3346159 (image):
💚 Looks good so far! There are no failures yet. 💚

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

…ire_grad"

cc Chillee yanboliang BoyuanFeng

[ghstack-poisoned]
@drisspg
Copy link
Contributor Author

drisspg commented Oct 8, 2024

@pytorchbot merge

@pytorch-bot pytorch-bot bot added the ciflow/trunk Trigger trunk jobs on your pull request label Oct 8, 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

@malfet
Copy link
Contributor

malfet commented Oct 8, 2024

@pytorchbot revert -m "Need to revert it in order to be able to backout #136910" -c weird

@pytorchmergebot
Copy link
Collaborator

@pytorchbot successfully started a revert job. Check the current status here.
Questions? Feedback? Please reach out to the PyTorch DevX Team

pytorchmergebot added a commit that referenced this pull request Oct 8, 2024
@pytorchmergebot
Copy link
Collaborator

@drisspg your PR has been successfully reverted.

@malfet
Copy link
Contributor

malfet commented Oct 8, 2024

@pytorchbot merge -f "Looks like it could be relanded safely"

@pytorchmergebot
Copy link
Collaborator

Merge started

Your change will be merged immediately since you used the force (-f) flag, bypassing any CI checks (ETA: 1-5 minutes). Please use -f as last resort and instead consider -i/--ignore-current to continue the merge ignoring current failures. This will allow currently pending tests to finish and report signal before the merge.

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 f34daf2e863f5d9c65c1bc24d3d9d9f9475d4def returned non-zero exit code 1

Auto-merging torch/_higher_order_ops/flex_attention.py
CONFLICT (content): Merge conflict in torch/_higher_order_ops/flex_attention.py
error: could not apply f34daf2e86... [FlexAttention] only calculate grads for buffers that require_grad
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 advice.mergeConflict false"
Details for Dev Infra team Raised by workflow job

drisspg added a commit that referenced this pull request Oct 8, 2024
Part 2 of #136910

With some updates from: #137451
And updates to lib name + lazy registration

[ghstack-poisoned]
drisspg added a commit that referenced this pull request Oct 9, 2024
Part 2 of #136910

With some updates from: #137451
And updates to lib name + lazy registration

ghstack-source-id: d43ca91
Pull Request resolved: #137526
drisspg added a commit that referenced this pull request Oct 9, 2024
Part 2 of #136910

With some updates from: #137451
And updates to lib name + lazy registration

cc voznesenskym penguinwu EikanWang jgong5 Guobing-Chen XiaobingSuper zhuhaozhe blzheng wenzhe-nrv jiayisunx ipiszy yf225 chenyang78 kadeng muchulee8 ColinPeppler amjames desertfire chauhang

[ghstack-poisoned]
drisspg added a commit that referenced this pull request Oct 9, 2024
Part 2 of #136910

With some updates from: #137451
And updates to lib name + lazy registration

ghstack-source-id: 4bd0169
Pull Request resolved: #137526
drisspg added a commit that referenced this pull request Oct 9, 2024
This PR is Part 2 of the implementation started in #136910, rolled in the updates from #137451. Original was reverted due to calls to #torch.libary at `import torch` time, so added a call to register at first call to `ModIndex`



[ghstack-poisoned]
drisspg added a commit that referenced this pull request Oct 9, 2024
Part 2 of #136910

With some updates from: #137451
And updates to lib name + lazy registration

ghstack-source-id: 8a0173d
Pull Request resolved: #137526
drisspg added a commit that referenced this pull request Oct 9, 2024
This PR is Part 2 of the implementation started in #136910, rolled in the updates from #137451. Original was reverted due to calls to #torch.libary at `import torch` time, so added a call to register at first call to `ModIndex`



[ghstack-poisoned]
drisspg added a commit that referenced this pull request Oct 9, 2024
Part 2 of #136910

With some updates from: #137451
And updates to lib name + lazy registration

ghstack-source-id: c47ba6c
Pull Request resolved: #137526
drisspg added a commit that referenced this pull request Oct 9, 2024
This PR is Part 2 of the implementation started in #136910, rolled in the updates from #137451. Original was reverted due to calls to #torch.libary at `import torch` time, so added a call to register at first call to `ModIndex`



[ghstack-poisoned]
drisspg added a commit that referenced this pull request Oct 9, 2024
Part 2 of #136910

With some updates from: #137451
And updates to lib name + lazy registration

ghstack-source-id: 04bf241
Pull Request resolved: #137526
drisspg added a commit that referenced this pull request Oct 9, 2024
This PR is Part 2 of the implementation started in #136910, rolled in the updates from #137451. Original was reverted due to calls to #torch.libary at `import torch` time, so added a call to register at first call to `ModIndex`



[ghstack-poisoned]
drisspg added a commit that referenced this pull request Oct 9, 2024
Part 2 of #136910

With some updates from: #137451
And updates to lib name + lazy registration

ghstack-source-id: c8e69a1
Pull Request resolved: #137526
drisspg added a commit that referenced this pull request Oct 10, 2024
This PR is Part 2 of the implementation started in #136910, rolled in the updates from #137451. Original was reverted due to calls to #torch.libary at `import torch` time, so added a call to register at first call to `ModIndex`



[ghstack-poisoned]
drisspg added a commit that referenced this pull request Oct 10, 2024
Part 2 of #136910

With some updates from: #137451
And updates to lib name + lazy registration

ghstack-source-id: 5f8a81f
Pull Request resolved: #137526
drisspg added a commit that referenced this pull request Oct 10, 2024
This PR is Part 2 of the implementation started in #136910, rolled in the updates from #137451. Original was reverted due to calls to #torch.libary at `import torch` time, so added a call to register at first call to `ModIndex`



[ghstack-poisoned]
drisspg added a commit that referenced this pull request Oct 10, 2024
Part 2 of #136910

With some updates from: #137451
And updates to lib name + lazy registration

ghstack-source-id: 74202d2
Pull Request resolved: #137526
drisspg added a commit that referenced this pull request Oct 10, 2024
This PR is Part 2 of the implementation started in #136910, rolled in the updates from #137451. Original was reverted due to calls to #torch.libary at `import torch` time, so added a call to register at first call to `ModIndex`



[ghstack-poisoned]
drisspg added a commit that referenced this pull request Oct 10, 2024
Part 2 of #136910

With some updates from: #137451
And updates to lib name + lazy registration

ghstack-source-id: 8933d40
Pull Request resolved: #137526
drisspg added a commit that referenced this pull request Oct 10, 2024
Part 2 of #136910

With some updates from: #137451
And updates to lib name + lazy registration

ghstack-source-id: 9a7b26e
Pull Request resolved: #137526
drisspg added a commit that referenced this pull request Oct 10, 2024
…eager (#136910)"


This PR is Part 2 of the implementation started in #136910, rolled in the updates from #137451. Original was reverted due to calls to #torch.libary at `import torch` time, so added a call to register at first call to `ModIndex`



[ghstack-poisoned]
drisspg added a commit that referenced this pull request Oct 10, 2024
This PR is Part 2 of the implementation started in #136910, rolled in the updates from #137451. Original was reverted due to calls to #torch.libary at `import torch` time, so added a call to register at first call to `ModIndex`



[ghstack-poisoned]
drisspg added a commit that referenced this pull request Oct 10, 2024
…eager (#136910)"


This PR is Part 2 of the implementation started in #136910, rolled in the updates from #137451. Original was reverted due to calls to #torch.libary at `import torch` time, so added a call to register at first call to `ModIndex`



cc voznesenskym penguinwu EikanWang jgong5 Guobing-Chen XiaobingSuper zhuhaozhe blzheng wenzhe-nrv jiayisunx ipiszy yf225 chenyang78 kadeng muchulee8 ColinPeppler amjames desertfire chauhang rec

[ghstack-poisoned]
drisspg added a commit that referenced this pull request Oct 10, 2024
This PR is Part 2 of the implementation started in #136910, rolled in the updates from #137451. Original was reverted due to calls to #torch.libary at `import torch` time, so added a call to register at first call to `ModIndex`



cc voznesenskym penguinwu EikanWang jgong5 Guobing-Chen XiaobingSuper zhuhaozhe blzheng wenzhe-nrv jiayisunx ipiszy yf225 chenyang78 kadeng muchulee8 ColinPeppler amjames desertfire chauhang rec

[ghstack-poisoned]
drisspg added a commit that referenced this pull request Oct 10, 2024
Part 2 of #136910

With some updates from: #137451
And updates to lib name + lazy registration

ghstack-source-id: d9327f6
Pull Request resolved: #137526
drisspg added a commit that referenced this pull request Oct 12, 2024
Part 2 of #136910

With some updates from: #137451
And updates to lib name + lazy registration

ghstack-source-id: 3ddbe64
Pull Request resolved: #137526
drisspg added a commit that referenced this pull request Oct 15, 2024
Part 2 of #136910

With some updates from: #137451
And updates to lib name + lazy registration

ghstack-source-id: dffbf71
Pull Request resolved: #137526
pytorchmergebot pushed a commit that referenced this pull request Oct 15, 2024
This PR is Part 2 of the implementation started in #136910, rolled in the updates from #137451. Original was reverted due to calls to #@torch.libary at `import torch` time, so added a call to register at first call to `ModIndex`

Pull Request resolved: #137526
Approved by: https://github.com/Chillee, https://github.com/zou3519
jackzhxng pushed a commit that referenced this pull request Oct 16, 2024
This PR is Part 2 of the implementation started in #136910, rolled in the updates from #137451. Original was reverted due to calls to #@torch.libary at `import torch` time, so added a call to register at first call to `ModIndex`

Pull Request resolved: #137526
Approved by: https://github.com/Chillee, https://github.com/zou3519
@drisspg
Copy link
Contributor Author

drisspg commented Oct 17, 2024

This change has been rolled into: #137526

@drisspg drisspg closed this Oct 17, 2024
@github-actions github-actions bot deleted the gh/drisspg/60/head branch November 17, 2024 02:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants