Fix the .exe (#2101)

apps/shark_studio/api/sd.py

@@ -121,8 +121,8 @@ class StableDiffusion(SharkPipelineBase):
                 # "num_loras": num_loras,
                 "height": height,
                 "width": width,
-                # "precision": precision,
-                # "max_length": self.model_max_length,
+                "precision": precision,
+                "max_length": self.model_max_length,
             },
             "vae_encode": {
                 "hf_model_name": base_model_id,

apps/shark_studio/studio_imports.py

@@ -29,27 +29,23 @@ datas += copy_metadata("sentencepiece")
 datas += copy_metadata("pyyaml")
 datas += copy_metadata("huggingface-hub")
 datas += copy_metadata("gradio")
+datas += copy_metadata("scipy")
 datas += collect_data_files("torch")
 datas += collect_data_files("tokenizers")
-datas += collect_data_files("tiktoken")
 datas += collect_data_files("accelerate")
 datas += collect_data_files("diffusers")
 datas += collect_data_files("transformers")
-datas += collect_data_files("pytorch_lightning")
-datas += collect_data_files("skimage")
 datas += collect_data_files("gradio")
 datas += collect_data_files("gradio_client")
-datas += collect_data_files("iree")
+datas += collect_data_files("iree", include_py_files=True)
 datas += collect_data_files("shark", include_py_files=True)
-datas += collect_data_files("timm", include_py_files=True)
 datas += collect_data_files("tqdm")
 datas += collect_data_files("tkinter")
-datas += collect_data_files("webview")
 datas += collect_data_files("sentencepiece")
 datas += collect_data_files("jsonschema")
 datas += collect_data_files("jsonschema_specifications")
 datas += collect_data_files("cpuinfo")
-datas += collect_data_files("cv2")
+datas += collect_data_files("scipy", include_py_files=True)
 datas += [
     ("web/ui/css/*", "ui/css"),
     ("web/ui/js/*", "ui/js"),
@@ -59,7 +55,6 @@ datas += [
 
 # hidden imports for pyinstaller
 hiddenimports = ["shark", "apps"]
-#hiddenimports += [x for x in collect_submodules("skimage") if "tests" not in x]
 hiddenimports += [x for x in collect_submodules("gradio") if "tests" not in x]
 hiddenimports += [
     x for x in collect_submodules("diffusers") if "tests" not in x
@@ -71,4 +66,5 @@ hiddenimports += [
     if not any(kw in x for kw in blacklist)
 ]
 hiddenimports += [x for x in collect_submodules("iree") if "tests" not in x]
-hiddenimports += ["iree._runtime"]
+hiddenimports += ["iree._runtime"]
+hiddenimports += collect_submodules('scipy')

apps/shark_studio/web/configs/default_sd_config.json

@@ -25,4 +25,4 @@
   "resample_type": "Nearest Neighbor",
   "controlnets": {},
   "embeddings": {}
-}
+}

apps/shark_studio/web/index.py

@@ -1,4 +1,5 @@
 from multiprocessing import Process, freeze_support
+freeze_support()
 from PIL import Image
 
 import os

apps/shark_studio/web/ui/sd.py

@@ -14,6 +14,7 @@ from apps.shark_studio.web.utils.file_utils import (
     get_checkpoints_path,
     get_checkpoints,
     get_configs_path,
+    write_default_sd_config,
 )
 from apps.shark_studio.api.sd import (
     sd_model_map,
@@ -631,14 +632,15 @@ with gr.Blocks(title="Stable Diffusion") as sd_element:
                     with gr.Tab(label="Config", id=102) as sd_tab_config:
                         with gr.Column(elem_classes=["sd-right-panel"]):
                             with gr.Row(elem_classes=["fill"]):
+                                Path(get_configs_path()).mkdir(parents=True, exist_ok=True)
+                                default_config_file = os.path.join(
+                                    get_configs_path(),
+                                    "default_sd_config.json",
+                                )
+                                write_default_sd_config(default_config_file)
                                 sd_json = gr.JSON(
                                     elem_classes=["fill"],
-                                    value=view_json_file(
-                                        os.path.join(
-                                            get_configs_path(),
-                                            "default_sd_config.json",
-                                        )
-                                    ),
+                                    value=view_json_file(default_config_file),
                                 )
                             with gr.Row():
                                 with gr.Column(scale=3):

apps/shark_studio/web/utils/file_utils.py

@@ -11,6 +11,38 @@ checkpoints_filetypes = (
     "*.safetensors",
 )
 
+default_sd_config = r"""{
+  "prompt": [
+    "a photo taken of the front of a super-car drifting on a road near mountains at high speeds with smoke coming off the tires, front angle, front point of view, trees in the mountains of the background, ((sharp focus))"
+  ],
+  "negative_prompt": [
+    "watermark, signature, logo, text, lowres, ((monochrome, grayscale)), blurry, ugly, blur, oversaturated, cropped"
+  ],
+  "sd_init_image": [null],
+  "height": 512,
+  "width": 512,
+  "steps": 50,
+  "strength": 0.8,
+  "guidance_scale": 7.5,
+  "seed": "-1",
+  "batch_count": 1,
+  "batch_size": 1,
+  "scheduler": "EulerDiscrete",
+  "base_model_id": "stabilityai/stable-diffusion-2-1-base",
+  "custom_weights": null,
+  "custom_vae": null,
+  "precision": "fp16",
+  "device": "AMD Radeon RX 7900 XTX => vulkan://0",
+  "ondemand": false,
+  "repeatable_seeds": false,
+  "resample_type": "Nearest Neighbor",
+  "controlnets": {},
+  "embeddings": {}
+}"""
+
+def write_default_sd_config(path):
+    with open(path, "w") as f:
+        f.write(default_sd_config)
 
 def safe_name(name):
     return name.replace("/", "_").replace("-", "_")