Merge branch 'dev' into extra-norm-module (e7c03ccd) · Commits · github_fork / Stable Diffusion Webui

extensions-builtin/Lora/extra_networks_lora.py

+9 −1

Original line number	Diff line number	Diff line
		@@ -6,9 +6,14 @@ class ExtraNetworkLora(extra_networks.ExtraNetwork):
		def __init__(self):
		super().__init__('lora')

		self.errors = {}
		"""mapping of network names to the number of errors the network had during operation"""

		def activate(self, p, params_list):
		additional = shared.opts.sd_lora

		self.errors.clear()

		if additional != "None" and additional in networks.available_networks and not any(x for x in params_list if x.items[0] == additional):
		p.all_prompts = [x + f"<lora:{additional}:{shared.opts.extra_networks_default_multiplier}>" for x in p.all_prompts]
		params_list.append(extra_networks.ExtraNetworkParams(items=[additional, shared.opts.extra_networks_default_multiplier]))
		@@ -56,4 +61,7 @@ class ExtraNetworkLora(extra_networks.ExtraNetwork):
		p.extra_generation_params["Lora hashes"] = ", ".join(network_hashes)

		def deactivate(self, p):
		pass
		if self.errors:
		p.comment("Networks with errors: " + ", ".join(f"{k} ({v})" for k, v in self.errors.items()))

		self.errors.clear()

extensions-builtin/Lora/networks.py

+41 −28

