Skip to content

Conversation

@williamwen42
Copy link
Member

@williamwen42 williamwen42 commented Oct 21, 2025

@pytorch-bot
Copy link

pytorch-bot bot commented Oct 21, 2025

🔗 Helpful Links

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

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

❗ 1 Active SEVs

There are 1 currently active SEVs. If your PR is affected, please view them below:

⏳ No Failures, 1 Pending

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

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

@williamwen42 williamwen42 added the topic: not user facing topic category label Oct 21, 2025
The error I attempted to fix in #162318 was still appearing internally.

cc voznesenskym penguinwu EikanWang jgong5 Guobing-Chen XiaobingSuper zhuhaozhe blzheng wenzhe-nrv jiayisunx chenyang78 kadeng chauhang amjames Lucaskabela

[ghstack-poisoned]
williamwen42 added a commit that referenced this pull request Oct 27, 2025
ghstack-source-id: 50e8374
Pull Request resolved: #166040
# The original code and resume code should have matching suffixes.
# Match the post-prefix block target offsets of the current resume code
# and the original code.
orig_targets = reversed(
Copy link
Member Author

Choose a reason for hiding this comment

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

The real fix was to add a bunch of reversed calls

Copy link
Contributor

@Lucaskabela Lucaskabela left a comment

Choose a reason for hiding this comment

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

Thanks for continuing to drive to fix this key error - hopefully the additional unit test catch everything and close our gap of internal vs OSS here

Fixes #166176

The error I attempted to fix in #162318 was still appearing internally.

Surprised that this wasn't caught anywhere 😰 

cc voznesenskym penguinwu EikanWang jgong5 Guobing-Chen XiaobingSuper zhuhaozhe blzheng wenzhe-nrv jiayisunx chenyang78 kadeng chauhang amjames Lucaskabela

[ghstack-poisoned]
williamwen42 added a commit that referenced this pull request Oct 27, 2025
ghstack-source-id: b0e9707
Pull Request resolved: #166040
@dharakk
Copy link
Contributor

dharakk commented Oct 27, 2025

Thanks for fixing this error and unblocking!

@williamwen42
Copy link
Member Author

@pytorchbot merge

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

@Lucaskabela
Copy link
Contributor

@pytorchbot cherry-pick --onto release/2.9 --fixes "error in new nested graphbreak feature (#166033)" -c fixnewfeature

@Lucaskabela Lucaskabela added this to the 2.9.1 milestone Nov 4, 2025
@pytorchbot
Copy link
Collaborator

Cherry picking #166040

Command git -C /home/runner/work/pytorch/pytorch cherry-pick -x 32fe4f681e2bfb2fdecf20027e29e1aeb6ad5297 returned non-zero exit code 1

Auto-merging test/dynamo/test_ctx_manager.py
Auto-merging test/dynamo/test_repros.py
CONFLICT (content): Merge conflict in test/dynamo/test_repros.py
Auto-merging torch/_dynamo/resume_execution.py
Auto-merging torch/_dynamo/symbolic_convert.py
CONFLICT (content): Merge conflict in torch/_dynamo/symbolic_convert.py
error: could not apply 32fe4f681e2... [dynamo] fix keyerror in resume_execution (again) (#166040)
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

Lucaskabela pushed a commit that referenced this pull request Nov 4, 2025
Fixes #166176

The error I attempted to fix in #162318 was still appearing internally.

Surprised that this wasn't caught anywhere 😰

Pull Request resolved: #166040
Approved by: https://github.com/Lucaskabela
ghstack dependencies: #166036

(cherry picked from commit 32fe4f6)
Lucaskabela pushed a commit that referenced this pull request Nov 4, 2025
Fixes #166176

The error I attempted to fix in #162318 was still appearing internally.

Surprised that this wasn't caught anywhere 😰

Pull Request resolved: #166040
Approved by: https://github.com/Lucaskabela
ghstack dependencies: #166036

(cherry picked from commit 32fe4f6)
Lucaskabela pushed a commit that referenced this pull request Nov 4, 2025
Fixes #166176

The error I attempted to fix in #162318 was still appearing internally.

Surprised that this wasn't caught anywhere 😰

Pull Request resolved: #166040
Approved by: https://github.com/Lucaskabela
ghstack dependencies: #166036

(cherry picked from commit 32fe4f6)
Lucaskabela pushed a commit that referenced this pull request Nov 4, 2025
Fixes #166176

The error I attempted to fix in #162318 was still appearing internally.

Surprised that this wasn't caught anywhere 😰

Pull Request resolved: #166040
Approved by: https://github.com/Lucaskabela
ghstack dependencies: #166036

(cherry picked from commit 32fe4f6)
Lucaskabela pushed a commit that referenced this pull request Nov 4, 2025
Fixes #166176

The error I attempted to fix in #162318 was still appearing internally.

Surprised that this wasn't caught anywhere 😰

Pull Request resolved: #166040
Approved by: https://github.com/Lucaskabela
ghstack dependencies: #166036

(cherry picked from commit 32fe4f6)
atalman pushed a commit that referenced this pull request Nov 5, 2025
* [dynamo] fix store attr graph break in with block (#166036)

Fixes #166033

Differential Revision: [D85198055](https://our.internmc.facebook.com/intern/diff/D85198055)
Pull Request resolved: #166036
Approved by: https://github.com/Lucaskabela

(cherry picked from commit ebb2b2e)

* [dynamo] fix keyerror in resume_execution (again) (#166040)

Fixes #166176

The error I attempted to fix in #162318 was still appearing internally.

Surprised that this wasn't caught anywhere 😰

Pull Request resolved: #166040
Approved by: https://github.com/Lucaskabela
ghstack dependencies: #166036

(cherry picked from commit 32fe4f6)

* fix self.current_instruction -> cur_tx.current_instruction

---------

Co-authored-by: William Wen <[email protected]>
@github-actions github-actions bot deleted the gh/williamwen42/318/head branch December 4, 2025 02:18
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