Merge branch 'dev' into test-fp8 (110485d5) · Commits · github_fork / Stable Diffusion Webui

extensions-builtin/extra-options-section/scripts/extra_options_section.py

+8 −5

Original line number	Diff line number	Diff line
		@@ -64,11 +64,14 @@ class ExtraOptionsSection(scripts.Script):
		p.override_settings[name] = value


		shared.options_templates.update(shared.options_section(('ui', "User interface"), {
		"extra_options_txt2img": shared.OptionInfo([], "Options in main UI - txt2img", ui_components.DropdownMulti, lambda: {"choices": list(shared.opts.data_labels.keys())}).js("info", "settingsHintsShowQuicksettings").info("setting entries that also appear in txt2img interfaces").needs_reload_ui(),
		"extra_options_img2img": shared.OptionInfo([], "Options in main UI - img2img", ui_components.DropdownMulti, lambda: {"choices": list(shared.opts.data_labels.keys())}).js("info", "settingsHintsShowQuicksettings").info("setting entries that also appear in img2img interfaces").needs_reload_ui(),
		"extra_options_cols": shared.OptionInfo(1, "Options in main UI - number of columns", gr.Number, {"precision": 0}).needs_reload_ui(),
		"extra_options_accordion": shared.OptionInfo(False, "Options in main UI - place into an accordion").needs_reload_ui()
		shared.options_templates.update(shared.options_section(('settings_in_ui', "Settings in UI", "ui"), {
		"settings_in_ui": shared.OptionHTML("""
		This page allows you to add some settings to the main interface of txt2img and img2img tabs.
		"""),
		"extra_options_txt2img": shared.OptionInfo([], "Settings for txt2img", ui_components.DropdownMulti, lambda: {"choices": list(shared.opts.data_labels.keys())}).js("info", "settingsHintsShowQuicksettings").info("setting entries that also appear in txt2img interfaces").needs_reload_ui(),
		"extra_options_img2img": shared.OptionInfo([], "Settings for img2img", ui_components.DropdownMulti, lambda: {"choices": list(shared.opts.data_labels.keys())}).js("info", "settingsHintsShowQuicksettings").info("setting entries that also appear in img2img interfaces").needs_reload_ui(),
		"extra_options_cols": shared.OptionInfo(1, "Number of columns for added settings", gr.Number, {"precision": 0}).needs_reload_ui(),
		"extra_options_accordion": shared.OptionInfo(False, "Place added settings into an accordion").needs_reload_ui()
		}))

extensions-builtin/hypertile/hypertile.py

+15 −9

Original line number	Diff line number	Diff line
		@@ -6,7 +6,6 @@ Original author: @tfernd Github: https://github.com/tfernd/HyperTile

		from __future__ import annotations

		import functools
		from dataclasses import dataclass
		from typing import Callable

		@@ -189,20 +188,27 @@ DEPTH_LAYERS_XL = {

		RNG_INSTANCE = random.Random()


		def random_divisor(value: int, min_value: int, /, max_options: int = 1) -> int:
		@cache
		def get_divisors(value: int, min_value: int, /, max_options: int = 1) -> list[int]:
		"""
		Returns a random divisor of value that
		Returns divisors of value that
		x * min_value <= value
		if max_options is 1, the behavior is deterministic
		in big -> small order, amount of divisors is limited by max_options
		"""
		max_options = max(1, max_options) # at least 1 option should be returned
		min_value = min(min_value, value)

		# All big divisors of value (inclusive)
		divisors = [i for i in range(min_value, value + 1) if value % i == 0] # divisors in small -> big order

		ns = [value // i for i in divisors[:max_options]] # has at least 1 element # big -> small order
		return ns


		def random_divisor(value: int, min_value: int, /, max_options: int = 1) -> int:
		"""
		Returns a random divisor of value that
		x * min_value <= value
		if max_options is 1, the behavior is deterministic
		"""
		ns = get_divisors(value, min_value, max_options=max_options) # get cached divisors
		idx = RNG_INSTANCE.randint(0, len(ns) - 1)

		return ns[idx]
		@@ -212,7 +218,7 @@ def set_hypertile_seed(seed: int) -> None:
		RNG_INSTANCE.seed(seed)


		@functools.cache
		@cache
		def largest_tile_size_available(width: int, height: int) -> int:
		"""
		Calculates the largest tile size available for a given width and height

extensions-builtin/hypertile/scripts/hypertile_script.py

+8 −3

Original line number	Diff line number	Diff line
		import hypertile
		from modules import scripts, script_callbacks, shared
		from scripts.hypertile_xyz import add_axis_options


		class ScriptHypertile(scripts.Script):
		@@ -17,7 +18,10 @@ class ScriptHypertile(scripts.Script):
		configure_hypertile(p.width, p.height, enable_unet=shared.opts.hypertile_enable_unet)

		def before_hr(self, p, *args):
		configure_hypertile(p.hr_upscale_to_x, p.hr_upscale_to_y, enable_unet=shared.opts.hypertile_enable_unet_secondpass or shared.opts.hypertile_enable_unet)
		# exclusive hypertile seed for the second pass
		if not shared.opts.hypertile_enable_unet:
		hypertile.set_hypertile_seed(p.all_seeds[0])
		configure_hypertile(p.hr_upscale_to_x, p.hr_upscale_to_y, enable_unet=shared.opts.hypertile_enable_unet_secondpass)


		def configure_hypertile(width, height, enable_unet=True):
		@@ -57,12 +61,12 @@ def on_ui_settings():
		"hypertile_enable_unet_secondpass": shared.OptionInfo(False, "Enable Hypertile U-Net for hires fix second pass"),
		"hypertile_max_depth_unet": shared.OptionInfo(3, "Hypertile U-Net max depth", gr.Slider, {"minimum": 0, "maximum": 3, "step": 1}),
		"hypertile_max_tile_unet": shared.OptionInfo(256, "Hypertile U-net max tile size", gr.Slider, {"minimum": 0, "maximum": 512, "step": 16}),
		"hypertile_swap_size_unet": shared.OptionInfo(3, "Hypertile U-net swap size", gr.Slider, {"minimum": 0, "maximum": 6, "step": 1}),
		"hypertile_swap_size_unet": shared.OptionInfo(3, "Hypertile U-net swap size", gr.Slider, {"minimum": 0, "maximum": 64, "step": 1}),

		"hypertile_enable_vae": shared.OptionInfo(False, "Enable Hypertile VAE").info("minimal change in the generated picture"),
		"hypertile_max_depth_vae": shared.OptionInfo(3, "Hypertile VAE max depth", gr.Slider, {"minimum": 0, "maximum": 3, "step": 1}),
		"hypertile_max_tile_vae": shared.OptionInfo(128, "Hypertile VAE max tile size", gr.Slider, {"minimum": 0, "maximum": 512, "step": 16}),
		"hypertile_swap_size_vae": shared.OptionInfo(3, "Hypertile VAE swap size ", gr.Slider, {"minimum": 0, "maximum": 6, "step": 1}),
		"hypertile_swap_size_vae": shared.OptionInfo(3, "Hypertile VAE swap size ", gr.Slider, {"minimum": 0, "maximum": 64, "step": 1}),
		}

		for name, opt in options.items():
		@@ -71,3 +75,4 @@ def on_ui_settings():


		script_callbacks.on_ui_settings(on_ui_settings)
		script_callbacks.on_before_ui(add_axis_options)

extensions-builtin/hypertile/scripts/hypertile_xyz.py

0 → 100644

+51 −0

Original line number	Diff line number	Diff line
		from modules import scripts
		from modules.shared import opts

		xyz_grid = [x for x in scripts.scripts_data if x.script_class.__module__ == "xyz_grid.py"][0].module

		def int_applier(value_name:str, min_range:int = -1, max_range:int = -1):
		"""
		Returns a function that applies the given value to the given value_name in opts.data.
		"""
		def validate(value_name:str, value:str):
		value = int(value)
		# validate value
		if not min_range == -1:
		assert value >= min_range, f"Value {value} for {value_name} must be greater than or equal to {min_range}"
		if not max_range == -1:
		assert value <= max_range, f"Value {value} for {value_name} must be less than or equal to {max_range}"
		def apply_int(p, x, xs):
		validate(value_name, x)
		opts.data[value_name] = int(x)
		return apply_int

		def bool_applier(value_name:str):
		"""
		Returns a function that applies the given value to the given value_name in opts.data.
		"""
		def validate(value_name:str, value:str):
		assert value.lower() in ["true", "false"], f"Value {value} for {value_name} must be either true or false"
		def apply_bool(p, x, xs):
		validate(value_name, x)
		value_boolean = x.lower() == "true"
		opts.data[value_name] = value_boolean
		return apply_bool

		def add_axis_options():
		extra_axis_options = [
		xyz_grid.AxisOption("[Hypertile] Unet First pass Enabled", str, bool_applier("hypertile_enable_unet"), choices=xyz_grid.boolean_choice(reverse=True)),
		xyz_grid.AxisOption("[Hypertile] Unet Second pass Enabled", str, bool_applier("hypertile_enable_unet_secondpass"), choices=xyz_grid.boolean_choice(reverse=True)),
		xyz_grid.AxisOption("[Hypertile] Unet Max Depth", int, int_applier("hypertile_max_depth_unet", 0, 3), choices=lambda: [str(x) for x in range(4)]),
		xyz_grid.AxisOption("[Hypertile] Unet Max Tile Size", int, int_applier("hypertile_max_tile_unet", 0, 512)),
		xyz_grid.AxisOption("[Hypertile] Unet Swap Size", int, int_applier("hypertile_swap_size_unet", 0, 64)),
		xyz_grid.AxisOption("[Hypertile] VAE Enabled", str, bool_applier("hypertile_enable_vae"), choices=xyz_grid.boolean_choice(reverse=True)),
		xyz_grid.AxisOption("[Hypertile] VAE Max Depth", int, int_applier("hypertile_max_depth_vae", 0, 3), choices=lambda: [str(x) for x in range(4)]),
		xyz_grid.AxisOption("[Hypertile] VAE Max Tile Size", int, int_applier("hypertile_max_tile_vae", 0, 512)),
		xyz_grid.AxisOption("[Hypertile] VAE Swap Size", int, int_applier("hypertile_swap_size_vae", 0, 64)),
		]
		set_a = {opt.label for opt in xyz_grid.axis_options}
		set_b = {opt.label for opt in extra_axis_options}
		if set_a.intersection(set_b):
		return

		xyz_grid.axis_options.extend(extra_axis_options)

javascript/extraNetworks.js

+10 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,10 @@ function extraNetworksMovePromptToTab(tabname, id, showPrompt, showNegativePromp
		} else {
		promptContainer.insertBefore(prompt, promptContainer.firstChild);
		}

		if (elem) {
		elem.classList.toggle('extra-page-prompts-active', showNegativePrompt \|\| showPrompt);
		}
		}


		@@ -388,3 +392,9 @@ function extraNetworksRefreshSingleCard(page, tabname, name) {
		}
		});
		}

		window.addEventListener("keydown", function(event) {
		if (event.key == "Escape") {
		closePopup();
		}
		});

Admin message