Merge branch 'dev' into dev

1 files changed, 6 insertions, 3 deletions

diff --git a/modules/shared.py b/modules/shared.py
index 6162938a..cec030f7 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:

@@ -384,7 +385,8 @@ options_templates.update(options_section(('face-restoration', "Face restoration"
 }))

 

 options_templates.update(options_section(('system', "System"), {

-    "show_warnings": OptionInfo(False, "Show warnings in console."),

+    "show_warnings": OptionInfo(False, "Show warnings in console.").needs_restart(),

+    "show_gradio_deprecation_warnings": OptionInfo(True, "Show gradio deprecation warnings in console.").needs_restart(),

     "memmon_poll_rate": OptionInfo(8, "VRAM usage polls per second during generation.", gr.Slider, {"minimum": 0, "maximum": 40, "step": 1}).info("0 = disable"),

     "samples_log_stdout": OptionInfo(False, "Always print all generation info to standard output"),

     "multiple_tqdm": OptionInfo(True, "Add a second progress bar to the console that shows progress for an entire job."),

@@ -426,7 +428,8 @@ options_templates.update(options_section(('sd', "Stable Diffusion"), {
     "comma_padding_backtrack": OptionInfo(20, "Prompt word wrap length limit", gr.Slider, {"minimum": 0, "maximum": 74, "step": 1}).info("in tokens - for texts shorter than specified, if they don't fit into 75 token limit, move them to the next 75 token chunk"),

     "CLIP_stop_at_last_layers": OptionInfo(1, "Clip skip", gr.Slider, {"minimum": 1, "maximum": 12, "step": 1}).link("wiki", "https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Features#clip-skip").info("ignore last layers of CLIP network; 1 ignores none, 2 ignores one layer"),

     "upcast_attn": OptionInfo(False, "Upcast cross attention layer to float32"),

-    "randn_source": OptionInfo("GPU", "Random number generator source.", gr.Radio, {"choices": ["GPU", "CPU"]}).info("changes seeds drastically; use CPU to produce the same picture across different videocard vendors"),

+    "auto_vae_precision": OptionInfo(True, "Automaticlly revert VAE to 32-bit floats").info("triggers when a tensor with NaNs is produced in VAE; disabling the option in this case will result in a black square image"),

+    "randn_source": OptionInfo("GPU", "Random number generator source.", gr.Radio, {"choices": ["GPU", "CPU", "NV"]}).info("changes seeds drastically; use CPU to produce the same picture across different videocard vendors; use NV to produce same picture as on NVidia videocards"),

 }))

 

 options_templates.update(options_section(('sdxl', "Stable Diffusion XL"), {