Inline FxGraphCache.load into its sole call site #141681

ezyang · 2024-11-27T13:44:57Z

Stack from ghstack (oldest at bottom):

I need to restructure the body of FxGraphCache.load with the outer if-else in its call site, so inline it goes!

Signed-off-by: Edward Z. Yang ezyang@meta.com

cc @voznesenskym @penguinwu @EikanWang @jgong5 @Guobing-Chen @XiaobingSuper @zhuhaozhe @blzheng @wenzhe-nrv @jiayisunx @ipiszy @yf225 @chenyang78 @kadeng @muchulee8 @ColinPeppler @amjames @desertfire @chauhang @aakhundov

[ghstack-poisoned]

pytorch-bot · 2024-11-27T13:45:01Z

🔗 Helpful Links

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

📄 Preview Python docs built from this PR
📄 Preview C++ docs built from this PR
❓ Need help or want to give feedback on the CI? Visit the bot commands wiki or our office hours

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

✅ You can merge normally! (1 Unrelated Failure)

As of commit 94447e7 with merge base 0f261e8 ():

UNSTABLE - The following job failed but was likely due to flakiness present on trunk and has been marked as unstable:

inductor / cuda12.4-py3.10-gcc9-sm86 / test (inductor_timm, 1, 2, linux.g5.4xlarge.nvidia.gpu, unstable) (gh) (#141498)
convnext_base

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

Signed-off-by: Edward Z. Yang <ezyang@meta.com> ghstack-source-id: 10509d1 Pull Request resolved: #141681

aorenste · 2024-11-27T17:17:40Z

torch/_inductor/compile_fx.py

-                inputs_to_check,
-                local=config.fx_graph_cache,
-                remote=fx_graph_remote_cache,
+            compile_fx_fn = codegen_and_compile


Would it be worth making this a separate internal method instead of making this method that much longer?

yea, not rly sure this is an improvement lol..

I'm temporarily making things worse so I am able to easily refactor this code in relation to other code in this context. At the end, we may want to fold it back into a function, though I am not sure. Will reassess at the end.

[ghstack-poisoned]

ezyang · 2024-11-28T04:44:02Z

@pytorchbot merge -f "unrelated failures"

pytorchmergebot · 2024-11-28T04:46:00Z

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

pytorchmergebot · 2024-11-28T04:46:17Z

Merge failed

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

Auto-merging torch/_inductor/compile_fx.py
CONFLICT (content): Merge conflict in torch/_inductor/compile_fx.py
error: could not apply 1e6544ef902... Inline FxGraphCache.load into its sole call site
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 advice.mergeConflict false"

Details for Dev Infra team

Raised by workflow job

[ghstack-poisoned]

) Signed-off-by: Edward Z. Yang <ezyang@meta.com> Pull Request resolved: #141683 Approved by: https://github.com/jamesjwu, https://github.com/jansel ghstack dependencies: #141681

I was constantly annoyed at the fact that we had a separate else branch for when cache was disabled which was distinct from when cache was bypassed. This diff gets rid of the disabled cache branch, so we use the same logic for bypass/disable. I actually think this change probably didn't actually matter much for the POC but I think it's cleaner. Signed-off-by: Edward Z. Yang <ezyang@meta.com> Pull Request resolved: #141685 Approved by: https://github.com/aorenste ghstack dependencies: #141681, #141683

Stacked on top of #141685 Signed-off-by: Edward Z. Yang <ezyang@meta.com> Pull Request resolved: #141688 Approved by: https://github.com/Skylion007, https://github.com/jansel ghstack dependencies: #141681, #141683, #141685

Stacked on #141688 Signed-off-by: Edward Z. Yang <ezyang@meta.com> Pull Request resolved: #141689 Approved by: https://github.com/jansel ghstack dependencies: #141681, #141683, #141685, #141688

Stacked on #141689 Signed-off-by: Edward Z. Yang <ezyang@meta.com> Pull Request resolved: #141691 Approved by: https://github.com/jansel ghstack dependencies: #141681, #141683, #141685, #141688, #141689

Stacked on #141691 Signed-off-by: Edward Z. Yang <ezyang@meta.com> Pull Request resolved: #141695 Approved by: https://github.com/aorenste ghstack dependencies: #141681, #141683, #141685, #141688, #141689, #141691

I need to restructure the body of FxGraphCache.load with the outer if-else in its call site, so inline it goes! Signed-off-by: Edward Z. Yang <ezyang@meta.com> Pull Request resolved: pytorch#141681 Approved by: https://github.com/jamesjwu, https://github.com/jansel

…rch#141683) Signed-off-by: Edward Z. Yang <ezyang@meta.com> Pull Request resolved: pytorch#141683 Approved by: https://github.com/jamesjwu, https://github.com/jansel ghstack dependencies: pytorch#141681

I was constantly annoyed at the fact that we had a separate else branch for when cache was disabled which was distinct from when cache was bypassed. This diff gets rid of the disabled cache branch, so we use the same logic for bypass/disable. I actually think this change probably didn't actually matter much for the POC but I think it's cleaner. Signed-off-by: Edward Z. Yang <ezyang@meta.com> Pull Request resolved: pytorch#141685 Approved by: https://github.com/aorenste ghstack dependencies: pytorch#141681, pytorch#141683

