Merge branch 'main' into monorimet-patch-2

Include PIL metadata instead of hidden imports in SD spec.
Fix deprecation warning for unet config.
2026-01-11 23:08:19 -05:00 · 2023-06-20 12:16:16 -05:00 · 2023-06-20 12:10:24 -05:00 · 2023-06-20 10:40:36 -05:00
2 changed files with 2 additions and 2 deletions
--- a/apps/stable_diffusion/shark_sd.spec
+++ b/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')
 datas += collect_data_files('diffusers')
 datas += collect_data_files('transformers')
 datas += collect_data_files('pytorch_lightning')
@@ -48,7 +49,6 @@ block_cipher = None
 hiddenimports = ['shark', 'shark.shark_inference', 'apps']
 hiddenimports += [x for x in collect_submodules("skimage") if "tests" not in x]
 hiddenimports += [x for x in collect_submodules("iree") if "tests" not in x]
-hiddenimports += [x for x in collect_submodules("PIL") if "tests" not in x]

 a = Analysis(
    ['web/index.py'],
--- a/apps/stable_diffusion/src/models/model_wrappers.py
+++ b/apps/stable_diffusion/src/models/model_wrappers.py
@@ -426,7 +426,7 @@ class SharkifyStableDiffusionModel:
                )
                if use_lora != "":
                    update_lora_weight(self.unet, use_lora, "unet")
-                self.in_channels = self.unet.in_channels
+                self.in_channels = self.unet.config.in_channels
                self.train(False)
                if(args.attention_slicing is not None and args.attention_slicing != "none"):
                    if(args.attention_slicing.isdigit()):
Author	SHA1	Message	Date
Ean Garvey	92320d0b3d	Merge branch 'main' into monorimet-patch-2	2023-06-20 12:16:16 -05:00
Ean Garvey	4a1780a080	Include PIL metadata instead of hidden imports in SD spec.	2023-06-20 12:10:24 -05:00
Ean Garvey	458e52d230	Fix deprecation warning for unet config.	2023-06-20 10:40:36 -05:00