Skip to content

Conversation

[ghstack-poisoned]
@pytorch-bot
Copy link

pytorch-bot bot commented Aug 14, 2024

🔗 Helpful Links

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

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

✅ You can merge normally! (4 Unrelated Failures)

As of commit e9d7afa with merge base 18785c1 (image):

FLAKY - The following jobs failed but were likely due to flakiness present on trunk:

BROKEN TRUNK - The following jobs failed but were present on the merge base:

👉 Rebase onto the `viable/strict` branch to avoid these failures

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

@pytorch-bot pytorch-bot bot added ciflow/inductor module: distributed_checkpoint oncall: distributed Add this issue/PR to distributed oncall triage queue release notes: distributed (sharded) release notes category labels Aug 14, 2024
rec added a commit that referenced this pull request Aug 14, 2024
ghstack-source-id: 9a3406d
Pull Request resolved: #133492
[ghstack-poisoned]
[ghstack-poisoned]
[ghstack-poisoned]
[ghstack-poisoned]
rec added a commit to rec/pytorch that referenced this pull request Aug 18, 2024
ghstack-source-id: 9956e55
Pull Request resolved: pytorch#133492
@rec rec added the release notes: onnx torch.onnx related changes that should show up in the release notes label Sep 5, 2024
@rec rec changed the title Remove unused variables Remove unused variables in torch/ Sep 9, 2024
[ghstack-poisoned]
rec added a commit to rec/pytorch that referenced this pull request Sep 21, 2024
ghstack-source-id: 677419f
Pull Request resolved: pytorch#133492
@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: 2 jobs have failed, first few of them are: trunk / linux-focal-rocm6.2-py3.10 / test (default, 1, 2, linux.rocm.gpu), trunk / linux-focal-rocm6.2-py3.10 / test (distributed, 1, 1, linux.rocm.gpu)

Details for Dev Infra team Raised by workflow job

@cyyever
Copy link
Collaborator

cyyever commented Dec 12, 2024

@pytorchbot rebase -b main

@pytorchmergebot
Copy link
Collaborator

@pytorchbot started a rebase job onto refs/remotes/origin/main. Check the current status here

@pytorchmergebot
Copy link
Collaborator

Rebase failed due to

Aborting rebase because rebasing the branch resulted in the same sha as the target branch.
This usually happens because the PR has already been merged.  Please rebase locally and push.

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

@cyyever
Copy link
Collaborator

cyyever commented Dec 12, 2024

@pytorchbot rebase -b main

@pytorchmergebot
Copy link
Collaborator

@pytorchbot started a rebase job onto refs/remotes/origin/main. Check the current status here

@pytorchmergebot
Copy link
Collaborator

Rebase failed due to

Aborting rebase because rebasing the branch resulted in the same sha as the target branch.
This usually happens because the PR has already been merged.  Please rebase locally and push.

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

[ghstack-poisoned]
rec added a commit that referenced this pull request Dec 12, 2024
ghstack-source-id: 1c5faa6
Pull Request resolved: #133492
@rec
Copy link
Collaborator Author

rec commented Dec 12, 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

@rec
Copy link
Collaborator Author

rec commented Dec 12, 2024

@cyyever, @clee2000 @albanD

A rebase isn't going to work, because the commit is already contained in main! The rebase process sees the identical commit, just removes it, and then the revert comes after that, and we're back where we started. 😁

The solution I used was to go to the desired commit ID - I picked main - and then use git cherry-pick to textually apply the commit again.

If upstream is the pytorch/pytorch repo, these commands would do it:

git fetch upstream main
git reset --hard upstream/main
git cherry-pick upstream/gh/rec/45/head
ghstack

I did something like this, and it's cooking right now.

@cyyever
Copy link
Collaborator

cyyever commented Dec 12, 2024

Fine , merge it!

facebook-github-bot pushed a commit to pytorch/benchmark that referenced this pull request Dec 13, 2024
Summary:
X-link: pytorch/pytorch#133492
Approved by: https://github.com/albanD

Reviewed By: clee2000

Differential Revision: D67153461

fbshipit-source-id: 2182ae5048821fd2670dc42e056ebb833986b869
rec added a commit that referenced this pull request Dec 18, 2024
* Extracted from #133492

ghstack-source-id: c0c11df
Pull Request resolved: #138473
fightingand pushed a commit to fightingand/pytorch that referenced this pull request Dec 20, 2024
@github-actions github-actions bot deleted the gh/rec/45/head branch January 12, 2025 02:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-no-td Do not run TD on this PR ciflow/inductor ciflow/trunk Trigger trunk jobs on your pull request Merged module: cpu CPU specific problem (e.g., perf, algorithm) module: dynamo module: inductor oncall: distributed Add this issue/PR to distributed oncall triage queue open source release notes: distributed (sharded) release notes category release notes: onnx torch.onnx related changes that should show up in the release notes release notes: quantization release notes category Reverted

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants