Changed all references to "pix2pix" to the more precise name "instruct... (9e72dc74) · Commits · github_fork / Stable Diffusion Webui

modules/extras.py

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -132,7 +132,7 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_
	tertiary_model_info = sd_models.checkpoints_list[tertiary_model_name] if theta_func1 else None		tertiary_model_info = sd_models.checkpoints_list[tertiary_model_name] if theta_func1 else None

	result_is_inpainting_model = False		result_is_inpainting_model = False
	result_is_pix2pix_model = False		result_is_instruct_pix2pix_model = False

	if theta_func2:		if theta_func2:
	shared.state.textinfo = f"Loading B"		shared.state.textinfo = f"Loading B"
	@@ -187,11 +187,11 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_
	if a.shape[1] == 4 and b.shape[1] == 9:		if a.shape[1] == 4 and b.shape[1] == 9:
	raise RuntimeError("When merging inpainting model with a normal one, A must be the inpainting model.")		raise RuntimeError("When merging inpainting model with a normal one, A must be the inpainting model.")
	if a.shape[1] == 4 and b.shape[1] == 8:		if a.shape[1] == 4 and b.shape[1] == 8:
	raise RuntimeError("When merging pix2pix model with a normal one, A must be the pix2pix model.")		raise RuntimeError("When merging instruct-pix2pix model with a normal one, A must be the instruct-pix2pix model.")

	if a.shape[1] == 8 and b.shape[1] == 4:#If we have an InstructPix2Pix model...		if a.shape[1] == 8 and b.shape[1] == 4:#If we have an Instruct-Pix2Pix model...
	theta_0[key][:, 0:4, :, :] = theta_func2(a[:, 0:4, :, :], b, multiplier)#Merge only the vectors the models have in common. Otherwise we get an error due to dimension mismatch.		theta_0[key][:, 0:4, :, :] = theta_func2(a[:, 0:4, :, :], b, multiplier)#Merge only the vectors the models have in common. Otherwise we get an error due to dimension mismatch.
	result_is_pix2pix_model = True		result_is_instruct_pix2pix_model = True
	else:		else:
	assert a.shape[1] == 9 and b.shape[1] == 4, f"Bad dimensions for merged layer {key}: A={a.shape}, B={b.shape}"		assert a.shape[1] == 9 and b.shape[1] == 4, f"Bad dimensions for merged layer {key}: A={a.shape}, B={b.shape}"
	theta_0[key][:, 0:4, :, :] = theta_func2(a[:, 0:4, :, :], b, multiplier)		theta_0[key][:, 0:4, :, :] = theta_func2(a[:, 0:4, :, :], b, multiplier)
	@@ -232,7 +232,7 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_

	filename = filename_generator() if custom_name == '' else custom_name		filename = filename_generator() if custom_name == '' else custom_name
	filename += ".inpainting" if result_is_inpainting_model else ""		filename += ".inpainting" if result_is_inpainting_model else ""
	filename += ".pix2pix" if result_is_pix2pix_model else ""		filename += ".instrpix2pix" if result_is_instruct_pix2pix_model else ""
	filename += "." + checkpoint_format		filename += "." + checkpoint_format

	output_modelname = os.path.join(ckpt_dir, filename)		output_modelname = os.path.join(ckpt_dir, filename)

Admin message