Merge pull request #177 from rupeshs/add-hyper-sd-1-step-support

Add Hyper-SD 1 step support

Author: rupeshs

Readme.md

@@ -1,3 +1,4 @@
 latent-consistency/lcm-lora-sdv1-5
 latent-consistency/lcm-lora-sdxl
-latent-consistency/lcm-lora-ssd-1b
+latent-consistency/lcm-lora-ssd-1b
+rupeshs/hypersd-sd1-5-1-step-lora

configs/lcm-lora-models.txt

@@ -1,5 +1,6 @@
 stabilityai/sd-turbo
 rupeshs/sdxs-512-0.9-orig-vae
+rupeshs/hyper-sd-sdxl-1-step
 rupeshs/SDXL-Lightning-2steps
 stabilityai/sdxl-turbo
 SimianLuo/LCM_Dreamshaper_v7

configs/lcm-models.txt

@@ -1,6 +1,7 @@
 rupeshs/sd-turbo-openvino
 rupeshs/sdxs-512-0.9-openvino
+rupeshs/hyper-sd-sdxl-1-step-openvino-int8
 rupeshs/SDXL-Lightning-2steps-openvino-int8
 rupeshs/sdxl-turbo-openvino-int8
 rupeshs/LCM-dreamshaper-v7-openvino
-Disty0/LCM_SoteMix
+Disty0/LCM_SoteMix

configs/openvino-lcm-models.txt

@@ -24,7 +24,7 @@ BASEDIR=$(pwd)
 $PYTHON_COMMAND -m venv "$BASEDIR/env"
 # shellcheck disable=SC1091
 source "$BASEDIR/env/bin/activate"
-pip install torch==2.2.1 
+pip install torch==2.2.2
 pip install -r "$BASEDIR/requirements.txt"
 chmod +x "start.sh"
 chmod +x "start-webui.sh"

docs/images/fastsdcpu-webui.png

