[dynamic shapes] guard individual terms in sym_and; user-code-friendly sym_and/sym_or #154737
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🔗 Helpful Links🧪 See artifacts and rendered test results at hud.pytorch.org/pr/154737
Note: Links to docs will display an error until the docs builds have been completed. ❌ 30 New Failures, 6 Cancelled Jobs, 7 Unrelated FailuresAs of commit 3d5cb4f with merge base e895e96 ( NEW FAILURES - The following jobs have failed:
CANCELLED JOBS - The following jobs were cancelled. Please retry:
FLAKY - The following jobs failed but were likely due to flakiness present on trunk:
BROKEN TRUNK - The following jobs failed but were present on the merge base:👉 Rebase onto the `viable/strict` branch to avoid these failures
UNSTABLE - The following jobs are marked as unstable, possibly due to flakiness on trunk:
This comment was automatically generated by Dr. CI and updates every 15 minutes. |
pianpwk
commented
May 30, 2025
| return SymNodeVariable.create( | ||
| tx, | ||
| torch.fx.experimental.symbolic_shapes.sym_or(*(x.as_proxy() for x in terms)), | ||
| sym_num=None, |
There was a problem hiding this comment.
not sure if there's a better way to do thiis
pianpwk
commented
Jun 4, 2025
test/export/test_export.py
Outdated
| @@ -7397,7 +7397,7 @@ def forward(self, xs): | ||
| ): | ||
| ep.module()(torch.tensor([3, 6, 5])) | ||
| with self.assertRaisesRegex( | ||
| RuntimeError, r".* expression Eq\(u2, 5\) & \(4 <= u1\) & \(u1 <= 8\) .*" | ||
| RuntimeError, r".* expression u[\d]+ <= 5 .*" |
There was a problem hiding this comment.
because of how the runtime asserts pass inserts range checks for unbacked symbols:
pytorch/torch/fx/passes/runtime_assert.py
Line 615 in 1083bc7
sym_and assert.
This seems like a good thing; the ShapeEnv is now processing these bound checks. Could be a nice-to-have in the pass to recognize and deduplicate these.
pianpwk
commented
Jun 4, 2025
| if len(others) == 0: | ||
| return x | ||
| for y in others: | ||
| assert isinstance(y, (bool, SymBool)) |
There was a problem hiding this comment.
because of dynamo, is a Proxy
laithsakka
reviewed
Jun 5, 2025
| @@ -6786,12 +6782,18 @@ def _find(self, a: sympy.Symbol) -> sympy.Expr: | ||
| return self.replacements[a] | ||
|
|
||
| @lru_cache(256) | ||
| def _maybe_guard_rel(self, expr: sympy.Rel) -> None: | ||
| def _maybe_guard_rel(self, expr: sympy.Expr) -> None: | ||
| """ | ||
| The relational guard is guarded to be true. Use this information to |
laithsakka
approved these changes
Jun 5, 2025
|
@pytorchbot rebase |
|
@pytorchbot started a rebase job onto refs/remotes/origin/viable/strict. Check the current status here |
|
Successfully rebased |
c55871a to
3d5cb4f
Compare
|
@pytorchbot rebase |
|
@pytorchbot started a rebase job onto refs/remotes/origin/viable/strict. Check the current status here |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously when processing
sym_and(a, b, c), symbolic shapes wouldn't individually process a, b, and c and store their implications. This would lead us to data-dependent error on individual checks, e.g. we storedu0 >= 0 & u0 <= 10, but then couldn't figure outu0 <= 10.This handles that, and also makes
sym_and/oruser-code friendly, for testing.cc @ezyang @SherlockNoMad @EikanWang @jgong5 @wenzhe-nrv @voznesenskym @penguinwu @Guobing-Chen @XiaobingSuper @zhuhaozhe @blzheng @jiayisunx @chenyang78 @kadeng @chauhang @amjames