Skip to content

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

Closed
davidberard98 wants to merge 4 commits intogh/davidberard98/248/basefrom
gh/davidberard98/248/head
Closed

Revert "[dynamo] guarded config (#111299)"#115386
davidberard98 wants to merge 4 commits intogh/davidberard98/248/basefrom
gh/davidberard98/248/head

Conversation

@davidberard98
Copy link
Contributor

@davidberard98 davidberard98 commented Dec 7, 2023 •
edited
Loading

@davidberard98
Revert "[dynamo] guarded config (#111299)"
f2d3aad 
This reverts commit 5927e9c.

[ghstack-poisoned]
This was referenced Dec 7, 2023
Closed
Closed
@pytorch-bot
Copy link

pytorch-bot bot commented Dec 7, 2023 •
edited
Loading

🔗 Helpful Links

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

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

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

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

@davidberard98
Copy link
Contributor Author

davidberard98 commented Dec 7, 2023

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

@davidberard98
Update on "Revert "[dynamo] guarded config (#111299)""
7c0d9d9 
This reverts commit 5927e9c.

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

Differential Revision: [D51959266](https://our.internmc.facebook.com/intern/diff/D51959266)

[ghstack-poisoned]
@davidberard98 davidberard98 mentioned this pull request Dec 8, 2023
Closed
davidberard98 added a commit that referenced this pull request Dec 8, 2023
@davidberard98
Revert "[dynamo] guarded config (#111299)"
8220317 
This reverts commit 5927e9c.

ghstack-source-id: 130cb62
Pull Request resolved: #115386
@davidberard98
Update on "Revert "[dynamo] guarded config (#111299)""
43358ac 
This reverts commit 5927e9c.

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

Differential Revision: [D51959266](https://our.internmc.facebook.com/intern/diff/D51959266)

[ghstack-poisoned]
@davidberard98
Update on "Revert "[dynamo] guarded config (#111299)""
c1a1a32 
This reverts commit 5927e9c.

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

Differential Revision: [D51959266](https://our.internmc.facebook.com/intern/diff/D51959266)

[ghstack-poisoned]
davidberard98 added a commit that referenced this pull request Dec 8, 2023
@davidberard98
Revert "[dynamo] guarded config (#111299)"
2c78166 
This reverts commit 5927e9c.

ghstack-source-id: 784483b
Pull Request resolved: #115386
@davidberard98
Copy link
Contributor Author

davidberard98 commented Dec 9, 2023

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

@davidberard98 davidberard98 marked this pull request as ready for review December 9, 2023 00:06
@davidberard98 davidberard98 requested a review from a team as a code owner December 9, 2023 00:06
@davidberard98
Copy link
Contributor Author

davidberard98 commented Dec 10, 2023

There's one failure (marked as flaky) - hf_T5_base OOM on dynamic_aot_eager. This also appears to happen on trunk. So I am planning to merge via fbcode.

@davidberard98
Copy link
Contributor Author

davidberard98 commented Dec 10, 2023

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

@facebook-github-bot
Copy link
Contributor

facebook-github-bot commented Dec 10, 2023

@pytorchbot merge

(Initiating merge automatically since Phabricator Diff has merged)

@pytorch-bot pytorch-bot bot added the ciflow/trunk Trigger trunk jobs on your pull request label Dec 10, 2023
@pytorchmergebot
Copy link
Collaborator

pytorchmergebot commented Dec 10, 2023

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 Dec 10, 2023

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
Copy link
Contributor Author

davidberard98 commented Dec 11, 2023

@pytorchbot merge

@pytorchmergebot
Copy link
Collaborator

pytorchmergebot commented Dec 11, 2023

Merge failed

Reason: This PR needs a release notes: label
If your changes are user facing and intended to be a part of release notes, please use a label starting with release notes:.

If not, please add the topic: not user facing label.

To add a label, you can comment to pytorchbot, for example
@pytorchbot label "topic: not user facing"

For more information, see
https://github.com/pytorch/pytorch/wiki/PyTorch-AutoLabel-Bot#why-categorize-for-release-notes-and-how-does-it-work.

Details for Dev Infra team Raised by workflow job

@davidberard98 davidberard98 added the topic: not user facing topic category label Dec 11, 2023
@davidberard98
Copy link
Contributor Author

davidberard98 commented Dec 11, 2023

@pytorchbot merge

@pytorchmergebot
Copy link
Collaborator

pytorchmergebot commented Dec 11, 2023

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

@davidberard98 davidberard98 mentioned this pull request Dec 11, 2023
Closed
pytorchmergebot pushed a commit that referenced this pull request Dec 12, 2023
@davidberard98 @pytorchmergebot
[Reland][Dynamo] Don't log compilation metrics for PyTorch unit tests (…
89ee3af 
…#115571)

Reland #115452, which was reverted to simplify a merge conflict with #115386

Pull Request resolved: #115571
Approved by: https://github.com/yanboliang
@facebook-github-bot facebook-github-bot deleted the gh/davidberard98/248/head branch December 15, 2023 15:27
guilhermeleobas pushed a commit to guilhermeleobas/pytorch that referenced this pull request Dec 18, 2023
@davidberard98 @guilhermeleobas
Revert "[dynamo] guarded config (pytorch#111299)" (pytorch#115386)
e6fbeb2 
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
guilhermeleobas pushed a commit to guilhermeleobas/pytorch that referenced this pull request Dec 18, 2023
@davidberard98 @guilhermeleobas
[Reland][Dynamo] Don't log compilation metrics for PyTorch unit tests (…
b6aebb3 
…pytorch#115571)

Reland pytorch#115452, which was reverted to simplify a merge conflict with pytorch#115386

Pull Request resolved: pytorch#115571
Approved by: https://github.com/yanboliang
dmenig pushed a commit to dmenig/pytorch that referenced this pull request Dec 21, 2023
@davidberard98 @dmenig
Revert "[dynamo] guarded config (pytorch#111299)" (pytorch#115386)
36d7d11 
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
dmenig pushed a commit to dmenig/pytorch that referenced this pull request Dec 21, 2023
@davidberard98 @dmenig
[Reland][Dynamo] Don't log compilation metrics for PyTorch unit tests (…
f12f676 
…pytorch#115571)

Reland pytorch#115452, which was reverted to simplify a merge conflict with pytorch#115386

Pull Request resolved: pytorch#115571
Approved by: https://github.com/yanboliang
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@malfet malfet malfet approved these changes

+1 more reviewer

@yanboliang yanboliang yanboliang approved these changes

Reviewers whose approvals may not affect merge requirements

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.

5 participants

@davidberard98 @facebook-github-bot @pytorchmergebot @yanboliang @malfet