Fixing Shark Exe

apps/stable_diffusion/shark_sd.spec

@@ -42,7 +42,12 @@ datas += [
          ( 'web/ui/logos/*', 'logos' )
          ]
 
+torch_path = sys.prefix + '/lib/python3.11/site-packages/torch/lib/libtorch_python.dylib'
+
 binaries = []
+binaries += [
+    (torch_path, 'resources')
+    ]
 
 block_cipher = None
 

shark/iree_utils/metal_utils.py

@@ -17,7 +17,7 @@
 from shark.iree_utils._common import run_cmd
 import iree.runtime as ireert
 from sys import platform
-from shark.iree_utils.vulkan_target_env_utils import get_vulkan_target_env_flag
+from shark.iree_utils.vulkan_target_env_utils import get_vulkan_target_env
 
 
 def get_metal_device_name(device_num=0):
@@ -58,14 +58,7 @@ def get_metal_target_triple(device_name):
         str or None: target triple or None if no match found for given name
     """
     # Apple Targets
-    if all(x in device_name for x in ("Apple", "M1")):
-        triple = "m1-moltenvk-macos"
-    elif all(x in device_name for x in ("Apple", "M2")):
-        triple = "m1-moltenvk-macos"
-
-    else:
-        triple = None
-    return triple
+    return "macos"
 
 
 def get_metal_triple_flag(device_name="", device_num=0, extra_args=[]):
@@ -110,10 +103,14 @@ def get_iree_metal_args(device_num=0, extra_args=[]):
         )
 
     if metal_triple_flag is not None:
-        vulkan_target_env = get_vulkan_target_env_flag(metal_triple_flag)
+        vulkan_target_env = get_metal_target_env_flag("=m1-moltenvk-macos")
         res_metal_flag.append(vulkan_target_env)
     return res_metal_flag
 
+def get_metal_target_env_flag(metal_target_triple):
+    target_env = get_vulkan_target_env(metal_target_triple)
+    target_env_flag = f"--iree-metal-target-env={target_env}"
+    return target_env_flag
 
 def set_iree_metal_runtime_flags(flags):
     for flag in flags:

shark/shark_downloader.py

@@ -157,7 +157,8 @@ def get_git_revision_short_hash() -> str:
     else:
         import json
 
-        dir_path = os.path.dirname(os.path.realpath(__file__))
+        dir_path = os.path.dirname(os.path.abspath(__file__))
+        print(f"\n\nIn get_git_revision_short_hash: {dir_path}\n\n")
         src = os.path.join(dir_path, "..", "tank_version.json")
         with open(src, "r") as f:
             data = json.loads(f.read())
@@ -221,6 +222,7 @@ def download_model(
     else:
         model_dir_name = model_name + "_" + frontend
     model_dir = os.path.join(WORKDIR, model_dir_name)
+    print(f"\n\nDownlaod_model, dir_name: {model_dir}\n\n")
 
     if not tank_url:
         tank_url = "gs://shark_tank/" + shark_args.shark_prefix