Skip to content

Move save guard error throwing to separate phase#160662

Closed
jamesjwu wants to merge 6 commits intogh/jamesjwu/184/basefrom
gh/jamesjwu/184/head
Closed

Move save guard error throwing to separate phase#160662
jamesjwu wants to merge 6 commits intogh/jamesjwu/184/basefrom
gh/jamesjwu/184/head

Conversation

@jamesjwu
Copy link
Contributor

@jamesjwu jamesjwu commented Aug 14, 2025 •
edited
Loading

Stack from ghstack (oldest at bottom):

This diff makes it so that the portion saving guards that can throw is completely separated from GuardBuilder, and instead in serialize_guards. This lets me add a try catch around it for caching precompile later.

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

@jamesjwu
Update
4dbaf54 
[ghstack-poisoned]
@pytorch-bot
Copy link

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

🔗 Helpful Links

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

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

⏳ No Failures, 1 Pending

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

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

jamesjwu added a commit that referenced this pull request Aug 14, 2025
@jamesjwu
Move save guard error throwing to separate phase
69c1ba2 
ghstack-source-id: f0ac676
Pull-Request: #160662
This was referenced Aug 14, 2025
Closed
Closed
@jamesjwu
Update
b4b7d50 
[ghstack-poisoned]
jamesjwu added a commit that referenced this pull request Aug 15, 2025
@jamesjwu
Move save guard error throwing to separate phase
70d5adb 
ghstack-source-id: baa628c
Pull-Request: #160662
@jamesjwu
Update
f533ee2 
[ghstack-poisoned]
jamesjwu added a commit that referenced this pull request Aug 17, 2025
@jamesjwu
Move save guard error throwing to separate phase
200efdb 
ghstack-source-id: baa628c
Pull-Request: #160662
@jamesjwu jamesjwu added the topic: not user facing topic category label Aug 17, 2025
@jamesjwu
Update
8e5e3a4 
[ghstack-poisoned]
jamesjwu added a commit that referenced this pull request Aug 17, 2025
@jamesjwu
Move save guard error throwing to separate phase
230e60c 
ghstack-source-id: 7aaa1d8
Pull-Request: #160662
@jamesjwu
Update
3d70132 
[ghstack-poisoned]
jamesjwu added a commit that referenced this pull request Aug 18, 2025
@jamesjwu
Move save guard error throwing to separate phase
3617387 
ghstack-source-id: ef33b28
Pull-Request: #160662
@jamesjwu jamesjwu marked this pull request as ready for review August 18, 2025 01:51
@jamesjwu jamesjwu requested a review from zhxchen17 August 18, 2025 01:51
@jamesjwu
Copy link
Contributor Author

jamesjwu commented Aug 18, 2025

@pytorchbot merge

@pytorch-bot pytorch-bot bot added the ciflow/trunk Trigger trunk jobs on your pull request label Aug 18, 2025
@pytorchmergebot
Copy link
Collaborator

pytorchmergebot commented Aug 18, 2025

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

pytorchmergebot commented Aug 18, 2025

Merge failed

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

Auto-merging torch/_dynamo/guards.py
CONFLICT (content): Merge conflict in torch/_dynamo/guards.py
error: could not apply 3617387cf34... Move save guard error throwing to separate phase
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

@jamesjwu
Update
ab4b611 
[ghstack-poisoned]
@jamesjwu jamesjwu mentioned this pull request Aug 18, 2025
Closed
@jamesjwu
Copy link
Contributor Author

jamesjwu commented Aug 19, 2025

@pytorchbot merge

@pytorchmergebot
Copy link
Collaborator

pytorchmergebot commented Aug 19, 2025

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

markc-614 pushed a commit to markc-614/pytorch that referenced this pull request Sep 17, 2025
@jamesjwu @markc-614
Move save guard error throwing to separate phase (pytorch#160662)
6b54015 
This diff makes it so that the portion saving guards that can throw is completely separated from GuardBuilder, and instead in `serialize_guards`. This lets me add a try catch around it for caching precompile later.

Pull Request resolved: pytorch#160662
Approved by: https://github.com/zhxchen17
@github-actions github-actions bot deleted the gh/jamesjwu/184/head branch September 19, 2025 02:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zhxchen17 zhxchen17 zhxchen17 approved these changes

Assignees

No one assigned

Labels

ciflow/inductor ciflow/trunk Trigger trunk jobs on your pull request Merged module: dynamo topic: not user facing topic category

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jamesjwu @pytorchmergebot @zhxchen17