Revert "[dynamo] Cache size calc for differing config (#111300)" by davidberard98 · Pull Request #115385 · pytorch/pytorch

davidberard98 · 2023-12-07T22:28:44Z

Stack from ghstack (oldest at bottom):

Revert "[dynamo] guarded config (#111299)" #115386
-> Revert "[dynamo] Cache size calc for differing config (#111300)" #115385
Revert "[dynamo] remove unused OptimizeCtx field - export (#113901)" #115401
Revert "[dynamo] Guard on HAS_GRAPH_BREAKS if graph breaks are present (i.e. cache miss if compiled object requires nopython) (#114073)" #115384

This reverts commit 78318d0.

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

Differential Revision: D51959268

This reverts commit 78318d0. [ghstack-poisoned]

pytorch-bot · 2023-12-07T22:28:47Z

🔗 Helpful Links

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

📄 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 aaca1a2 with merge base 72e58a7 ():

FLAKY - The following job failed but was likely due to flakiness present on trunk:

inductor-periodic / cuda12.1-py3.10-gcc9-sm86-periodic-dynamo-benchmarks / test (dynamic_aot_eager_torchbench, 1, 2, linux.g5.4xlarge.nvidia.gpu) (gh)

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

davidberard98 · 2023-12-07T22:30:25Z

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

