[inductor] Remove usage of device_interface from _inductor.runtime by jansel · Pull Request #124592 · pytorch/pytorch

jansel · 2024-04-22T04:53:56Z

Stack from ghstack (oldest at bottom):

cc @voznesenskym @penguinwu @EikanWang @jgong5 @Guobing-Chen @XiaobingSuper @zhuhaozhe @blzheng @wenzhe-nrv @jiayisunx @peterbell10 @ipiszy @yf225 @chenyang78 @kadeng @muchulee8 @ColinPeppler @amjames @desertfire @chauhang

Differential Revision: D56723770

[ghstack-poisoned]

pytorch-bot · 2024-04-22T04:53:59Z

🔗 Helpful Links

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

📄 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 7e4766c with merge base 26f8d96 ():
💚 Looks good so far! There are no failures yet. 💚

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

[ghstack-poisoned]

masnesral · 2024-04-22T21:27:40Z

torch/_inductor/runtime/triton_heuristics.py

-                # Disable for Intel GPU as Triton is not ready to return n_regs for a compiled_binary.
-                and self.device_type != "xpu"
+                # Disable for AMDGPU/Intel as Triton is not ready to return n_regs for a compiled_binary.
+                and device_prop.type == "cuda"


Just checking this is what you want. Instead of != xpu and != hip, you're doing == cuda. I assume that's fine?

Yes, these are the only 3 supported values and if we add new ones we likely want to skip this.

masnesral · 2024-04-22T21:28:38Z

torch/_inductor/runtime/triton_heuristics.py


-    def _precompile_config(self, cfg: Config, warm_cache_only_with_cc: Optional[int]):
+    def get_device_interface(self):
+        # this code cannot run in compile workers, because it imports from torch


I wonder if there's a way we could assert that?

There are asserts in the verify() function in the followup PR.

masnesral · 2024-04-22T21:30:40Z

torch/_inductor/runtime/triton_heuristics.py

-            cc = self.device_interface.get_compute_capability(device)
-
-        compile_meta["cc"] = cc
+        # device type will be "hip" rather than "cuda" here


nit: Not sure I understand this comment. Seems like it could be hip here.

yes correct

masnesral

LGTM

jansel · 2024-04-22T23:50:30Z

@pytorchbot merge

pytorchmergebot · 2024-04-22T23:52:16Z

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-04-22T23:52:31Z

Merge failed

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

Auto-merging torch/_inductor/codecache.py
CONFLICT (content): Merge conflict in torch/_inductor/codecache.py
Auto-merging torch/_inductor/codegen/wrapper.py
Auto-merging torch/_inductor/select_algorithm.py
error: could not apply 09adaab4cdf... [inductor] Remove usage of device_interface from _inductor.runtime
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

[ghstack-poisoned]

) Pull Request resolved: #124681 Approved by: https://github.com/masnesral ghstack dependencies: #124592

jeanschmidt · 2024-04-25T11:16:01Z

@pytorchbot revert -m "breaking internal tests, check D56522594" -c nosignal

pytorchmergebot · 2024-04-25T11:17:34Z

@pytorchbot successfully started a revert job. Check the current status here.
Questions? Feedback? Please reach out to the PyTorch DevX Team

pytorchmergebot · 2024-04-25T11:17:44Z

Reverting PR 124592 failed

Reason: Command git -C /home/runner/work/pytorch/pytorch revert --no-edit 5d45eb77f1aeb57f13391990215b518a607b3c7e returned non-zero exit code 1

Auto-merging torch/_inductor/codecache.py
Auto-merging torch/_inductor/codegen/wrapper.py
Auto-merging torch/_inductor/runtime/triton_heuristics.py
CONFLICT (content): Merge conflict in torch/_inductor/runtime/triton_heuristics.py
Auto-merging torch/_inductor/select_algorithm.py
error: could not revert 5d45eb77f1a... [inductor] Remove usage of device_interface from _inductor.runtime (#124592)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git revert --continue".
hint: You can instead skip this commit with "git revert --skip".
hint: To abort and get back to the state before "git revert",
hint: run "git revert --abort".

Details for Dev Infra team

Raised by workflow job

masnesral · 2024-04-30T00:35:13Z

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

) Differential Revision: [D56723769](https://our.internmc.facebook.com/intern/diff/D56723769) Co-authored-by: Sam Larsen <slarsen@meta.com> Pull Request resolved: #124681 Approved by: https://github.com/masnesral ghstack dependencies: #124592

…124592) Pull Request resolved: #124592 Approved by: https://github.com/masnesral

) Pull Request resolved: #124681 Approved by: https://github.com/masnesral ghstack dependencies: #124592

