diff options
| author | Jabasukuriputo Wang <wfjsw@users.noreply.github.com> | 2023-07-19 02:33:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-19 02:33:31 +0000 |
| commit | fc3bdf8c1184de1116fe9f30b72905b4b3285e74 (patch) | |
| tree | 64e993c6bce48ddd4fb2d60fd5105bd6c725d52c /modules/shared.py | |
| parent | 3c570421d3a2eb24528b5f5bb615dcb0c7717e4a (diff) | |
| parent | b010eea520caa90d2a31d98ec7c4a9d9d540c9ad (diff) | |
| download | stable-diffusion-webui-gfx803-fc3bdf8c1184de1116fe9f30b72905b4b3285e74.tar.gz stable-diffusion-webui-gfx803-fc3bdf8c1184de1116fe9f30b72905b4b3285e74.tar.bz2 stable-diffusion-webui-gfx803-fc3bdf8c1184de1116fe9f30b72905b4b3285e74.zip | |
Merge branch 'dev' into move-start-timer
Diffstat (limited to 'modules/shared.py')
| -rw-r--r-- | modules/shared.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/shared.py b/modules/shared.py index a256d090..1ce7b49e 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -11,6 +11,7 @@ import gradio as gr import torch
import tqdm
+import launch
import modules.interrogate
import modules.memmon
import modules.styles
@@ -26,7 +27,7 @@ demo = None parser = cmd_args.parser
-script_loading.preload_extensions(extensions_dir, parser)
+script_loading.preload_extensions(extensions_dir, parser, extension_list=launch.list_extensions(launch.args.ui_settings_file))
script_loading.preload_extensions(extensions_builtin_dir, parser)
if os.environ.get('IGNORE_CMD_ARGS_ERRORS', None) is None:
@@ -409,7 +410,7 @@ options_templates.update(options_section(('training', "Training"), { }))
options_templates.update(options_section(('sd', "Stable Diffusion"), {
- "sd_model_checkpoint": OptionInfo("", "Stable Diffusion checkpoint", gr.Dropdown, lambda: {"choices": list_checkpoint_tiles()}, refresh=refresh_checkpoints),
+ "sd_model_checkpoint": OptionInfo(None, "Stable Diffusion checkpoint", gr.Dropdown, lambda: {"choices": list_checkpoint_tiles()}, refresh=refresh_checkpoints),
"sd_checkpoint_cache": OptionInfo(0, "Checkpoints to cache in RAM", gr.Slider, {"minimum": 0, "maximum": 10, "step": 1}),
"sd_vae_checkpoint_cache": OptionInfo(0, "VAE Checkpoints to cache in RAM", gr.Slider, {"minimum": 0, "maximum": 10, "step": 1}),
"sd_vae": OptionInfo("Automatic", "SD VAE", gr.Dropdown, lambda: {"choices": shared_items.sd_vae_items()}, refresh=shared_items.refresh_vae_list).info("choose VAE model: Automatic = use one with same filename as checkpoint; None = use VAE from checkpoint"),
|