…1300)"" This reverts commit 78318d0. cc voznesenskym penguinwu EikanWang jgong5 Guobing-Chen XiaobingSuper zhuhaozhe blzheng wenzhe-nrv jiayisunx chenyang78 aakhundov kadeng Differential Revision: [D51959268](https://our.internmc.facebook.com/intern/diff/D51959268) [ghstack-poisoned]

davidberard98 · 2023-12-09T00:05:13Z

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

davidberard98 · 2023-12-10T05:20:59Z

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

facebook-github-bot · 2023-12-10T18:14:03Z

@pytorchbot merge

(Initiating merge automatically since Phabricator Diff has merged)

pytorchmergebot · 2023-12-10T18:16:58Z

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 · 2023-12-10T18:17:45Z

Merge failed

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

Auto-merging torch/_dynamo/convert_frame.py
CONFLICT (content): Merge conflict in torch/_dynamo/convert_frame.py
Auto-merging torch/_dynamo/guards.py
error: could not apply 68a458562ff... Revert "[dynamo] Cache size calc for differing config (#111300)"
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".

Details for Dev Infra team

Raised by workflow job

davidberard98 · 2023-12-10T19:52:32Z

I’ll take a look in a few hours

davidberard98 · 2023-12-10T19:52:56Z

I’ll take a look in a few hours

Fixes #ISSUE_NUMBER Pull Request resolved: #115452 Approved by: https://github.com/zou3519

…#115452)" This reverts commit cd444aa. Reverted #115452 on behalf of https://github.com/davidberard98 due to Merge conflict with #115385, which already landed in fbcode ([comment](#115452 (comment)))

This reverts commit 5927e9c. Differential Revision: [D51959266](https://our.internmc.facebook.com/intern/diff/D51959266) Pull Request resolved: #115386 Approved by: https://github.com/yanboliang, https://github.com/malfet ghstack dependencies: #115384, #115401, #115385

…pytorch#115452)" This reverts commit cd444aa. Reverted pytorch#115452 on behalf of https://github.com/davidberard98 due to Merge conflict with pytorch#115385, which already landed in fbcode ([comment](pytorch#115452 (comment)))

…" (pytorch#115385) This reverts commit 78318d0. Differential Revision: [D51959268](https://our.internmc.facebook.com/intern/diff/D51959268) Pull Request resolved: pytorch#115385 Approved by: https://github.com/malfet ghstack dependencies: pytorch#115384, pytorch#115401

This reverts commit 5927e9c. Differential Revision: [D51959266](https://our.internmc.facebook.com/intern/diff/D51959266) Pull Request resolved: pytorch#115386 Approved by: https://github.com/yanboliang, https://github.com/malfet ghstack dependencies: pytorch#115384, pytorch#115401, pytorch#115385

…pytorch#115452)" This reverts commit cd444aa. Reverted pytorch#115452 on behalf of https://github.com/davidberard98 due to Merge conflict with pytorch#115385, which already landed in fbcode ([comment](pytorch#115452 (comment)))

…" (pytorch#115385) This reverts commit 78318d0. Differential Revision: [D51959268](https://our.internmc.facebook.com/intern/diff/D51959268) Pull Request resolved: pytorch#115385 Approved by: https://github.com/malfet ghstack dependencies: pytorch#115384, pytorch#115401

This reverts commit 5927e9c. Differential Revision: [D51959266](https://our.internmc.facebook.com/intern/diff/D51959266) Pull Request resolved: pytorch#115386 Approved by: https://github.com/yanboliang, https://github.com/malfet ghstack dependencies: pytorch#115384, pytorch#115401, pytorch#115385

Revert "[dynamo] Cache size calc for differing config (#111300)"

a35511e

This reverts commit 78318d0. [ghstack-poisoned]

This was referenced Dec 7, 2023

Revert "[dynamo] Guard on HAS_GRAPH_BREAKS if graph breaks are present (i.e. cache miss if compiled object requires nopython) (#114073)" #115384

Closed

Revert "[dynamo] guarded config (#111299)" #115386

Closed

github-actions bot added module: dynamo ciflow/inductor labels Dec 7, 2023

davidberard98 mentioned this pull request Dec 8, 2023

Revert "[dynamo] remove unused OptimizeCtx field - export (#113901)" #115401

Closed

davidberard98 marked this pull request as ready for review December 9, 2023 00:06

malfet approved these changes Dec 9, 2023

View reviewed changes

pytorch-bot bot added the ciflow/trunk Trigger trunk jobs on your pull request label Dec 10, 2023

pytorchmergebot added the merging label Dec 10, 2023

pytorchmergebot removed the merging label Dec 10, 2023

davidberard98 mentioned this pull request Dec 11, 2023

[Dynamo] Don't log compilation metrics for PyTorch unit tests #115452

Closed

pytorchmergebot referenced this pull request Dec 11, 2023

[Dynamo] Don't log compilation metrics for PyTorch unit tests (#115452)

cd444aa

Fixes #ISSUE_NUMBER Pull Request resolved: #115452 Approved by: https://github.com/zou3519

davidberard98 added the topic: not user facing topic category label Dec 11, 2023

pytorchmergebot added the Merged label Dec 11, 2023

pytorchmergebot closed this in 6db7b30 Dec 11, 2023

facebook-github-bot deleted the gh/davidberard98/247/head branch December 15, 2023 15:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Revert "[dynamo] Cache size calc for differing config (#111300)"#115385

Revert "[dynamo] Cache size calc for differing config (#111300)"#115385
davidberard98 wants to merge 3 commits intogh/davidberard98/247/basefrom
gh/davidberard98/247/head

davidberard98 commented Dec 7, 2023 •

edited

Loading

Uh oh!

pytorch-bot bot commented Dec 7, 2023 •

edited

Loading

Uh oh!

davidberard98 commented Dec 7, 2023

Uh oh!

davidberard98 commented Dec 9, 2023

Uh oh!

davidberard98 commented Dec 10, 2023

Uh oh!

facebook-github-bot commented Dec 10, 2023

Uh oh!

pytorchmergebot commented Dec 10, 2023

Uh oh!

pytorchmergebot commented Dec 10, 2023

Uh oh!

davidberard98 commented Dec 10, 2023

Uh oh!

davidberard98 commented Dec 10, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

davidberard98 commented Dec 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pytorch-bot bot commented Dec 7, 2023 • 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/115385

✅ You can merge normally! (1 Unrelated Failure)

Uh oh!

davidberard98 commented Dec 7, 2023

Uh oh!

davidberard98 commented Dec 9, 2023

Uh oh!

davidberard98 commented Dec 10, 2023

Uh oh!

facebook-github-bot commented Dec 10, 2023

Uh oh!

pytorchmergebot commented Dec 10, 2023

Merge started

Uh oh!

pytorchmergebot commented Dec 10, 2023

Merge failed

Uh oh!

davidberard98 commented Dec 10, 2023

Uh oh!

davidberard98 commented Dec 10, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

davidberard98 commented Dec 7, 2023 •

edited

Loading

pytorch-bot bot commented Dec 7, 2023 •

edited

Loading