@@ -23,7 +23,7 @@ for /f "tokens=2" %%I in ('%PYTHON_COMMAND% --version 2^>^&1') do (
 echo Python version: %python_version%
 
 %PYTHON_COMMAND% -m venv "%~dp0env" 
-call "%~dp0env\Scripts\activate.bat" && pip install torch==2.2.1 --index-url https://download.pytorch.org/whl/cpu 
+call "%~dp0env\Scripts\activate.bat" && pip install torch==2.2.2 --index-url https://download.pytorch.org/whl/cpu 
 call "%~dp0env\Scripts\activate.bat" && pip install -r "%~dp0requirements.txt"
 echo FastSD CPU env installation completed.
 pause

install-mac.sh

@@ -24,7 +24,7 @@ BASEDIR=$(pwd)
 $PYTHON_COMMAND -m venv "$BASEDIR/env"
 # shellcheck disable=SC1091
 source "$BASEDIR/env/bin/activate"
-pip install torch==2.2.1 --index-url https://download.pytorch.org/whl/cpu
+pip install torch==2.2.2 --index-url https://download.pytorch.org/whl/cpu
 if [[ "$1" == "--disable-gui" ]]; then
     #! For termux , we don't need Qt based GUI
     packages="$(grep -v "^ *#\|^PyQt5" requirements.txt | grep .)" 
@@ -33,6 +33,7 @@ if [[ "$1" == "--disable-gui" ]]; then
 else
     pip install -r "$BASEDIR/requirements.txt"
 fi
+
 chmod +x "start.sh"
 chmod +x "start-webui.sh"
 read -n1 -r -p "FastSD CPU installation completed,press any key to continue..." key

install.bat

@@ -1,17 +1,16 @@
-accelerate==0.23.0
-diffusers==0.23.0
-transformers==4.35.0
+accelerate==0.29.3
+diffusers==0.27.2
+transformers==4.39.3
 PyQt5
 Pillow==9.4.0
-openvino==2023.2.0
-optimum==1.14.0
-optimum-intel==1.12.1
-onnx==1.15.0
-onnxruntime==1.16.1
+openvino==2024.0.0
+optimum-intel==1.16.0
+onnx==1.16.0
+onnxruntime==1.17.3
 pydantic==2.4.2
 typing-extensions==4.8.0
 pyyaml==6.0.1
-gradio==3.39.0
+gradio==4.21.0
 peft==0.6.1
 opencv-python==4.8.1.78
 omegaconf==2.3.0

install.sh

@@ -15,8 +15,8 @@
 def load_controlnet_adapters(lcm_diffusion_setting) -> dict:
     controlnet_args = {}
     if (
-        lcm_diffusion_setting.controlnet == None
-        or lcm_diffusion_setting.controlnet.enabled == False
+        lcm_diffusion_setting.controlnet is None
+        or not lcm_diffusion_setting.controlnet.enabled
     ):
         return controlnet_args
 
@@ -39,8 +39,8 @@ def load_controlnet_adapters(lcm_diffusion_setting) -> dict:
 def update_controlnet_arguments(lcm_diffusion_setting) -> dict:
     controlnet_args = {}
     if (
-        lcm_diffusion_setting.controlnet == None
-        or lcm_diffusion_setting.controlnet.enabled == False
+        lcm_diffusion_setting.controlnet is None
+        or not lcm_diffusion_setting.controlnet.enabled
     ):
         return controlnet_args
 
@@ -61,12 +61,12 @@ def controlnet_settings_from_dict(
     lcm_diffusion_setting,
     dictionary,
 ) -> None:
-    if lcm_diffusion_setting == None or dictionary == None:
+    if lcm_diffusion_setting is None or dictionary is None:
         logging.error("Invalid arguments!")
         return
     if (
-        not "controlnet" in dictionary
-        or dictionary["controlnet"] == None
+        "controlnet" not in dictionary
+        or dictionary["controlnet"] is None
         or len(dictionary["controlnet"]) == 0
     ):
         logging.warning("ControlNet settings not found, ControlNet will be disabled")
@@ -82,9 +82,9 @@ def controlnet_settings_from_dict(
     if controlnet.enabled:
         try:
             controlnet._control_image = Image.open(image_path)
-        except (AttributeError, FileNotFoundError) as e:
-            pass
-        if controlnet._control_image == None:
+        except (AttributeError, FileNotFoundError) as err:
+            print(err)
+        if controlnet._control_image is None:
             logging.error("Wrong ControlNet control image! Disabling ControlNet")
             controlnet.enabled = False
     lcm_diffusion_setting.controlnet = controlnet

requirements.txt

@@ -254,6 +254,11 @@ def init(
                 adapters = self.pipeline.get_active_adapters()
                 print(f"Active adapters : {adapters}")
 
+    def _get_timesteps(self):
+        time_steps = self.pipeline.scheduler.config.get("timesteps")
+        time_steps_value = [int(time_steps)] if time_steps else None
+        return time_steps_value
+
     def generate(
         self,
         lcm_diffusion_setting: LCMDiffusionSetting,
@@ -355,8 +360,10 @@ def generate(
                     width=lcm_diffusion_setting.image_width,
                     height=lcm_diffusion_setting.image_height,
                     num_images_per_prompt=lcm_diffusion_setting.number_of_images,
+                    timesteps=self._get_timesteps(),
                     **controlnet_args,
                 ).images
+
             elif (
                 lcm_diffusion_setting.diffusion_task
                 == DiffusionTask.image_to_image.value

src/backend/controlnet.py

@@ -1,6 +1,7 @@
 import glob
 from os import path
-from paths import get_file_name
+from paths import get_file_name, FastStableDiffusionPaths
+from pathlib import Path
 
 
 # A basic class to keep track of the currently loaded LoRAs and
@@ -62,7 +63,8 @@ def load_lora_weight(
     if lcm_diffusion_setting.lora.enabled:
         print(f"LoRA adapter name : {current_lora.adapter_name}")
         pipeline.load_lora_weights(
-            current_lora.path,
+            FastStableDiffusionPaths.get_lora_models_path(),
+            weight_name=Path(lcm_diffusion_setting.lora.path).name,
             local_files_only=True,
             adapter_name=current_lora.adapter_name,
         )

src/backend/lcm_text_to_image.py

@@ -39,7 +39,7 @@ def get_lcm_lora_pipeline(
         lcm_lora_id,
     )
 
-    if "lcm" in lcm_lora_id.lower():
+    if "lcm" in lcm_lora_id.lower() or "hypersd" in lcm_lora_id.lower():
         print("LCM LoRA model detected so using recommended LCMScheduler")
         pipeline.scheduler = LCMScheduler.from_config(pipeline.scheduler.config)
 

src/backend/lora.py

@@ -1,6 +1,6 @@
 from os import environ
 
-APP_VERSION = "v1.0.0 beta 29"
+APP_VERSION = "v1.0.0 beta 30"
 LCM_DEFAULT_MODEL = "stabilityai/sd-turbo"
 LCM_DEFAULT_MODEL_OPENVINO = "rupeshs/sd-turbo-openvino"
 APP_NAME = "FastSD CPU"

src/backend/pipelines/lcm_lora.py

@@ -19,20 +19,23 @@ def on_user_input(
     control_image: Image,
     preprocessor: str,
 ):
+    if not isinstance(adapter_name, str):
+        gr.Warning("Please select a valid ControlNet model")
+        return gr.Checkbox(value=False)
 
     settings = app_settings.settings.lcm_diffusion_setting
     if settings.controlnet is None:
         settings.controlnet = ControlNetSetting()
 
     if enable and (adapter_name is None or adapter_name == ""):
         gr.Warning("Please select a valid ControlNet adapter")
-        return gr.Checkbox.update(value=False)
+        return gr.Checkbox(value=False)
     elif enable and not control_image:
         gr.Warning("Please provide a ControlNet control image")
-        return gr.Checkbox.update(value=False)
+        return gr.Checkbox(value=False)
 
     if control_image is None:
-        return gr.Checkbox.update(value=enable)
+        return gr.Checkbox(value=enable)
 
     if preprocessor == "None":
         processed_control_image = control_image
@@ -62,7 +65,7 @@ def on_user_input(
         settings.rebuild_pipeline = True
         _controlnet_enabled = settings.controlnet.enabled
         _adapter_path = settings.controlnet.adapter_path
-    return gr.Checkbox.update(value=enable)
+    return gr.Checkbox(value=enable)
 
 
 def on_change_conditioning_scale(cond_scale):
@@ -84,6 +87,10 @@ def get_controlnet_ui() -> None:
                     _controlnet_models_map = get_lora_models(
                         app_settings.settings.lcm_diffusion_setting.dirs["controlnet"]
                     )
+                    controlnet_models = list(_controlnet_models_map.keys())
+                    default_model = (
+                        controlnet_models[0] if len(controlnet_models) else None
+                    )
 
                     enabled_checkbox = gr.Checkbox(
                         label="Enable ControlNet",
@@ -94,7 +101,7 @@ def get_controlnet_ui() -> None:
                         _controlnet_models_map.keys(),
                         label="ControlNet model",
                         info="ControlNet model to load (.safetensors format)",
-                        # value=valid_model,
+                        value=default_model,
                         interactive=True,
                     )
                     conditioning_scale_slider = gr.Slider(