Original line number	Diff line number	Diff line
		import logging
		import os
		import re

		@@ -194,7 +195,7 @@ def load_network(name, network_on_disk):
		net.modules[key] = net_module

		if keys_failed_to_match:
		print(f"Failed to match keys when loading network {network_on_disk.filename}: {keys_failed_to_match}")
		logging.debug(f"Network {network_on_disk.filename} didn't match keys: {keys_failed_to_match}")

		return net

		@@ -207,7 +208,6 @@ def purge_networks_from_memory():
		devices.torch_gc()



		def load_networks(names, te_multipliers=None, unet_multipliers=None, dyn_dims=None):
		already_loaded = {}

		@@ -248,7 +248,7 @@ def load_networks(names, te_multipliers=None, unet_multipliers=None, dyn_dims=No

		if net is None:
		failed_to_load_networks.append(name)
		print(f"Couldn't find network with name {name}")
		logging.info(f"Couldn't find network with name {name}")
		continue

		net.te_multiplier = te_multipliers[i] if te_multipliers else 1.0
		@@ -257,7 +257,7 @@ def load_networks(names, te_multipliers=None, unet_multipliers=None, dyn_dims=No
		loaded_networks.append(net)

		if failed_to_load_networks:
		sd_hijack.model_hijack.comments.append("Failed to find networks: " + ", ".join(failed_to_load_networks))
		sd_hijack.model_hijack.comments.append("Networks not found: " + ", ".join(failed_to_load_networks))

		purge_networks_from_memory()

		@@ -327,6 +327,7 @@ def network_apply_weights(self: Union[torch.nn.Conv2d, torch.nn.Linear, torch.nn
		for net in loaded_networks:
		module = net.modules.get(network_layer_name, None)
		if module is not None and hasattr(self, 'weight'):
		try:
		with torch.no_grad():
		updown, ex_bias = module.calc_updown(self.weight)

		@@ -340,6 +341,10 @@ def network_apply_weights(self: Union[torch.nn.Conv2d, torch.nn.Linear, torch.nn
		self.bias = torch.nn.Parameter(ex_bias)
		else:
		self.bias += ex_bias
		except RuntimeError as e:
		logging.debug(f"Network {net.name} layer {network_layer_name}: {e}")
		extra_network_lora.errors[net.name] = extra_network_lora.errors.get(net.name, 0) + 1

		continue

		module_q = net.modules.get(network_layer_name + "_q_proj", None)
		@@ -348,6 +353,7 @@ def network_apply_weights(self: Union[torch.nn.Conv2d, torch.nn.Linear, torch.nn
		module_out = net.modules.get(network_layer_name + "_out_proj", None)

		if isinstance(self, torch.nn.MultiheadAttention) and module_q and module_k and module_v and module_out:
		try:
		with torch.no_grad():
		updown_q, _ = module_q.calc_updown(self.in_proj_weight)
		updown_k, _ = module_k.calc_updown(self.in_proj_weight)
		@@ -362,12 +368,18 @@ def network_apply_weights(self: Union[torch.nn.Conv2d, torch.nn.Linear, torch.nn
		self.out_proj.bias = torch.nn.Parameter(ex_bias)
		else:
		self.out_proj.bias += ex_bias

		except RuntimeError as e:
		logging.debug(f"Network {net.name} layer {network_layer_name}: {e}")
		extra_network_lora.errors[net.name] = extra_network_lora.errors.get(net.name, 0) + 1

		continue

		if module is None:
		continue

		print(f'failed to calculate network weights for layer {network_layer_name}')
		logging.debug(f"Network {net.name} layer {network_layer_name}: couldn't find supported operation")
		extra_network_lora.errors[net.name] = extra_network_lora.errors.get(net.name, 0) + 1

		self.network_current_names = wanted_names

		@@ -540,6 +552,7 @@ def infotext_pasted(infotext, params):
		if added:
		params["Prompt"] += "\n" + "".join(added)

		extra_network_lora = None

		available_networks = {}
		available_network_aliases = {}

extensions-builtin/Lora/scripts/lora_script.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -23,9 +23,9 @@ def unload():
		def before_ui():
		ui_extra_networks.register_page(ui_extra_networks_lora.ExtraNetworksPageLora())

		extra_network = extra_networks_lora.ExtraNetworkLora()
		extra_networks.register_extra_network(extra_network)
		extra_networks.register_extra_network_alias(extra_network, "lyco")
		networks.extra_network_lora = extra_networks_lora.ExtraNetworkLora()
		extra_networks.register_extra_network(networks.extra_network_lora)
		extra_networks.register_extra_network_alias(networks.extra_network_lora, "lyco")


		if not hasattr(torch.nn, 'Linear_forward_before_network'):

extensions-builtin/Lora/ui_extra_networks_lora.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -25,9 +25,10 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
		item = {
		"name": name,
		"filename": lora_on_disk.filename,
		"shorthash": lora_on_disk.shorthash,
		"preview": self.find_preview(path),
		"description": self.find_description(path),
		"search_term": self.search_terms_from_path(lora_on_disk.filename),
		"search_term": self.search_terms_from_path(lora_on_disk.filename) + " " + (lora_on_disk.hash or ""),
		"local_preview": f"{path}.{shared.opts.samples_format}",
		"metadata": lora_on_disk.metadata,
		"sort_keys": {'default': index, **self.get_sort_keys(lora_on_disk.filename)},

modules/launch_utils.py

+7 −4

Original line number	Diff line number	Diff line
		@@ -173,9 +173,12 @@ def git_clone(url, dir, name, commithash=None):
		if current_hash == commithash:
		return

		run_git('fetch', f"Fetching updates for {name}...", f"Couldn't fetch {name}", autofix=False)
		if run_git(dir, name, 'config --get remote.origin.url', None, f"Couldn't determine {name}'s origin URL", live=False).strip() != url:
		run_git(dir, name, f'remote set-url origin "{url}"', None, f"Failed to set {name}'s origin URL", live=False)

		run_git('checkout', f"Checking out commit for {name} with hash: {commithash}...", f"Couldn't checkout commit {commithash} for {name}", live=True)
		run_git(dir, name, 'fetch', f"Fetching updates for {name}...", f"Couldn't fetch {name}", autofix=False)

		run_git(dir, name, f'checkout {commithash}', f"Checking out commit for {name} with hash: {commithash}...", f"Couldn't checkout commit {commithash} for {name}", live=True)

		return

		@@ -319,12 +322,12 @@ def prepare_environment():

		stable_diffusion_commit_hash = os.environ.get('STABLE_DIFFUSION_COMMIT_HASH', "cf1d67a6fd5ea1aa600c4df58e5b47da45f6bdbf")
		stable_diffusion_xl_commit_hash = os.environ.get('STABLE_DIFFUSION_XL_COMMIT_HASH', "5c10deee76adad0032b412294130090932317a87")
		k_diffusion_commit_hash = os.environ.get('K_DIFFUSION_COMMIT_HASH', "c9fe758757e022f05ca5a53fa8fac28889e4f1cf")
		k_diffusion_commit_hash = os.environ.get('K_DIFFUSION_COMMIT_HASH', "ab527a9a6d347f364e3d185ba6d714e22d80cb3c")
		codeformer_commit_hash = os.environ.get('CODEFORMER_COMMIT_HASH', "c5b4593074ba6214284d6acd5f1719b6c5d739af")
		blip_commit_hash = os.environ.get('BLIP_COMMIT_HASH', "48211a1594f1321b00f14c9f7a5b4813144b2fb9")

		try:
		# the existance of this file is a signal to webui.sh/bat that webui needs to be restarted when it stops execution
		# the existence of this file is a signal to webui.sh/bat that webui needs to be restarted when it stops execution
		os.remove(os.path.join(script_path, "tmp", "restart"))
		os.environ.setdefault('SD_WEBUI_RESTARTING', '1')
		except OSError:

Admin message