[dynamo] add SymNode bitwise and/or #138777

williamwen42 · 2024-10-24T00:53:47Z

Stack from ghstack (oldest at bottom):

-> [dynamo] add SymNode bitwise and/or #138777

Fixes T203472723

cc @jgong5 @mingfeima @XiaobingSuper @sanchitintel @ashokei @jingxu10 @ezyang @SherlockNoMad @EikanWang @wenzhe-nrv @penguinwu @bobrenjc93 @voznesenskym @Guobing-Chen @zhuhaozhe @blzheng @jiayisunx @chenyang78 @kadeng @chauhang @amjames @rec

[ghstack-poisoned]

pytorch-bot · 2024-10-24T00:53:51Z

🔗 Helpful Links

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

📄 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! (5 Unrelated Failures)

As of commit 4269517 with merge base e54538a ():

FLAKY - The following jobs failed but were likely due to flakiness present on trunk:

linux-binary-manywheel / manywheel-py3_9-cuda12_4-test / test (gh) (similar failure)
ERROR: No matching distribution found for pytorch-triton==3.2.0+35c6c7c628; platform_system == "Linux" and platform_machine == "x86_64" and python_version < "3.13"
linux-binary-manywheel / manywheel-py3_9-cuda12_6-test / test (gh) (similar failure)
ERROR: No matching distribution found for pytorch-triton==3.2.0+35c6c7c628; platform_system == "Linux" and platform_machine == "x86_64" and python_version < "3.13"

BROKEN TRUNK - The following jobs failed but were present on the merge base:

👉 Rebase onto the `viable/strict` branch to avoid these failures

inductor / cuda12.1-py3.10-gcc9-sm86 / test (inductor_timm, 1, 2, linux.g5.4xlarge.nvidia.gpu) (gh) (trunk failure)
convnext_base
inductor / cuda12.4-py3.10-gcc9-sm86 / test (inductor_timm, 1, 2, linux.g5.4xlarge.nvidia.gpu) (gh) (trunk failure)
convnext_base
linux-binary-manywheel / manywheel-py3_9-cuda11_8-test / test (gh) (trunk failure)
ERROR: Could not find a version that satisfies the requirement pytorch-triton==3.2.0+35c6c7c628; platform_system == "Linux" and platform_machine == "x86_64" and python_version < "3.13" (from torch) (from versions: 2.0.0+0d7e753227, 2.0.0+3aa3d7024e, 2.0.0+af76c989eb, 2.0.0+b8b470bc59, 2.0.0+c8bfe3f548, 2.0.0+d54c04abe2, 2.1.0, 2.1.0+2c32f43999, 2.1.0+3c400e7818, 2.1.0+440fd1bf20, 2.1.0+46672772b4, 2.1.0+6e4932cda8, 2.1.0+7d1a95b046, 2.1.0+9820899b38, 2.1.0+9e3e10c5ed, 2.1.0+bcad9dabe1, 2.1.0+e6216047b8, 2.1.0+e650d3708b, 2.2.0+e28a256d71, 3.0.0+45fff310c8, 3.0.0+757b6a61e7, 3.0.0+901819d2b6, 3.0.0+989adb9a29, 3.0.0+a9bc1a3647, 3.0.0+dedb7bdf33, 3.1.0+5fe38ffd73, 3.1.0+cf34004b8a, 3.2.0+git35c6c7c6)

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

ghstack-source-id: a013a80 Pull Request resolved: #138777

