Add shape_env guards to tracing context #90876

voznesenskym · 2022-12-14T22:59:03Z

cc @mlazos @soumith @yanboliang @penguinwu @anijain2305 @EikanWang @jgong5 @Guobing-Chen @chunyuan-w @XiaobingSuper @zhuhaozhe @blzheng @Xia-Weiwen @wenzhe-nrv @jiayisunx @desertfire

Fix test, copy, lint Integrate dynamo guards into torch._guards Fix lint ghstack-source-id: e77294b Pull Request resolved: #90646

ghstack-source-id: 27b0263 Pull Request resolved: #90638 Fix

…context2

…o voz/tracing_context3

pytorch-bot · 2022-12-14T22:59:05Z

🔗 Helpful Links

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

📄 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.

✅ No Failures

As of commit 8d2cfba:
💚 Looks good so far! There are no failures yet. 💚

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

Chillee

Some extra breakpoints left over

Chillee · 2022-12-15T20:38:12Z

torch/fx/experimental/symbolic_shapes.py

@@ -765,15 +765,15 @@ def evaluate_guards_for_args(self, placeholders, args):
        return eval(code, {}, dict(zip(arg_names, args)))

    def get_nontrivial_guards(self):
-        return [self.simplify(guard) for guard, _ in self.guards if self._maybe_evaluate_static(guard) is None]
+        return [self.simplify(guard.expr) for guard in self.guards if self._maybe_evaluate_static(guard.expr) is None]


Why are these changing?

Readability

to elaborate: I could rename this from guard to something like:

return [self.simplify(expr) for expr, _ in self.guards if self._maybe_evaluate_static(expr) is None]

But that felt less readable than this

torch/_dynamo/symbolic_convert.py

voznesenskym · 2022-12-15T23:29:34Z

@pytorchbot merge

pytorchmergebot · 2022-12-15T23:32:26Z

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 · 2022-12-16T03:24:33Z

Merge failed

Reason: Command git -C /home/runner/work/pytorch/pytorch rebase origin/master returned non-zero exit code 1

Rebasing (1/1)
Auto-merging torch/fx/experimental/symbolic_shapes.py
CONFLICT (content): Merge conflict in torch/fx/experimental/symbolic_shapes.py
error: could not apply f0815f07a1... Add shape_env guards to tracing context (#90876)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply f0815f07a1... Add shape_env guards to tracing context (#90876)

Details for Dev Infra team

Raised by workflow job

…context_shapes

…ch into voz/tracing_context_shapes

voznesenskym · 2022-12-16T07:02:13Z

@pytorchbot merge

pytorchmergebot · 2022-12-16T07:03:52Z

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

voznesenskym added 16 commits December 11, 2022 06:39

Integrate dynamo guards into torch._guards

55329bc

Fix test, copy, lint Integrate dynamo guards into torch._guards Fix lint ghstack-source-id: e77294b Pull Request resolved: #90646

Integrate shape guards into torch._guards

863840d

ghstack-source-id: 27b0263 Pull Request resolved: #90638 Fix

Fix case where we are missing a context

4b0fcba

rm clear, fix lifecycle

48e37ea

Fix case where we are missing a context

88e61fc

rm clear, fix lifecycle

a232d68

Merge branch 'master' of github.com:pytorch/pytorch into voz/tracing_…

6db075b

…context2

Cleanup guards

8931cfb

Undo shape

e5787a2

Lint

c356f1a

Merge branch 'voz/tracing_context2' of github.com:pytorch/pytorch int…

f956442

…o voz/tracing_context3

Comment, restore

ab9d41e

Shape guard structure

de1922e

Better lifcycles

4fa4b33

Merge branch 'master' of github.com:pytorch/pytorch into HEAD

1fb2c09

Merge branch 'master' of github.com:pytorch/pytorch into HEAD

be37f8c

pytorch-bot bot added the release notes: fx release notes category label Dec 14, 2022

github-actions bot added ciflow/inductor module: dynamo labels Dec 14, 2022

github-actions bot requested review from albanD, antoniojkim, bdhirsh, Chillee, ezyang, jbschlosser, miladm, SherlockNoMad and wconstab December 14, 2022 22:59

Fix

70afa48

voznesenskym added 3 commits December 15, 2022 07:20

Small fix

f56686d

put config back

7f35314

import and lint

0204654

voznesenskym changed the title ~~[WIP] Add shape_env guards to tracing context~~ Add shape_env guards to tracing context Dec 15, 2022

Chillee approved these changes Dec 15, 2022

View reviewed changes

voznesenskym commented Dec 15, 2022

View reviewed changes

torch/_dynamo/symbolic_convert.py Outdated Show resolved Hide resolved

voznesenskym added 2 commits December 15, 2022 12:38

Update symbolic_convert.py

e3bc014

Update misc.py

f61609f

ezyang approved these changes Dec 15, 2022

View reviewed changes

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

voznesenskym added 2 commits December 16, 2022 06:12

Merge branch 'master' of github.com:pytorch/pytorch into voz/tracing_…

945fd08

…context_shapes

Merge branch 'voz/tracing_context_shapes' of github.com:pytorch/pytor…

8d2cfba

…ch into voz/tracing_context_shapes

pytorchmergebot added the Merged label Dec 16, 2022

pytorchmergebot closed this in 53e71fa Dec 16, 2022

github-actions bot deleted the voz/tracing_context_shapes branch June 16, 2024 01:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add shape_env guards to tracing context #90876

Add shape_env guards to tracing context #90876

Uh oh!

voznesenskym commented Dec 14, 2022 •

edited

Loading

Uh oh!

pytorch-bot bot commented Dec 14, 2022 •

edited

Loading

Uh oh!

Chillee left a comment

Uh oh!

Chillee Dec 15, 2022

Uh oh!

voznesenskym Dec 15, 2022

Uh oh!

voznesenskym Dec 15, 2022

Uh oh!

Uh oh!

voznesenskym commented Dec 15, 2022

Uh oh!

pytorchmergebot commented Dec 15, 2022

Uh oh!

pytorchmergebot commented Dec 16, 2022

Uh oh!

voznesenskym commented Dec 16, 2022

Uh oh!

pytorchmergebot commented Dec 16, 2022

Uh oh!

Uh oh!

Add shape_env guards to tracing context #90876

Add shape_env guards to tracing context #90876

Uh oh!

Conversation

voznesenskym commented Dec 14, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pytorch-bot bot commented Dec 14, 2022 • 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/90876

✅ No Failures

Uh oh!

Chillee left a comment

Choose a reason for hiding this comment

Uh oh!

Chillee Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

voznesenskym Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

voznesenskym Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

voznesenskym commented Dec 15, 2022

Uh oh!

pytorchmergebot commented Dec 15, 2022

Merge started

Uh oh!

pytorchmergebot commented Dec 16, 2022

Merge failed

Uh oh!

voznesenskym commented Dec 16, 2022

Uh oh!

pytorchmergebot commented Dec 16, 2022

Merge started

Uh oh!

Uh oh!

voznesenskym commented Dec 14, 2022 •

edited

Loading

pytorch-bot bot commented Dec 14, 2022 •

edited

Loading