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/166036

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

As of commit c49752c 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
Copy link
Member Author

@williamwen42 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@pytorch-bot pytorch-bot bot added the ciflow/trunk Trigger trunk jobs on your pull request label Oct 21, 2025
)
self.output.add_output_instructions([copy.copy(inst)])
inst_copy = copy.copy(inst)
inst_copy.exn_tab_entry = None
Copy link
Contributor

Choose a reason for hiding this comment

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

So this is the root fix (need to set exn_tab_entry to None) - can you provide a bit more context for me as to why this fixes the error? I am assuming it is because when this is set bytecode_transformation assumes certain things about the instr which isn't true

Copy link
Member Author

Choose a reason for hiding this comment

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

Before, we would add an instruction to the output code with an invalid exn_tab_entry (since it refers to the old set of instructions). This correction is done elsewhere in symbolic_convert.py - i.e.

inst_copy.exn_tab_entry = None

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 elaborating, lgtm

@williamwen42
Copy link
Member Author

@williamwen42 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

1 similar comment
@williamwen42
Copy link
Member Author

@williamwen42 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@pytorchmergebot
Copy link
Collaborator

Starting merge as part of PR stack under #166040

pytorchmergebot pushed a commit that referenced this pull request Oct 28, 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
@Lucaskabela
Copy link
Contributor

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

@pytorch-bot
Copy link

pytorch-bot bot commented Nov 4, 2025

❌ 🤖 pytorchbot command failed:

@pytorchbot cherry-pick: error: argument -c/--classification: invalid choice: 'bugfix' (choose from 'regression', 'critical', 'fixnewfeature', 'docs', 'release')

usage: @pytorchbot cherry-pick --onto ONTO [--fixes FIXES] -c
                               {regression,critical,fixnewfeature,docs,release}

Try @pytorchbot --help for more info.

@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 #166036

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

Auto-merging test/dynamo/test_repros.py
CONFLICT (content): Merge conflict in test/dynamo/test_repros.py
Auto-merging torch/_dynamo/symbolic_convert.py
error: could not apply ebb2b2e894a... [dynamo] fix store attr graph break in with block (#166036)
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
Copy link
Contributor

I will try to get this cherry-pick request tomorrow

Lucaskabela pushed a commit that referenced this pull request Nov 4, 2025
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)
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/317/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