This reverts commit 9888d74. Reverted pytorch#121801 on behalf of https://github.com/jeanschmidt due to need to revert so I can revert pytorch#124592 ([comment](pytorch#121801 (comment)))

This reverts commit c55309e. Reverted pytorch#124775 on behalf of https://github.com/jeanschmidt due to need to revert so I can revert pytorch#124592 ([comment](pytorch#124775 (comment)))

…ntime (pytorch#124592)" This reverts commit 5d45eb7. Reverted pytorch#124592 on behalf of https://github.com/jeanschmidt due to breaking internal tests, check D56522594 ([comment](pytorch#124592 (comment)))

…ytorch#124592) Differential Revision: [D56723770](https://our.internmc.facebook.com/intern/diff/D56723770) Co-authored-by: Sam Larsen <slarsen@meta.com> Pull Request resolved: pytorch#124592 Approved by: https://github.com/masnesral

…rch#124681) Differential Revision: [D56723769](https://our.internmc.facebook.com/intern/diff/D56723769) Co-authored-by: Sam Larsen <slarsen@meta.com> Pull Request resolved: pytorch#124681 Approved by: https://github.com/masnesral ghstack dependencies: pytorch#124592

Small bug fix - #124592 replaced the torch.version.hip with device_props but made a mistake in porting the original logic. The original code was: ``` if torch.version.hip is not None: ``` Which was incorrectly replaced by: ``` if self.device_props.type != "hip": ``` Perhaps we need to write some unit tests here in the future. Pull Request resolved: #130617 Approved by: https://github.com/masnesral

…0617) Small bug fix - pytorch#124592 replaced the torch.version.hip with device_props but made a mistake in porting the original logic. The original code was: ``` if torch.version.hip is not None: ``` Which was incorrectly replaced by: ``` if self.device_props.type != "hip": ``` Perhaps we need to write some unit tests here in the future. Pull Request resolved: pytorch#130617 Approved by: https://github.com/masnesral

Small bug fix - #124592 replaced the torch.version.hip with device_props but made a mistake in porting the original logic. The original code was: `if torch.version.hip is not None:` Which was incorrectly replaced by: `if self.device_props.type != "hip":` Another occurence of #130617 Pull Request resolved: #133852 Approved by: https://github.com/masnesral, https://github.com/malfet

…#133852) Small bug fix - pytorch#124592 replaced the torch.version.hip with device_props but made a mistake in porting the original logic. The original code was: `if torch.version.hip is not None:` Which was incorrectly replaced by: `if self.device_props.type != "hip":` Another occurence of pytorch#130617 Pull Request resolved: pytorch#133852 Approved by: https://github.com/masnesral, https://github.com/malfet (cherry picked from commit da587de)

…#133852) Small bug fix - pytorch#124592 replaced the torch.version.hip with device_props but made a mistake in porting the original logic. The original code was: `if torch.version.hip is not None:` Which was incorrectly replaced by: `if self.device_props.type != "hip":` Another occurence of pytorch#130617 Pull Request resolved: pytorch#133852 Approved by: https://github.com/masnesral, https://github.com/malfet

#136139) Small bug fix - #124592 replaced the torch.version.hip with device_props but made a mistake in porting the original logic. The original code was: `if torch.version.hip is not None:` Which was incorrectly replaced by: `if self.device_props.type != "hip":` Another occurence of #130617 Pull Request resolved: #133852 Approved by: https://github.com/masnesral, https://github.com/malfet (cherry picked from commit da587de)

Update

9dcb189

[ghstack-poisoned]

jansel mentioned this pull request Apr 22, 2024

