diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-02-19 06:15:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-19 06:15:45 +0000 |
| commit | 6911deb2423755000ccbc2283da738512b3eec27 (patch) | |
| tree | 2ff5ea289b09e6eec6639bcab399a5aa07a77de0 /modules | |
| parent | b20737815a55cd90cfab2a1a3d60d682a67b127a (diff) | |
| parent | 75e03785fe1fb47c3b288105e2638ef06d81aef2 (diff) | |
| download | stable-diffusion-webui-gfx803-6911deb2423755000ccbc2283da738512b3eec27.tar.gz stable-diffusion-webui-gfx803-6911deb2423755000ccbc2283da738512b3eec27.tar.bz2 stable-diffusion-webui-gfx803-6911deb2423755000ccbc2283da738512b3eec27.zip | |
Merge branch 'master' into fix-save-params-2
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/processing.py | 8 | ||||
| -rw-r--r-- | modules/sd_models.py | 2 | ||||
| -rw-r--r-- | modules/ui.py | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/modules/processing.py b/modules/processing.py index 73894822..269a1a9f 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -543,8 +543,6 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed: if os.path.exists(cmd_opts.embeddings_dir) and not p.do_not_reload_embeddings:
model_hijack.embedding_db.load_textual_inversion_embeddings()
- _, extra_network_data = extra_networks.parse_prompts(p.all_prompts[0:1])
-
if p.scripts is not None:
p.scripts.process(p)
@@ -605,7 +603,11 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed: if len(prompts) == 0:
break
- prompts, _ = extra_networks.parse_prompts(prompts)
+ prompts, extra_network_data = extra_networks.parse_prompts(prompts)
+
+ if not p.disable_extra_networks:
+ with devices.autocast():
+ extra_networks.activate(p, extra_network_data)
if p.scripts is not None:
p.scripts.process_batch(p, batch_number=n, prompts=prompts, seeds=seeds, subseeds=subseeds)
diff --git a/modules/sd_models.py b/modules/sd_models.py index d847d358..127e9663 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -105,7 +105,7 @@ def checkpoint_tiles(): def list_models():
checkpoints_list.clear()
checkpoint_alisases.clear()
- model_list = modelloader.load_models(model_path=model_path, command_path=shared.cmd_opts.ckpt_dir, ext_filter=[".ckpt", ".safetensors"], ext_blacklist=[".vae.safetensors"])
+ model_list = modelloader.load_models(model_path=model_path, model_url="https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.safetensors", command_path=shared.cmd_opts.ckpt_dir, ext_filter=[".ckpt", ".safetensors"], download_name="v1-5-pruned-emaonly.safetensors", ext_blacklist=[".vae.ckpt", ".vae.safetensors"])
cmd_ckpt = shared.cmd_opts.ckpt
if os.path.exists(cmd_ckpt):
diff --git a/modules/ui.py b/modules/ui.py index f5df1ffe..54efb6a4 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -1782,7 +1782,7 @@ def versions_html(): return f"""
python: <span title="{sys.version}">{python_version}</span>
•
-torch: {torch.__version__}
+torch: {getattr(torch, '__long_version__',torch.__version__)}
•
xformers: {xformers_version}
•
|