Support XYZ scripts / split hires path from unet (23c36f59) · Commits · github_fork / Stable Diffusion Webui

extensions-builtin/hypertile/scripts/hypertile_script.py

+8 −3

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


	class ScriptHypertile(scripts.Script):		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)		configure_hypertile(p.width, p.height, enable_unet=shared.opts.hypertile_enable_unet)

	def before_hr(self, p, *args):		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):		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_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_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_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_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_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_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():		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_ui_settings(on_ui_settings)
			script_callbacks.on_before_ui(add_axis_options)
			No newline at end of file

extensions-builtin/hypertile/scripts/hypertile_xyz.py

0 → 100644

+52 −0

Original line number	Original line	Diff line number	Diff line
			from modules import scripts
			xyz_grid = [x for x in scripts.scripts_data if x.script_class.__module__ == "xyz_grid.py"][0].module
			from modules.shared import opts

			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.
			"""
			# convert to int
			def validate(value_name:str, value:str):
			try:
			value = int(value)
			except:
			raise ValueError(f"Value {value} for {value_name} is not an integer")
			# 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)),
			]
			# check if the axis options have already been added
			if any(set(opt.label for opt in extra_axis_options).intersection(set(opt.label for opt in xyz_grid.axis_options))):
			return
			xyz_grid.axis_options.extend(extra_axis_options)
			No newline at end of file

Admin message