lllyasviel/stable-diffusion-webui-forge
1
0
Fork 0
mirror of https://github.com/lllyasviel/stable-diffusion-webui-forge.git synced 2026-04-30 11:11:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make SD Models work with Override Settings (#2054)

Browse Source 
* Do refresh load params for modules
* Adjust call order for model mgmt/prompt cache
* new function `manage_model_and_prompt_cache()` to improve code clarity
This commit is contained in:
altoiddealer
2024-10-14 06:47:39 -04:00
committed by GitHub
parent 862c7a589e
commit 77464215c3
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/processing.py
View File

@@ -794,8 +794,7 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments=None, iter
need_global_unload = False need_global_unload = False
def manage_model_and_prompt_cache(p: StableDiffusionProcessing):
def process_images(p: StableDiffusionProcessing) -> Processed:
global need_global_unload global need_global_unload
p.sd_model, just_reloaded = forge_model_reload() p.sd_model, just_reloaded = forge_model_reload()
@@ -808,9 +807,9 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
need_global_unload = False need_global_unload = False
if p.scripts is not None:
p.scripts.before_process(p)
def process_images(p: StableDiffusionProcessing) -> Processed:
"""applies settings overrides (if any) before processing images, then restores settings as applicable."""
stored_opts = {k: opts.data[k] if k in opts.data else opts.get_default(k) for k in p.override_settings.keys() if k in opts.data} stored_opts = {k: opts.data[k] if k in opts.data else opts.get_default(k) for k in p.override_settings.keys() if k in opts.data}
try: try:
@@ -828,7 +827,7 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
mem_k = k[len('forge_'):] # remove 'forge_' prefix mem_k = k[len('forge_'):] # remove 'forge_' prefix
temp_memory_changes[mem_k] = v temp_memory_changes[mem_k] = v
elif k == 'forge_additional_modules': elif k == 'forge_additional_modules':
main_entry.modules_change(v, refresh_params=False) main_entry.modules_change(v)
elif k == 'sd_model_checkpoint': elif k == 'sd_model_checkpoint':
main_entry.checkpoint_change(v) main_entry.checkpoint_change(v)
# set all other options # set all other options
@@ -838,6 +837,12 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
if temp_memory_changes: if temp_memory_changes:
main_entry.refresh_memory_management_settings(**temp_memory_changes) main_entry.refresh_memory_management_settings(**temp_memory_changes)
# load/reload model and manage prompt cache as needed
manage_model_and_prompt_cache(p)
if p.scripts is not None:
p.scripts.before_process(p)
# backwards compatibility, fix sampler and scheduler if invalid # backwards compatibility, fix sampler and scheduler if invalid
sd_samplers.fix_p_invalid_sampler_and_scheduler(p) sd_samplers.fix_p_invalid_sampler_and_scheduler(p)
@@ -849,7 +854,7 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
if p.override_settings_restore_afterwards: if p.override_settings_restore_afterwards:
for k, v in stored_opts.items(): for k, v in stored_opts.items():
if k == 'forge_additional_modules': if k == 'forge_additional_modules':
main_entry.modules_change(v, refresh_params=False) main_entry.modules_change(v)
elif k == 'sd_model_checkpoint': elif k == 'sd_model_checkpoint':
main_entry.checkpoint_change(v) main_entry.checkpoint_change(v)
else: else: