diff --git a/extensions-builtin/multidiffusion-upscaler-for-automatic1111 b/extensions-builtin/multidiffusion-upscaler-for-automatic1111 index dc3f50311..0c3ae90d2 160000 --- a/extensions-builtin/multidiffusion-upscaler-for-automatic1111 +++ b/extensions-builtin/multidiffusion-upscaler-for-automatic1111 @@ -1 +1 @@ -Subproject commit dc3f503111024bdb6c5d64d67c487f22d9ccede5 +Subproject commit 0c3ae90d2b15ae7f12916b07f7da7c2088059b80 diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index cae889476..06515a669 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit cae889476799e92dc3c44f73f62a0207f09ad85f +Subproject commit 06515a669d4e95fd39a6fc68df1021ec50643002 diff --git a/modules/cmd_args.py b/modules/cmd_args.py index 61219a2b1..6a395dcdb 100644 --- a/modules/cmd_args.py +++ b/modules/cmd_args.py @@ -108,6 +108,7 @@ def compatibility_args(opts, args): opts.print_hypernet_extra = False opts.dimensions_and_batch_together = True opts.enable_pnginfo = True + opts.data['clip_skip'] = 1 args = parser.parse_args() return args diff --git a/modules/images.py b/modules/images.py index c817a22de..a53a7b4de 100644 --- a/modules/images.py +++ b/modules/images.py @@ -513,7 +513,6 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='jpg', i txt_fullfn (`str` or None): If a text file is saved for this image, this will be its full path. Otherwise None. """ - namegen = FilenameGenerator(p, seed, prompt, image) if image is None: shared.log.warning('Image is none') return None, None @@ -521,9 +520,10 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='jpg', i return None, None if path is None: # set default path to avoid errors when functions are triggered manually or via api and param is not set path = shared.opts.outdir_save + namegen = FilenameGenerator(p, seed, prompt, image) if save_to_dirs is None: save_to_dirs = (grid and shared.opts.grid_save_to_dirs) or (not grid and shared.opts.save_to_dirs and not no_prompt) - if save_to_dirs: + else: dirname = namegen.apply(shared.opts.directories_filename_pattern or "[prompt_words]").lstrip(' ').rstrip('\\ /') path = os.path.join(path, dirname) os.makedirs(path, exist_ok=True) diff --git a/modules/prompt_parser.py b/modules/prompt_parser.py index c0d4d3d91..0604e2837 100644 --- a/modules/prompt_parser.py +++ b/modules/prompt_parser.py @@ -161,7 +161,7 @@ def get_learned_conditioning(model, prompts, steps): prompt_schedules = get_learned_conditioning_prompt_schedules(prompts, steps) cache = {} for prompt, prompt_schedule in zip(prompts, prompt_schedules): - log.debug(f'Prompt schedule: {prompt_schedule}') + # log.debug(f'Prompt schedule: {prompt_schedule}') cached = cache.get(prompt, None) if cached is not None: res.append(cached) diff --git a/webui.py b/webui.py index f87cf3f7c..ccbac7b6f 100644 --- a/webui.py +++ b/webui.py @@ -111,20 +111,20 @@ def initialize(): startup_timer.record("upscalers") shared.opts.onchange("sd_vae", wrap_queued_call(lambda: modules.sd_vae.reload_vae_weights()), call=False) - # shared.opts.onchange("sd_vae_as_default", wrap_queued_call(lambda: modules.sd_vae.reload_vae_weights()), call=False) shared.opts.onchange("temp_dir", ui_tempdir.on_tmpdir_changed) shared.opts.onchange("gradio_theme", shared.reload_gradio_theme) - startup_timer.record("opts onchange") + startup_timer.record("onchange") modules.textual_inversion.textual_inversion.list_textual_inversion_templates() shared.reload_hypernetworks() + ui_extra_networks.intialize() ui_extra_networks.register_page(ui_extra_networks_hypernets.ExtraNetworksPageHypernetworks()) ui_extra_networks.register_page(ui_extra_networks_checkpoints.ExtraNetworksPageCheckpoints()) ui_extra_networks.register_page(ui_extra_networks_textual_inversion.ExtraNetworksPageTextualInversion()) extra_networks.initialize() extra_networks.register_extra_network(extra_networks_hypernet.ExtraNetworkHypernet()) - startup_timer.record("extra networks") + startup_timer.record("extra-networks") if cmd_opts.tls_keyfile is not None and cmd_opts.tls_keyfile is not None: try: @@ -137,7 +137,7 @@ def initialize(): log.error("TLS setup invalid, running webui without TLS") else: log.info("Running with TLS") - startup_timer.record("TLS") + startup_timer.record("tls") # make the program just exit at ctrl+c without waiting for anything def sigint_handler(_sig, _frame):