[inductor] Add ProcessPool-in-subproc worker_start_method #122941

Closed

pytorch-bot bot added ciflow/inductor module: inductor release notes: foreach_frontend release notes category labels Apr 22, 2024

jansel added topic: not user facing topic category and removed release notes: foreach_frontend release notes category labels Apr 22, 2024

Update

542ff3a

[ghstack-poisoned]

jansel added the ciflow/trunk Trigger trunk jobs on your pull request label Apr 22, 2024

masnesral reviewed Apr 22, 2024

View reviewed changes

masnesral approved these changes Apr 22, 2024

View reviewed changes

This was referenced Apr 22, 2024

[dynamo] Refactor into torch/_inductor/runtime/compile_tasks.py #124681

Closed

[inductor] Add thread+subproc-based worker_start_method #124682

Closed

pytorchmergebot added the merging label Apr 22, 2024

pytorchmergebot removed the merging label Apr 22, 2024

Update

0814911

[ghstack-poisoned]

pytorchmergebot added the Merged label Apr 23, 2024

pytorchmergebot closed this in 5d45eb7 Apr 23, 2024

pytorchmergebot pushed a commit that referenced this pull request Apr 23, 2024

[dynamo] Refactor into torch/_inductor/runtime/compile_tasks.py (#124681

0792cea

) Pull Request resolved: #124681 Approved by: https://github.com/masnesral ghstack dependencies: #124592

jeanschmidt mentioned this pull request Apr 25, 2024

[ROCm] Triton upstream AMD backend integration #121801

Closed

pytorchmergebot closed this in 254128c Apr 30, 2024

pytorch-bot bot pushed a commit that referenced this pull request May 3, 2024

[inductor] Remove usage of device_interface from _inductor.runtime (#…

5abfe5f

…124592) Pull Request resolved: #124592 Approved by: https://github.com/masnesral

pytorch-bot bot pushed a commit that referenced this pull request May 3, 2024

[dynamo] Refactor into torch/_inductor/runtime/compile_tasks.py (#124681

3b95aa9

) Pull Request resolved: #124681 Approved by: https://github.com/masnesral ghstack dependencies: #124592

github-actions bot deleted the gh/jansel/328/head branch June 4, 2024 01:58

jataylo mentioned this pull request Jul 12, 2024

[ROCm] [BUGFIX] Re-enable rocm-specific tuning parameters #130617

Closed

jataylo mentioned this pull request Aug 19, 2024

[ROCm] [BUGFIX] Re-enable rocm-specific tuning parameters v2 #133852

Closed

jataylo mentioned this pull request Sep 16, 2024

[ROCm] [BUGFIX] Re-enable rocm-specific tuning parameters v2 (#133852) #136139

Merged

Conversation

jansel commented Apr 22, 2024 • edited by masnesral Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pytorch-bot bot commented Apr 22, 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/124592

✅ No Failures

Uh oh!

masnesral Apr 22, 2024

Choose a reason for hiding this comment

Uh oh!

jansel Apr 22, 2024

Choose a reason for hiding this comment

Uh oh!

masnesral Apr 22, 2024

Choose a reason for hiding this comment

Uh oh!

jansel Apr 22, 2024

Choose a reason for hiding this comment

Uh oh!

masnesral Apr 22, 2024

Choose a reason for hiding this comment

Uh oh!

jansel Apr 22, 2024

Choose a reason for hiding this comment

Uh oh!

masnesral left a comment

Choose a reason for hiding this comment

Uh oh!

jansel commented Apr 22, 2024

Uh oh!

pytorchmergebot commented Apr 22, 2024

Merge started

Uh oh!

pytorchmergebot commented Apr 22, 2024

Merge failed

Uh oh!

jeanschmidt commented Apr 25, 2024

Uh oh!

pytorchmergebot commented Apr 25, 2024

Uh oh!

pytorchmergebot commented Apr 25, 2024

Reverting PR 124592 failed

Uh oh!

masnesral commented Apr 30, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jansel commented Apr 22, 2024 •

edited by masnesral

Loading

pytorch-bot bot commented Apr 22, 2024 •

edited

Loading