Fixes [T203472723](https://www.internalfb.com/intern/tasks/?t=203472723) cc jgong5 mingfeima XiaobingSuper sanchitintel ashokei jingxu10 ezyang SherlockNoMad EikanWang wenzhe-nrv penguinwu bobrenjc93 voznesenskym Guobing-Chen zhuhaozhe blzheng jiayisunx chenyang78 kadeng chauhang amjames rec [ghstack-poisoned]

ghstack-source-id: 509e302 Pull Request resolved: #138777

torch/utils/_sympy/value_ranges.py

torch/fx/experimental/sym_node.py

ezyang · 2024-10-27T15:11:31Z

This seems fine but it looks like you have to fix some tests, and I would appreciate more thorough testing on the value ranges logic

Fixes [T203472723](https://www.internalfb.com/intern/tasks/?t=203472723) cc jgong5 mingfeima XiaobingSuper sanchitintel ashokei jingxu10 ezyang SherlockNoMad EikanWang wenzhe-nrv penguinwu bobrenjc93 voznesenskym Guobing-Chen zhuhaozhe blzheng jiayisunx chenyang78 kadeng chauhang amjames rec [ghstack-poisoned]

williamwen42 · 2024-11-21T23:52:24Z

Added a test that evaluates bitwise and/or in a guard - will followup with "it would also be nice to have a test that this dict has enough entries so when new ops are added we don't forget too" and fixing log2 in a separate PR.

ezyang · 2024-11-22T04:53:25Z

torch/fx/experimental/symbolic_shapes.py

    "OpaqueUnaryFn_atan": math.atan,
    "OpaqueUnaryFn_sqrt": math.sqrt,
+    "BitwiseFn_bitwise_and": operator.and_,
+    "BitwiseFn_bitwise_or": operator.or_,


williamwen42 · 2024-11-22T08:22:58Z

@pytorchbot merge

pytorchmergebot · 2024-11-22T08:24: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

pytorchmergebot · 2024-11-22T08:30:35Z

Merge failed

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

Auto-merging test/test_dynamic_shapes.py
Auto-merging torch/fx/experimental/symbolic_shapes.py
CONFLICT (content): Merge conflict in torch/fx/experimental/symbolic_shapes.py
Auto-merging torch/utils/_sympy/functions.py
error: could not apply 95753f7ccc2... [dynamo] add SymNode bitwise and/or
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

Fixes [T203472723](https://www.internalfb.com/intern/tasks/?t=203472723) cc jgong5 mingfeima XiaobingSuper sanchitintel ashokei jingxu10 ezyang SherlockNoMad EikanWang wenzhe-nrv penguinwu bobrenjc93 voznesenskym Guobing-Chen zhuhaozhe blzheng jiayisunx chenyang78 kadeng chauhang amjames rec [ghstack-poisoned]

ghstack-source-id: c56213b Pull Request resolved: #138777

williamwen42 · 2024-11-22T23:28:46Z

@pytorchbot merge

pytorchmergebot · 2024-11-22T23:30:28Z

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

An internal test is failing due to not handling `sympy.oo` properly in bitwise_and/or value_ranges: [T208684142](https://www.internalfb.com/intern/tasks/?t=208684142). I don't know how to repro this - seems like this requires inductor to trigger as well. Pull Request resolved: #141522 Approved by: https://github.com/ezyang ghstack dependencies: #138777

Fixes [T203472723](https://www.internalfb.com/intern/tasks/?t=203472723) Pull Request resolved: pytorch#138777 Approved by: https://github.com/ezyang

This reverts commit c98ef02. Reverted pytorch#138777 on behalf of https://github.com/ezyang due to triggering AssertionError: Guard check failed: 14/2: name 'BitwiseFn_bitwise_or' is not defined ([comment](pytorch#138777 (comment)))

Fixes [T203472723](https://www.internalfb.com/intern/tasks/?t=203472723) Pull Request resolved: pytorch#138777 Approved by: https://github.com/ezyang

An internal test is failing due to not handling `sympy.oo` properly in bitwise_and/or value_ranges: [T208684142](https://www.internalfb.com/intern/tasks/?t=208684142). I don't know how to repro this - seems like this requires inductor to trigger as well. Pull Request resolved: pytorch#141522 Approved by: https://github.com/ezyang ghstack dependencies: pytorch#138777

… "[dynamo] add SymNode bitwise and/or (#138777)" This reverts commit 6fa4356. This reverts commit ee7eaad. ghstack-source-id: 7713b8f Pull Request resolved: #142842

[dynamo] add SymNode bitwise and/or

eb3dd3c

[ghstack-poisoned]

pytorch-bot bot added ciflow/inductor module: cpu CPU specific problem (e.g., perf, algorithm) module: dynamo release notes: fx release notes category labels Oct 24, 2024

williamwen42 added a commit that referenced this pull request Oct 24, 2024

[dynamo] add SymNode bitwise and/or

920fdd0

ghstack-source-id: a013a80 Pull Request resolved: #138777

facebook-github-bot added the fx label Oct 24, 2024

williamwen42 requested a review from ezyang October 24, 2024 00:54

williamwen42 added module: dynamic shapes and removed module: cpu CPU specific problem (e.g., perf, algorithm) labels Oct 24, 2024

pytorch-bot bot added the module: cpu CPU specific problem (e.g., perf, algorithm) label Oct 24, 2024

williamwen42 added a commit that referenced this pull request Oct 24, 2024

[dynamo] add SymNode bitwise and/or

6cca321

ghstack-source-id: 509e302 Pull Request resolved: #138777

ezyang reviewed Oct 27, 2024

View reviewed changes

torch/utils/_sympy/value_ranges.py Show resolved Hide resolved

ezyang reviewed Oct 27, 2024

View reviewed changes

torch/fx/experimental/sym_node.py Outdated Show resolved Hide resolved

ezyang reviewed Nov 22, 2024

View reviewed changes

pytorchmergebot added the merging label Nov 22, 2024

pytorchmergebot removed the merging label Nov 22, 2024

williamwen42 added a commit that referenced this pull request Nov 22, 2024

[dynamo] add SymNode bitwise and/or

9f69253

ghstack-source-id: c56213b Pull Request resolved: #138777

pytorchmergebot added the merging label Nov 22, 2024

pytorchmergebot closed this in ee7eaad Nov 22, 2024

pytorchmergebot removed the merging label Nov 22, 2024

williamwen42 mentioned this pull request Nov 25, 2024

handle sympy.oo in bitwise_and/or value_ranges #141522

Closed

github-actions bot deleted the gh/williamwen42/152/head branch December 23, 2024 02:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[dynamo] add SymNode bitwise and/or #138777

[dynamo] add SymNode bitwise and/or #138777

Uh oh!

williamwen42 commented Oct 24, 2024 •

edited

Loading

Uh oh!

pytorch-bot bot commented Oct 24, 2024 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

ezyang commented Oct 27, 2024

Uh oh!

williamwen42 commented Nov 21, 2024

Uh oh!

ezyang Nov 22, 2024

Uh oh!

williamwen42 commented Nov 22, 2024

Uh oh!

pytorchmergebot commented Nov 22, 2024

Uh oh!

pytorchmergebot commented Nov 22, 2024

Uh oh!

williamwen42 commented Nov 22, 2024

Uh oh!

pytorchmergebot commented Nov 22, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

[dynamo] add SymNode bitwise and/or #138777

[dynamo] add SymNode bitwise and/or #138777

Uh oh!

Conversation

williamwen42 commented Oct 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pytorch-bot bot commented Oct 24, 2024 • 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/138777

✅ You can merge normally! (5 Unrelated Failures)

Uh oh!

Uh oh!

Uh oh!

ezyang commented Oct 27, 2024

Uh oh!

williamwen42 commented Nov 21, 2024

Uh oh!

ezyang Nov 22, 2024

Choose a reason for hiding this comment

Uh oh!

williamwen42 commented Nov 22, 2024

Uh oh!

pytorchmergebot commented Nov 22, 2024

Merge started

Uh oh!

pytorchmergebot commented Nov 22, 2024

Merge failed

Uh oh!

williamwen42 commented Nov 22, 2024

Uh oh!

pytorchmergebot commented Nov 22, 2024

Merge started

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

williamwen42 commented Oct 24, 2024 •

edited

Loading

pytorch-bot bot commented Oct 24, 2024 •

edited

Loading