From 8ef1a2119c79de18c0e296088b2f2c1d6b6d36da Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Sat, 4 May 2024 16:18:25 +0200 Subject: [PATCH 1/2] wip: add hyper-sd 8 step cfg lora with negative prompt support --- modules/async_worker.py | 8 ++++++++ modules/config.py | 12 +++++++++++- modules/flags.py | 3 +++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/modules/async_worker.py b/modules/async_worker.py index a549a5a3..b856851d 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -282,6 +282,14 @@ def worker(): adm_scaler_negative = 1.0 adm_scaler_end = 0.0 + elif performance_selection == Performance.HYPER_SD8: + print('Enter Hyper-SD8 mode.') + progressbar(async_task, 1, 'Downloading Hyper-SD components ...') + loras += [(modules.config.downloading_sdxl_hyper_sd_cfg_lora(), 0.3)] + + sampler_name = 'dpmpp_sde_gpu' + scheduler_name = 'normal' + print(f'[Parameters] Adaptive CFG = {adaptive_cfg}') print(f'[Parameters] Sharpness = {sharpness}') print(f'[Parameters] ControlNet Softness = {controlnet_softness}') diff --git a/modules/config.py b/modules/config.py index b61cdec4..0647c3e7 100644 --- a/modules/config.py +++ b/modules/config.py @@ -539,8 +539,9 @@ wildcard_filenames = [] sdxl_lcm_lora = 'sdxl_lcm_lora.safetensors' sdxl_lightning_lora = 'sdxl_lightning_4step_lora.safetensors' +sdxl_hyper_sd_cfg_lora = 'sdxl_hyper_sd_8step_cfg_lora.safetensors' sdxl_hyper_sd_lora = 'sdxl_hyper_sd_4step_lora.safetensors' -loras_metadata_remove = [sdxl_lcm_lora, sdxl_lightning_lora, sdxl_hyper_sd_lora] +loras_metadata_remove = [sdxl_lcm_lora, sdxl_lightning_lora, sdxl_hyper_sd_cfg_lora, sdxl_hyper_sd_lora] def get_model_filenames(folder_paths, extensions=None, name_filter=None): @@ -625,6 +626,15 @@ def downloading_sdxl_hyper_sd_lora(): return sdxl_hyper_sd_lora +def downloading_sdxl_hyper_sd_cfg_lora(): + load_file_from_url( + url='https://huggingface.co/mashb1t/misc/resolve/main/sdxl_hyper_sd_8step_cfg_lora.safetensors', + model_dir=paths_loras[0], + file_name=sdxl_hyper_sd_cfg_lora + ) + return sdxl_hyper_sd_lora + + def downloading_controlnet_canny(): load_file_from_url( url='https://huggingface.co/lllyasviel/misc/resolve/main/control-lora-canny-rank128.safetensors', diff --git a/modules/flags.py b/modules/flags.py index 3dc7a021..e31a0f5a 100644 --- a/modules/flags.py +++ b/modules/flags.py @@ -107,6 +107,7 @@ class Steps(IntEnum): SPEED = 30 EXTREME_SPEED = 8 LIGHTNING = 4 + HYPER_SD8 = 8 HYPER_SD = 4 @@ -115,6 +116,7 @@ class StepsUOV(IntEnum): SPEED = 18 EXTREME_SPEED = 8 LIGHTNING = 4 + HYPER_SD8 = 8 HYPER_SD = 4 @@ -123,6 +125,7 @@ class Performance(Enum): SPEED = 'Speed' EXTREME_SPEED = 'Extreme Speed' LIGHTNING = 'Lightning' + HYPER_SD8 = 'Hyper-SD8' HYPER_SD = 'Hyper-SD' @classmethod From a8a82647a9b064f94377b94dfba085ad02b11e86 Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Sun, 19 May 2024 12:26:59 +0200 Subject: [PATCH 2/2] feat: remove hyper-sd8 performance still waiting for the release of hyper-sd 4step CFG LoRA, not yet satisfied with any of the CFG LoRAs compared to non-cfg ones. see https://huggingface.co/ByteDance/Hyper-SD --- modules/config.py | 12 +----------- modules/flags.py | 3 --- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/modules/config.py b/modules/config.py index 0647c3e7..b61cdec4 100644 --- a/modules/config.py +++ b/modules/config.py @@ -539,9 +539,8 @@ wildcard_filenames = [] sdxl_lcm_lora = 'sdxl_lcm_lora.safetensors' sdxl_lightning_lora = 'sdxl_lightning_4step_lora.safetensors' -sdxl_hyper_sd_cfg_lora = 'sdxl_hyper_sd_8step_cfg_lora.safetensors' sdxl_hyper_sd_lora = 'sdxl_hyper_sd_4step_lora.safetensors' -loras_metadata_remove = [sdxl_lcm_lora, sdxl_lightning_lora, sdxl_hyper_sd_cfg_lora, sdxl_hyper_sd_lora] +loras_metadata_remove = [sdxl_lcm_lora, sdxl_lightning_lora, sdxl_hyper_sd_lora] def get_model_filenames(folder_paths, extensions=None, name_filter=None): @@ -626,15 +625,6 @@ def downloading_sdxl_hyper_sd_lora(): return sdxl_hyper_sd_lora -def downloading_sdxl_hyper_sd_cfg_lora(): - load_file_from_url( - url='https://huggingface.co/mashb1t/misc/resolve/main/sdxl_hyper_sd_8step_cfg_lora.safetensors', - model_dir=paths_loras[0], - file_name=sdxl_hyper_sd_cfg_lora - ) - return sdxl_hyper_sd_lora - - def downloading_controlnet_canny(): load_file_from_url( url='https://huggingface.co/lllyasviel/misc/resolve/main/control-lora-canny-rank128.safetensors', diff --git a/modules/flags.py b/modules/flags.py index e31a0f5a..3dc7a021 100644 --- a/modules/flags.py +++ b/modules/flags.py @@ -107,7 +107,6 @@ class Steps(IntEnum): SPEED = 30 EXTREME_SPEED = 8 LIGHTNING = 4 - HYPER_SD8 = 8 HYPER_SD = 4 @@ -116,7 +115,6 @@ class StepsUOV(IntEnum): SPEED = 18 EXTREME_SPEED = 8 LIGHTNING = 4 - HYPER_SD8 = 8 HYPER_SD = 4 @@ -125,7 +123,6 @@ class Performance(Enum): SPEED = 'Speed' EXTREME_SPEED = 'Extreme Speed' LIGHTNING = 'Lightning' - HYPER_SD8 = 'Hyper-SD8' HYPER_SD = 'Hyper-SD' @classmethod