diff options
| author | AUTOMATIC <16777216c@gmail.com> | 2022-09-17 12:39:30 +0000 |
|---|---|---|
| committer | AUTOMATIC <16777216c@gmail.com> | 2022-09-17 12:39:30 +0000 |
| commit | 77dcb21688a121e4b9f93cd614546daad90f5a6c (patch) | |
| tree | 272dd43fc3c71e7281d1879035caab60331a709f /modules/processing.py | |
| parent | 2f18823e69ec1dd7622f652561e197a576dc3b80 (diff) | |
| parent | d94b41472e0e799ab0059fd711f52f1fba954be6 (diff) | |
| download | stable-diffusion-webui-gfx803-77dcb21688a121e4b9f93cd614546daad90f5a6c.tar.gz stable-diffusion-webui-gfx803-77dcb21688a121e4b9f93cd614546daad90f5a6c.tar.bz2 stable-diffusion-webui-gfx803-77dcb21688a121e4b9f93cd614546daad90f5a6c.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'modules/processing.py')
| -rw-r--r-- | modules/processing.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/modules/processing.py b/modules/processing.py index 3a4ff224..6a99d383 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -188,7 +188,11 @@ def fix_seed(p): def process_images(p: StableDiffusionProcessing) -> Processed:
"""this is the main loop that both txt2img and img2img use; it calls func_init once inside all the scopes and func_sample once per batch"""
- assert p.prompt is not None
+ if type(p.prompt) == list:
+ assert(len(p.prompt) > 0)
+ else:
+ assert p.prompt is not None
+
devices.torch_gc()
fix_seed(p)
@@ -265,6 +269,9 @@ def process_images(p: StableDiffusionProcessing) -> Processed: seeds = all_seeds[n * p.batch_size:(n + 1) * p.batch_size]
subseeds = all_subseeds[n * p.batch_size:(n + 1) * p.batch_size]
+ if (len(prompts) == 0):
+ break
+
#uc = p.sd_model.get_learned_conditioning(len(prompts) * [p.negative_prompt])
#c = p.sd_model.get_learned_conditioning(prompts)
uc = prompt_parser.get_learned_conditioning(len(prompts) * [p.negative_prompt], p.steps)
|