Skip to content

Conversation

@jansel
Copy link
Contributor

@jansel jansel commented Jun 23, 2024

[ghstack-poisoned]
@pytorch-bot
Copy link

pytorch-bot bot commented Jun 23, 2024

🔗 Helpful Links

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

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

✅ No Failures

As of commit d930605 with merge base 872d972 (image):
💚 Looks good so far! There are no failures yet. 💚

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

[ghstack-poisoned]
[ghstack-poisoned]
jansel added a commit that referenced this pull request Jun 23, 2024
ghstack-source-id: 268c95b
Pull Request resolved: #129321
[ghstack-poisoned]
jansel added a commit that referenced this pull request Jun 25, 2024
ghstack-source-id: 5f19016
Pull Request resolved: #129321
[ghstack-poisoned]
jansel added a commit that referenced this pull request Jun 26, 2024
ghstack-source-id: 1db1fc3
Pull Request resolved: #129321
[ghstack-poisoned]
jansel added a commit that referenced this pull request Jun 26, 2024
ghstack-source-id: 8a863c2
Pull Request resolved: #129321
[ghstack-poisoned]
jansel added a commit that referenced this pull request Jun 27, 2024
ghstack-source-id: 40411e1
Pull Request resolved: #129321
@jansel jansel added the ciflow/trunk Trigger trunk jobs on your pull request label Jun 27, 2024
@jansel
Copy link
Contributor Author

jansel commented Jun 27, 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

@pytorchmergebot
Copy link
Collaborator

Merge failed

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

Auto-merging test/inductor/test_torchinductor.py
Auto-merging torch/_inductor/codecache.py
CONFLICT (content): Merge conflict in torch/_inductor/codecache.py
error: could not apply 11a6347f0a... [halide-backend] Initial version of HalideKernel and HalideScheduling
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

[ghstack-poisoned]
jansel added a commit that referenced this pull request Jun 29, 2024
ghstack-source-id: 9ab954e
Pull Request resolved: #129321
@jansel
Copy link
Contributor Author

jansel commented Jun 29, 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

@jeanschmidt
Copy link
Contributor

@pytorchbot revert -m "Reverting, as it is required to do so in order to revert #129320" -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
Copy link
Collaborator

@jansel your PR has been successfully reverted.

pytorchmergebot added a commit that referenced this pull request Jul 1, 2024
This reverts commit 9ae78a5.

Reverted #129321 on behalf of https://github.com/jeanschmidt due to Reverting, as it is required to do so in order to revert #129320 ([comment](#129321 (comment)))
pytorchmergebot added a commit to khushi-411/pytorch that referenced this pull request Jul 2, 2024
This reverts commit 9ae78a5.

Reverted pytorch#129321 on behalf of https://github.com/jeanschmidt due to Reverting, as it is required to do so in order to revert pytorch#129320 ([comment](pytorch#129321 (comment)))
[ghstack-poisoned]
@jansel jansel removed the ciflow/trunk Trigger trunk jobs on your pull request label Jul 3, 2024
pytorchmergebot pushed a commit that referenced this pull request Jul 3, 2024
In theory Halide doesn't need the split reduction stuff we do for Triton since it can generate multiple kernels.

Pull Request resolved: #129320
Approved by: https://github.com/shunting314, https://github.com/eellison
ghstack dependencies: #129321
@github-actions github-actions bot deleted the gh/jansel/363/head branch August 4, 2024 02:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants