KEMBAR78
[ROCm] remove triton-rocm commit pin and merge pins with triton.txt by jataylo · Pull Request #133438 · pytorch/pytorch · GitHub
Skip to content

[ROCm] remove triton-rocm commit pin and merge pins with triton.txt #133438

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 7 commits into from
Closed

[ROCm] remove triton-rocm commit pin and merge pins with triton.txt #133438

wants to merge 7 commits into from

Conversation

@jataylo
Copy link
Collaborator

@jataylo jataylo commented Aug 14, 2024 •
edited by pytorch-bot bot
Loading

@pytorch-bot
Copy link

pytorch-bot bot commented Aug 14, 2024 •
edited
Loading

🔗 Helpful Links

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

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

✅ You can merge normally! (10 Unrelated Failures)

As of commit 58fd704 with merge base 50d1e37 (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.

@pytorch-bot pytorch-bot bot added ciflow/inductor ciflow/rocm Trigger "default" config CI on ROCm ciflow/trunk Trigger trunk jobs on your pull request module: rocm AMD GPU support for Pytorch topic: not user facing topic category labels Aug 14, 2024
@jataylo jataylo removed module: rocm AMD GPU support for Pytorch ciflow/trunk Trigger trunk jobs on your pull request topic: not user facing topic category ciflow/inductor labels Aug 14, 2024
@pytorch-bot pytorch-bot bot added ciflow/inductor ciflow/trunk Trigger trunk jobs on your pull request module: rocm AMD GPU support for Pytorch topic: not user facing topic category labels Aug 14, 2024
@jataylo jataylo added ciflow/inductor-rocm Trigger "inductor" config CI on ROCm and removed module: rocm AMD GPU support for Pytorch ciflow/trunk Trigger trunk jobs on your pull request topic: not user facing topic category labels Aug 14, 2024
@pytorch-bot pytorch-bot bot added ciflow/trunk Trigger trunk jobs on your pull request module: rocm AMD GPU support for Pytorch topic: not user facing topic category labels Aug 14, 2024
@jataylo
Copy link
Collaborator Author

jataylo commented Aug 19, 2024

@pytorchbot rebase

@ZainRizvi ZainRizvi removed the ciflow/binaries Trigger all binary build and upload jobs on the PR label Aug 30, 2024
@ZainRizvi
Copy link
Contributor

Actually, the right workflows were included in trunk. Not sure why they didn't fail on your PR...perhaps you need to rebase?

@jataylo
Copy link
Collaborator Author

jataylo commented Sep 4, 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 pull/133438/head returned non-zero exit code 1

Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Auto-merging .github/scripts/build_triton_wheel.py
CONFLICT (content): Merge conflict in .github/scripts/build_triton_wheel.py
error: could not apply a6ddd85e2c... No need for patch_setup_py
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 a6ddd85e2c... No need for patch_setup_py

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

@jataylo
Copy link
Collaborator Author

jataylo commented Sep 5, 2024

@ZainRizvi IIUC this issue is known #134236, @atalman can we merge with error until the wheel is successfully pushed out?

@atalman
Copy link
Contributor

atalman commented Sep 5, 2024

@pytorchmergebot merge -f "Failures are not related"

@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

Chao1Han pushed a commit to Chao1Han/pytorch that referenced this pull request Sep 20, 2024
@jataylo @jithunnair-amd @Chao1Han
[ROCm] remove triton-rocm commit pin and merge pins with triton.txt (p…
573e63c 
…ytorch#133438)

Pull Request resolved: pytorch#133438
Approved by: https://github.com/jithunnair-amd, https://github.com/malfet

Co-authored-by: Jithun Nair <37884920+jithunnair-amd@users.noreply.github.com>
Chao1Han pushed a commit to Chao1Han/pytorch that referenced this pull request Sep 20, 2024
@pytorchmergebot @Chao1Han
Revert "[ROCm] remove triton-rocm commit pin and merge pins with trit…
c568fc2 
…on.txt (pytorch#133438)"

This reverts commit 5e8bf29.

Reverted pytorch#133438 on behalf of https://github.com/ZainRizvi due to This still breaks linux binary builds. Added the appropriate labels to ensure tests can pass. See [GH job link](https://github.com/pytorch/pytorch/actions/runs/10626427003/job/29460479554) [HUD commit link](https://hud.pytorch.org/pytorch/pytorch/commit/5e8bf29148a590318f678620f84be8f4d5ffff5c) ([comment](pytorch#133438 (comment)))
Chao1Han pushed a commit to Chao1Han/pytorch that referenced this pull request Sep 20, 2024
@jataylo @jithunnair-amd @Chao1Han
[ROCm] remove triton-rocm commit pin and merge pins with triton.txt (p…
f1b68ca 
…ytorch#133438)

Pull Request resolved: pytorch#133438
Approved by: https://github.com/jithunnair-amd, https://github.com/malfet

Co-authored-by: Jithun Nair <37884920+jithunnair-amd@users.noreply.github.com>
This was referenced Dec 3, 2024
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@malfet malfet malfet approved these changes

@jithunnair-amd jithunnair-amd jithunnair-amd approved these changes

@jeffdaily jeffdaily Awaiting requested review from jeffdaily jeffdaily is a code owner

@pruthvistony pruthvistony Awaiting requested review from pruthvistony pruthvistony is a code owner

@desertfire desertfire Awaiting requested review from desertfire desertfire is a code owner

@Chillee Chillee Awaiting requested review from Chillee Chillee is a code owner

@eellison eellison Awaiting requested review from eellison eellison is a code owner

@shunting314 shunting314 Awaiting requested review from shunting314 shunting314 is a code owner

@bertmaher bertmaher Awaiting requested review from bertmaher

Assignees

No one assigned

Labels

ciflow/inductor ciflow/inductor-rocm Trigger "inductor" config CI on ROCm ciflow/rocm Trigger "default" config CI on ROCm ciflow/trunk Trigger trunk jobs on your pull request Merged module: rocm AMD GPU support for Pytorch open source Reverted rocm This tag is for PRs from ROCm team topic: not user facing topic category

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@jataylo @pytorchmergebot @nmacchioni @atalman @malfet @jeanschmidt @jithunnair-amd @ZainRizvi @pytorchbot