KEMBAR78
Hoist set_feature_use out of conditional, rename some variables by ezyang · Pull Request #141683 · pytorch/pytorch · GitHub
Skip to content

Hoist set_feature_use out of conditional, rename some variables #141683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 4 commits into from
Closed

Hoist set_feature_use out of conditional, rename some variables #141683

wants to merge 4 commits into from

Conversation

@ezyang
Copy link
Contributor

@ezyang ezyang commented Nov 27, 2024 •
edited
Loading

@ezyang
Update
cc0b571 
[ghstack-poisoned]
This was referenced Nov 27, 2024
Closed
Closed
@pytorch-bot
Copy link

pytorch-bot bot commented Nov 27, 2024 •
edited
Loading

🔗 Helpful Links

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

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

✅ You can merge normally! (2 Unrelated Failures)

As of commit 6f35720 with merge base 0f261e8 (image):

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

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

@ezyang ezyang mentioned this pull request Nov 27, 2024
Closed
@ezyang ezyang mentioned this pull request Nov 27, 2024
Closed
@ezyang ezyang added the topic: not user facing topic category label Nov 27, 2024
ezyang added a commit that referenced this pull request Nov 27, 2024
@ezyang
Hoist set_feature_use out of conditional, rename some variables
7e28e4a 
Signed-off-by: Edward Z. Yang <ezyang@meta.com>

ghstack-source-id: 9afb56f
Pull Request resolved: #141683
@ezyang
Update
cf47986 
[ghstack-poisoned]
@ezyang
Copy link
Contributor Author

ezyang commented Nov 27, 2024

@pytorchbot merge

@pytorch-bot pytorch-bot bot added the ciflow/trunk Trigger trunk jobs on your pull request label Nov 27, 2024
This was referenced Nov 28, 2024
Closed
Closed
Closed
@ezyang
Copy link
Contributor Author

ezyang commented Nov 28, 2024

@pytorchbot merge -f "unrelated failures"

@pytorchmergebot
Copy link
Collaborator

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
Copy link
Collaborator

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

@ezyang
Update
6f35720 
[ghstack-poisoned]
@ezyang ezyang mentioned this pull request Nov 28, 2024
Closed
@ezyang
Copy link
Contributor Author

ezyang commented Nov 28, 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

pytorchmergebot pushed a commit that referenced this pull request Nov 29, 2024
@ezyang @pytorchmergebot
Unify cache disable and cache bypass paths (#141685)
cf3daf7 
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
pytorchmergebot pushed a commit that referenced this pull request Nov 29, 2024
@ezyang @pytorchmergebot
Hoist post_compile1 into fx_codegen_and_compile (#141688)
29326b9 
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
pytorchmergebot pushed a commit that referenced this pull request Nov 29, 2024
@ezyang @pytorchmergebot
Unify post_compile1 and CompiledFxGraph constructor (#141689)
9e4723c 
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
pytorchmergebot pushed a commit that referenced this pull request Nov 29, 2024
@ezyang @pytorchmergebot
Inline compile_to_fn at its only call site (#141691)
b97a786 
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
pytorchmergebot pushed a commit that referenced this pull request Nov 30, 2024
@ezyang @pytorchmergebot
Introduce CompiledAOTI (#141695)
7fafaa9 
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
pobin6 pushed a commit to pobin6/pytorch that referenced this pull request Dec 5, 2024
@ezyang
Hoist set_feature_use out of conditional, rename some variables (pyto…
c46ae06 
…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
pobin6 pushed a commit to pobin6/pytorch that referenced this pull request Dec 5, 2024
@ezyang
Unify cache disable and cache bypass paths (pytorch#141685)
21425ee 
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
pobin6 pushed a commit to pobin6/pytorch that referenced this pull request Dec 5, 2024
@ezyang
Hoist post_compile1 into fx_codegen_and_compile (pytorch#141688)
d447622 
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
pobin6 pushed a commit to pobin6/pytorch that referenced this pull request Dec 5, 2024
@ezyang
Unify post_compile1 and CompiledFxGraph constructor (pytorch#141689)
683ad32 
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
pobin6 pushed a commit to pobin6/pytorch that referenced this pull request Dec 5, 2024
@ezyang
Inline compile_to_fn at its only call site (pytorch#141691)
5115651 
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
pobin6 pushed a commit to pobin6/pytorch that referenced this pull request Dec 5, 2024
@ezyang
Introduce CompiledAOTI (pytorch#141695)
4956850 
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
@github-actions github-actions bot deleted the gh/ezyang/3024/head branch December 30, 2024 02:08
desai0007 pushed a commit to desai0007/test-repo-pytorch that referenced this pull request Feb 26, 2025
@ezyang
Hoist set_feature_use out of conditional, rename some variables
b286a3e 
Signed-off-by: Edward Z. Yang <ezyang@meta.com>

ghstack-source-id: aa3537e
Pull Request resolved: pytorch/pytorch#141683
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jansel jansel jansel approved these changes

@jamesjwu jamesjwu jamesjwu approved these changes

@albanD albanD Awaiting requested review from albanD

@antoniojkim antoniojkim Awaiting requested review from antoniojkim

@bdhirsh bdhirsh Awaiting requested review from bdhirsh

@miladm miladm Awaiting requested review from miladm

@SherlockNoMad SherlockNoMad Awaiting requested review from SherlockNoMad

@masnesral masnesral Awaiting requested review from masnesral

Assignees

No one assigned

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ezyang @pytorchmergebot @jansel @jamesjwu