Merge pull request #17 from EyeDeck/master

The same PR I made last time
This commit is contained in:
hlky 2022-08-25 10:53:31 +01:00 committed by GitHub
commit 0e53541a4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -456,9 +456,7 @@ def process_images(outpath, func_init, func_sample, prompt, seed, sampler_name,
prompts = all_prompts[n * batch_size:(n + 1) * batch_size]
seeds = all_seeds[n * batch_size:(n + 1) * batch_size]
uc = None
if cfg_scale != 1.0:
uc = model.get_learned_conditioning(len(prompts) * [""])
uc = model.get_learned_conditioning(len(prompts) * [""])
if isinstance(prompts, tuple):
prompts = list(prompts)
@ -558,9 +556,8 @@ def txt2img(prompt: str, ddim_steps: int, sampler_name: str, toggles: list, ddim
err = False
seed = seed_to_int(seed)
# print('toggles:', toggles)
prompt_matrix = 0 in toggles
normalize_prompt_weights = toggles[1]
normalize_prompt_weights = 1 in toggles
skip_save = 2 not in toggles
skip_grid = 3 not in toggles
use_GFPGAN = 4 in toggles
@ -718,7 +715,7 @@ def img2img(prompt: str, init_info, mask_mode, ddim_steps: int, sampler_name: st
seed = seed_to_int(seed)
prompt_matrix = 0 in toggles
normalize_prompt_weights = toggles[1]
normalize_prompt_weights = 1 in toggles
loopback = 2 in toggles
skip_save = 3 not in toggles
skip_grid = 4 not in toggles