lllyasviel/stable-diffusion-webui-forge
1
0
Fork 0
mirror of https://github.com/lllyasviel/stable-diffusion-webui-forge.git synced 2026-02-06 16:09:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

properly load/save 'Use same choices' infotext (#2147)

Browse Source 
* save 'Use same choices' to infotext, and load
* reload models as needed for batch iterations
This commit is contained in:
DenOfEquity
2024-10-22 16:34:40 +01:00
committed by GitHub
parent 518e3cdbd5
commit 0c97a5347a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/infotext_utils.py
View File

@@ -456,6 +456,12 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
if sorted(modules) != sorted(basename_modules):
res['VAE/TE'] = modules
# if 'Use same choices' was the selection for Hires VAE / Text Encoder, it will be the only option written
# but will not have matched the known modules, so will not be in hr_modules
if 'Hires Module 1' in res:
if res['Hires Module 1'] == 'Use same choices':
hr_modules = ['Use same choices']
res['Hires VAE/TE'] = hr_modules
return res

6
modules/processing.py
View File

@@ -928,7 +928,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
if state.interrupted or state.stopping_generation:
break
sd_models.reload_model_weights() # model can be changed for example by refiner
sd_models.forge_model_reload() # model can be changed for example by refiner, hiresfix fix
p.sd_model.forge_objects = p.sd_model.forge_objects_original.shallow_copy()
p.prompts = p.all_prompts[n * p.batch_size:(n + 1) * p.batch_size]
@@ -1282,7 +1282,9 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
self.extra_generation_params["Hires checkpoint"] = self.hr_checkpoint_info.short_title
if isinstance(self.hr_additional_modules, list) and len(self.hr_additional_modules) > 0:
if 'Use same choices' not in self.hr_additional_modules:
if 'Use same choices' in self.hr_additional_modules:
self.extra_generation_params['Hires Module 1'] = 'Use same choices'
else:
for i, m in enumerate(self.hr_additional_modules):
self.extra_generation_params[f'Hires Module {i+1}'] = os.path.splitext(os.path.basename(m))[0]