Adding metal_utils for iree_utils #1561

Ranvirsv · 2023-06-20T17:47:56Z

Added metal_utils.py, changes IREE_DEVICE_MAP and IREE_TARGET_MAP to use metal, added a separate case to handel for metal device in compile_uitls.py

Passes 14 test using pytest -k metal, skips 16, xfail 16

powderluv · 2023-06-20T17:51:24Z

shark/iree_utils/metal_utils.py

@@ -0,0 +1,176 @@
+# Copyright 2020 The Nod Team. All rights reserved.


powderluv · 2023-06-20T17:52:21Z

shark/iree_utils/metal_utils.py

+    # Adreno Targets
+    elif all(x in device_name for x in ("Adreno", "740")):
+        triple = f"adreno-a740-{system_os}"
+


you can remove everything but the apple targets.

powderluv · 2023-06-20T17:53:41Z

shark/iree_utils/metal_utils.py

+    res_metal_flag = []
+    metal_triple_flag = None
+    for arg in extra_args:
+        if "-iree-metal-target-triple=" in arg:


see https://discord.com/channels/689900678990135345/1097586660495065178/1118622069547077653

I think you want --iree-metal-target-platform

Will fix that

…od-ai#1559) -- It also modifies the mega_test.py script Signed-off-by: Abhishek Varma <[email protected]>

…i#1560) * Fix deprecation warning for unet config. * Include PIL metadata instead of hidden imports in SD spec.

powderluv · 2023-06-20T23:59:55Z

apps/stable_diffusion/shark_sd.spec

@@ -19,6 +19,7 @@ datas += copy_metadata('importlib_metadata')
 datas += copy_metadata('torch-mlir')
 datas += copy_metadata('omegaconf')
 datas += copy_metadata('safetensors')
+datas += copy_metadata('Pillow')


this is already in tree ?

I did a git pull before pushing, realized later I should not have done that. So I got 2 commits from Ean and Abhishek

powderluv · 2023-06-21T00:00:20Z

Please update the branch

powderluv · 2023-06-21T02:28:42Z

Please run lint with black

Ranvirsv · 2023-06-21T04:53:12Z

Wanted to let you know, there are also some changes I was trying, to get stable diffusion running. (i.e. adding checks for metal device and metal flags). Let me know if they should be removed from here

powderluv · 2023-06-21T05:06:07Z

shark/iree_utils/metal_utils.py

+
+
+def get_metal_device_name(device_num=0):
+    vulkaninfo_dump, _ = run_cmd("vulkaninfo")


this wont work. I used

(shark.venv) ➜ web git:(main) ✗ sysctl -a | grep brand machdep.cpu.brand_string: Apple M1 Ultra

But I think Lei suggested using --dump_devices

powderluv · 2023-06-21T05:06:43Z

shark/iree_utils/metal_utils.py

+        print(
+            f"Found metal device {metal_device}. Using metal target triple {triple}"
+        )
+        return f"-iree-metal-target-triple={triple}"


shouldn't this be -iree-metal-target-platform=

sorry, missed that one
Will fix it, and the vulkaninfo

powderluv · 2023-06-21T05:07:28Z

ok to have the SD fixups too.

powderluv · 2023-06-21T05:33:38Z

Please uninstall the VulkanSDK and vulkaninfo from your device to test :D

Ranvirsv · 2023-06-21T06:20:53Z

I don't know how I can change this, since it returns --iree-vulkan-target-env, and I don't think there is a --iree-metal-target-env

if metal_triple_flag is not None:
        vulkan_target_env = get_vulkan_target_env_flag(meatal_triple_flag)
        res_metal_flag.append(vulkan_target_env)
    return res_metal_flag

powderluv · 2023-06-21T06:38:05Z

For compile you still use vulkan

Adding metal_utils for iree_utils

959be51

powderluv reviewed Jun 20, 2023

View reviewed changes

shark/iree_utils/metal_utils.py Outdated

@@ -0,0 +1,176 @@

# Copyright 2020 The Nod Team. All rights reserved.

Copy link

Contributor

powderluv Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2023

powderluv reviewed Jun 20, 2023

View reviewed changes

Abhishek-Varma and others added 3 commits June 20, 2023 10:53

Add patch for making compile API work for both MEGABYTE and MiniGPT4 (n…

9efacaa

…od-ai#1559) -- It also modifies the mega_test.py script Signed-off-by: Abhishek Varma <[email protected]>

[SD] Update unet in_channels API and add PIL metadata to spec. (nod-a…

d49b157

…i#1560) * Fix deprecation warning for unet config. * Include PIL metadata instead of hidden imports in SD spec.

Fixing iree-metal-target-platform

948cef5

Ranvirsv requested a review from powderluv June 20, 2023 18:53

adding metal to txt2img pipeline

51f98b9

powderluv reviewed Jun 20, 2023

View reviewed changes

Ranvirsv and others added 3 commits June 20, 2023 17:32

Merge branch 'main' into metal_for_shark

9556e69

Fixing Copyright date

2cf12ea

removing debug prints

89d3c17

Ranvirsv requested a review from powderluv June 21, 2023 00:37

powderluv previously approved these changes Jun 21, 2023

View reviewed changes

black lint formating

6fa8404

Ranvirsv dismissed powderluv’s stale review via 6fa8404 June 21, 2023 04:45

Ranvirsv requested a review from powderluv June 21, 2023 04:46

Merge branch 'main' into metal_for_shark

44abd93

powderluv requested changes Jun 21, 2023

View reviewed changes

fixing device dump

88753b9

Merge branch 'main' into metal_for_shark

126abcd

powderluv approved these changes Jun 22, 2023

View reviewed changes

powderluv merged commit 07c1e1d into nod-ai:main Jun 22, 2023
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding metal_utils for iree_utils #1561

Adding metal_utils for iree_utils #1561

Ranvirsv commented Jun 20, 2023

powderluv Jun 20, 2023

powderluv Jun 20, 2023

powderluv Jun 20, 2023

Ranvirsv Jun 20, 2023

powderluv Jun 20, 2023

Ranvirsv Jun 21, 2023

powderluv commented Jun 21, 2023

powderluv commented Jun 21, 2023

Ranvirsv commented Jun 21, 2023 •

edited

Loading

powderluv Jun 21, 2023

powderluv Jun 21, 2023

Ranvirsv Jun 21, 2023

powderluv commented Jun 21, 2023

powderluv commented Jun 21, 2023

Ranvirsv commented Jun 21, 2023

powderluv commented Jun 21, 2023

		@@ -0,0 +1,176 @@
		# Copyright 2020 The Nod Team. All rights reserved.



		def get_metal_device_name(device_num=0):
		vulkaninfo_dump, _ = run_cmd("vulkaninfo")

Adding metal_utils for iree_utils #1561

Adding metal_utils for iree_utils #1561

Conversation

Ranvirsv commented Jun 20, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

powderluv commented Jun 21, 2023

powderluv commented Jun 21, 2023

Ranvirsv commented Jun 21, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

powderluv commented Jun 21, 2023

powderluv commented Jun 21, 2023

Ranvirsv commented Jun 21, 2023

powderluv commented Jun 21, 2023

Ranvirsv commented Jun 21, 2023 •

edited

Loading