Stacked on top of pytorch#141685 Signed-off-by: Edward Z. Yang <ezyang@meta.com> Pull Request resolved: pytorch#141688 Approved by: https://github.com/Skylion007, https://github.com/jansel ghstack dependencies: pytorch#141681, pytorch#141683, pytorch#141685

Stacked on pytorch#141688 Signed-off-by: Edward Z. Yang <ezyang@meta.com> Pull Request resolved: pytorch#141689 Approved by: https://github.com/jansel ghstack dependencies: pytorch#141681, pytorch#141683, pytorch#141685, pytorch#141688

Stacked on pytorch#141689 Signed-off-by: Edward Z. Yang <ezyang@meta.com> Pull Request resolved: pytorch#141691 Approved by: https://github.com/jansel ghstack dependencies: pytorch#141681, pytorch#141683, pytorch#141685, pytorch#141688, pytorch#141689

Stacked on pytorch#141691 Signed-off-by: Edward Z. Yang <ezyang@meta.com> Pull Request resolved: pytorch#141695 Approved by: https://github.com/aorenste ghstack dependencies: pytorch#141681, pytorch#141683, pytorch#141685, pytorch#141688, pytorch#141689, pytorch#141691

Signed-off-by: Edward Z. Yang <ezyang@meta.com> ghstack-source-id: 2d2f177 Pull Request resolved: pytorch/pytorch#141681

Update

dcebbb8

[ghstack-poisoned]

This was referenced Nov 27, 2024

Code motion CompiledFxGraph to a dedicated file #141654

Closed

Move post compile steps into post_compile1/post_compile2 method #141656

Closed

pytorch-bot bot added ciflow/inductor module: inductor labels Nov 27, 2024

github-actions bot requested review from albanD, antoniojkim, bdhirsh, miladm and SherlockNoMad November 27, 2024 13:45

ezyang requested review from jansel, oulgen, jamesjwu and masnesral November 27, 2024 13:45

ezyang added the topic: not user facing topic category label Nov 27, 2024

This was referenced Nov 27, 2024

Hoist set_feature_use out of conditional, rename some variables #141683

Closed

Unify cache disable and cache bypass paths #141685

Closed

jamesjwu approved these changes Nov 27, 2024

View reviewed changes

ezyang added a commit that referenced this pull request Nov 27, 2024

Inline FxGraphCache.load into its sole call site

56bec64

Signed-off-by: Edward Z. Yang <ezyang@meta.com> ghstack-source-id: 10509d1 Pull Request resolved: #141681

aorenste reviewed Nov 27, 2024

View reviewed changes

jansel approved these changes Nov 27, 2024

View reviewed changes

Update

0bdaf0f

[ghstack-poisoned]

Update

f03be4a

[ghstack-poisoned]

This was referenced Nov 28, 2024

Hoist post_compile1 into fx_codegen_and_compile #141688

Closed

Unify post_compile1 and CompiledFxGraph constructor #141689

Closed

Inline compile_to_fn at its only call site #141691

Closed

Introduce CompiledAOTI #141695

Closed

pytorchmergebot added the merging label Nov 28, 2024

pytorchmergebot removed the merging label Nov 28, 2024

Update

94447e7

[ghstack-poisoned]

ezyang mentioned this pull request Nov 28, 2024

[POC] AOTInductor as Inductor backend #141700

Closed

pytorchmergebot closed this in 229daf7 Nov 28, 2024

pytorchmergebot added the Merged label Nov 28, 2024

github-actions bot deleted the gh/ezyang/3023/head branch December 30, 2024 02:08

desai0007 pushed a commit to desai0007/test-repo-pytorch that referenced this pull request Feb 26, 2025

Inline FxGraphCache.load into its sole call site

0598df1

Signed-off-by: Edward Z. Yang <ezyang@meta.com> ghstack-source-id: 2d2f177 Pull Request resolved: pytorch/pytorch#141681

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Inline FxGraphCache.load into its sole call site #141681

Inline FxGraphCache.load into its sole call site #141681

Uh oh!

ezyang commented Nov 27, 2024 •

edited

Loading

Uh oh!

pytorch-bot bot commented Nov 27, 2024 •

edited

Loading

Uh oh!

aorenste Nov 27, 2024

Uh oh!

eellison Nov 27, 2024

Uh oh!

ezyang Nov 27, 2024

Uh oh!

ezyang commented Nov 28, 2024

Uh oh!

pytorchmergebot commented Nov 28, 2024

Uh oh!

pytorchmergebot commented Nov 28, 2024

Uh oh!

Uh oh!

Inline FxGraphCache.load into its sole call site #141681

Inline FxGraphCache.load into its sole call site #141681

Uh oh!

Conversation

ezyang commented Nov 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pytorch-bot bot commented Nov 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🔗 Helpful Links

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

✅ You can merge normally! (1 Unrelated Failure)

Uh oh!

aorenste Nov 27, 2024

Choose a reason for hiding this comment

Uh oh!

eellison Nov 27, 2024

Choose a reason for hiding this comment

Uh oh!

ezyang Nov 27, 2024

Choose a reason for hiding this comment

Uh oh!

ezyang commented Nov 28, 2024

Uh oh!

pytorchmergebot commented Nov 28, 2024

Merge started

Uh oh!

pytorchmergebot commented Nov 28, 2024

Merge failed

Uh oh!

Uh oh!

ezyang commented Nov 27, 2024 •

edited

Loading

pytorch-bot bot commented Nov 27, 2024 •

edited

Loading