mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-02-03 02:00:29 +08:00
ae20354b69
Mark widgets as advanced across core, comfy_extras, and comfy_api_nodes to support the new collapsible advanced inputs section in the frontend. Changes: - 267 advanced markers in comfy_extras/ - 162 advanced markers in comfy_api_nodes/ - All files pass python3 -m py_compile verification Widgets marked advanced (hidden by default): - Scheduler internals: sigma_max, sigma_min, rho, mu, beta, alpha - Sampler internals: eta, s_noise, order, rtol, atol, h_init, pcoeff, etc. - Memory optimization: tile_size, overlap, temporal_size, temporal_overlap - Pipeline controls: add_noise, start_at_step, end_at_step - Timing controls: start_percent, end_percent - Layer selection: stop_at_clip_layer, layers, block_number - Video encoding: codec, crf, format - Device/dtype: device, noise_device, dtype, weight_dtype Widgets kept basic (always visible): - Core params: strength, steps, cfg, denoise, seed, width, height - Model selectors: ckpt_name, lora_name, vae_name, sampler_name - Common controls: upscale_method, crop, batch_size, fps, opacity Related: frontend PR #11939 Amp-Thread-ID: https://ampcode.com/threads/T-019c1734-6b61-702e-b333-f02c399963fc
357 lines
12 KiB
Python
357 lines
12 KiB
Python
import comfy_extras.nodes_model_merging
|
|
|
|
class ModelMergeSD1(comfy_extras.nodes_model_merging.ModelMergeBlocks):
|
|
CATEGORY = "advanced/model_merging/model_specific"
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
arg_dict = { "model1": ("MODEL",),
|
|
"model2": ("MODEL",)}
|
|
|
|
argument = ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "advanced": True})
|
|
|
|
arg_dict["time_embed."] = argument
|
|
arg_dict["label_emb."] = argument
|
|
|
|
for i in range(12):
|
|
arg_dict["input_blocks.{}.".format(i)] = argument
|
|
|
|
for i in range(3):
|
|
arg_dict["middle_block.{}.".format(i)] = argument
|
|
|
|
for i in range(12):
|
|
arg_dict["output_blocks.{}.".format(i)] = argument
|
|
|
|
arg_dict["out."] = argument
|
|
|
|
return {"required": arg_dict}
|
|
|
|
|
|
class ModelMergeSDXL(comfy_extras.nodes_model_merging.ModelMergeBlocks):
|
|
CATEGORY = "advanced/model_merging/model_specific"
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
arg_dict = { "model1": ("MODEL",),
|
|
"model2": ("MODEL",)}
|
|
|
|
argument = ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "advanced": True})
|
|
|
|
arg_dict["time_embed."] = argument
|
|
arg_dict["label_emb."] = argument
|
|
|
|
for i in range(9):
|
|
arg_dict["input_blocks.{}".format(i)] = argument
|
|
|
|
for i in range(3):
|
|
arg_dict["middle_block.{}".format(i)] = argument
|
|
|
|
for i in range(9):
|
|
arg_dict["output_blocks.{}".format(i)] = argument
|
|
|
|
arg_dict["out."] = argument
|
|
|
|
return {"required": arg_dict}
|
|
|
|
class ModelMergeSD3_2B(comfy_extras.nodes_model_merging.ModelMergeBlocks):
|
|
CATEGORY = "advanced/model_merging/model_specific"
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
arg_dict = { "model1": ("MODEL",),
|
|
"model2": ("MODEL",)}
|
|
|
|
argument = ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "advanced": True})
|
|
|
|
arg_dict["pos_embed."] = argument
|
|
arg_dict["x_embedder."] = argument
|
|
arg_dict["context_embedder."] = argument
|
|
arg_dict["y_embedder."] = argument
|
|
arg_dict["t_embedder."] = argument
|
|
|
|
for i in range(24):
|
|
arg_dict["joint_blocks.{}.".format(i)] = argument
|
|
|
|
arg_dict["final_layer."] = argument
|
|
|
|
return {"required": arg_dict}
|
|
|
|
|
|
class ModelMergeAuraflow(comfy_extras.nodes_model_merging.ModelMergeBlocks):
|
|
CATEGORY = "advanced/model_merging/model_specific"
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
arg_dict = { "model1": ("MODEL",),
|
|
"model2": ("MODEL",)}
|
|
|
|
argument = ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "advanced": True})
|
|
|
|
arg_dict["init_x_linear."] = argument
|
|
arg_dict["positional_encoding"] = argument
|
|
arg_dict["cond_seq_linear."] = argument
|
|
arg_dict["register_tokens"] = argument
|
|
arg_dict["t_embedder."] = argument
|
|
|
|
for i in range(4):
|
|
arg_dict["double_layers.{}.".format(i)] = argument
|
|
|
|
for i in range(32):
|
|
arg_dict["single_layers.{}.".format(i)] = argument
|
|
|
|
arg_dict["modF."] = argument
|
|
arg_dict["final_linear."] = argument
|
|
|
|
return {"required": arg_dict}
|
|
|
|
class ModelMergeFlux1(comfy_extras.nodes_model_merging.ModelMergeBlocks):
|
|
CATEGORY = "advanced/model_merging/model_specific"
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
arg_dict = { "model1": ("MODEL",),
|
|
"model2": ("MODEL",)}
|
|
|
|
argument = ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "advanced": True})
|
|
|
|
arg_dict["img_in."] = argument
|
|
arg_dict["time_in."] = argument
|
|
arg_dict["guidance_in"] = argument
|
|
arg_dict["vector_in."] = argument
|
|
arg_dict["txt_in."] = argument
|
|
|
|
for i in range(19):
|
|
arg_dict["double_blocks.{}.".format(i)] = argument
|
|
|
|
for i in range(38):
|
|
arg_dict["single_blocks.{}.".format(i)] = argument
|
|
|
|
arg_dict["final_layer."] = argument
|
|
|
|
return {"required": arg_dict}
|
|
|
|
class ModelMergeSD35_Large(comfy_extras.nodes_model_merging.ModelMergeBlocks):
|
|
CATEGORY = "advanced/model_merging/model_specific"
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
arg_dict = { "model1": ("MODEL",),
|
|
"model2": ("MODEL",)}
|
|
|
|
argument = ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "advanced": True})
|
|
|
|
arg_dict["pos_embed."] = argument
|
|
arg_dict["x_embedder."] = argument
|
|
arg_dict["context_embedder."] = argument
|
|
arg_dict["y_embedder."] = argument
|
|
arg_dict["t_embedder."] = argument
|
|
|
|
for i in range(38):
|
|
arg_dict["joint_blocks.{}.".format(i)] = argument
|
|
|
|
arg_dict["final_layer."] = argument
|
|
|
|
return {"required": arg_dict}
|
|
|
|
class ModelMergeMochiPreview(comfy_extras.nodes_model_merging.ModelMergeBlocks):
|
|
CATEGORY = "advanced/model_merging/model_specific"
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
arg_dict = { "model1": ("MODEL",),
|
|
"model2": ("MODEL",)}
|
|
|
|
argument = ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "advanced": True})
|
|
|
|
arg_dict["pos_frequencies."] = argument
|
|
arg_dict["t_embedder."] = argument
|
|
arg_dict["t5_y_embedder."] = argument
|
|
arg_dict["t5_yproj."] = argument
|
|
|
|
for i in range(48):
|
|
arg_dict["blocks.{}.".format(i)] = argument
|
|
|
|
arg_dict["final_layer."] = argument
|
|
|
|
return {"required": arg_dict}
|
|
|
|
class ModelMergeLTXV(comfy_extras.nodes_model_merging.ModelMergeBlocks):
|
|
CATEGORY = "advanced/model_merging/model_specific"
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
arg_dict = { "model1": ("MODEL",),
|
|
"model2": ("MODEL",)}
|
|
|
|
argument = ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "advanced": True})
|
|
|
|
arg_dict["patchify_proj."] = argument
|
|
arg_dict["adaln_single."] = argument
|
|
arg_dict["caption_projection."] = argument
|
|
|
|
for i in range(28):
|
|
arg_dict["transformer_blocks.{}.".format(i)] = argument
|
|
|
|
arg_dict["scale_shift_table"] = argument
|
|
arg_dict["proj_out."] = argument
|
|
|
|
return {"required": arg_dict}
|
|
|
|
class ModelMergeCosmos7B(comfy_extras.nodes_model_merging.ModelMergeBlocks):
|
|
CATEGORY = "advanced/model_merging/model_specific"
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
arg_dict = { "model1": ("MODEL",),
|
|
"model2": ("MODEL",)}
|
|
|
|
argument = ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "advanced": True})
|
|
|
|
arg_dict["pos_embedder."] = argument
|
|
arg_dict["extra_pos_embedder."] = argument
|
|
arg_dict["x_embedder."] = argument
|
|
arg_dict["t_embedder."] = argument
|
|
arg_dict["affline_norm."] = argument
|
|
|
|
|
|
for i in range(28):
|
|
arg_dict["blocks.block{}.".format(i)] = argument
|
|
|
|
arg_dict["final_layer."] = argument
|
|
|
|
return {"required": arg_dict}
|
|
|
|
class ModelMergeCosmos14B(comfy_extras.nodes_model_merging.ModelMergeBlocks):
|
|
CATEGORY = "advanced/model_merging/model_specific"
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
arg_dict = { "model1": ("MODEL",),
|
|
"model2": ("MODEL",)}
|
|
|
|
argument = ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "advanced": True})
|
|
|
|
arg_dict["pos_embedder."] = argument
|
|
arg_dict["extra_pos_embedder."] = argument
|
|
arg_dict["x_embedder."] = argument
|
|
arg_dict["t_embedder."] = argument
|
|
arg_dict["affline_norm."] = argument
|
|
|
|
|
|
for i in range(36):
|
|
arg_dict["blocks.block{}.".format(i)] = argument
|
|
|
|
arg_dict["final_layer."] = argument
|
|
|
|
return {"required": arg_dict}
|
|
|
|
class ModelMergeWAN2_1(comfy_extras.nodes_model_merging.ModelMergeBlocks):
|
|
CATEGORY = "advanced/model_merging/model_specific"
|
|
DESCRIPTION = "1.3B model has 30 blocks, 14B model has 40 blocks. Image to video model has the extra img_emb."
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
arg_dict = { "model1": ("MODEL",),
|
|
"model2": ("MODEL",)}
|
|
|
|
argument = ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "advanced": True})
|
|
|
|
arg_dict["patch_embedding."] = argument
|
|
arg_dict["time_embedding."] = argument
|
|
arg_dict["time_projection."] = argument
|
|
arg_dict["text_embedding."] = argument
|
|
arg_dict["img_emb."] = argument
|
|
|
|
for i in range(40):
|
|
arg_dict["blocks.{}.".format(i)] = argument
|
|
|
|
arg_dict["head."] = argument
|
|
|
|
return {"required": arg_dict}
|
|
|
|
class ModelMergeCosmosPredict2_2B(comfy_extras.nodes_model_merging.ModelMergeBlocks):
|
|
CATEGORY = "advanced/model_merging/model_specific"
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
arg_dict = { "model1": ("MODEL",),
|
|
"model2": ("MODEL",)}
|
|
|
|
argument = ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "advanced": True})
|
|
|
|
arg_dict["pos_embedder."] = argument
|
|
arg_dict["x_embedder."] = argument
|
|
arg_dict["t_embedder."] = argument
|
|
arg_dict["t_embedding_norm."] = argument
|
|
|
|
|
|
for i in range(28):
|
|
arg_dict["blocks.{}.".format(i)] = argument
|
|
|
|
arg_dict["final_layer."] = argument
|
|
|
|
return {"required": arg_dict}
|
|
|
|
class ModelMergeCosmosPredict2_14B(comfy_extras.nodes_model_merging.ModelMergeBlocks):
|
|
CATEGORY = "advanced/model_merging/model_specific"
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
arg_dict = { "model1": ("MODEL",),
|
|
"model2": ("MODEL",)}
|
|
|
|
argument = ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "advanced": True})
|
|
|
|
arg_dict["pos_embedder."] = argument
|
|
arg_dict["x_embedder."] = argument
|
|
arg_dict["t_embedder."] = argument
|
|
arg_dict["t_embedding_norm."] = argument
|
|
|
|
|
|
for i in range(36):
|
|
arg_dict["blocks.{}.".format(i)] = argument
|
|
|
|
arg_dict["final_layer."] = argument
|
|
|
|
return {"required": arg_dict}
|
|
|
|
class ModelMergeQwenImage(comfy_extras.nodes_model_merging.ModelMergeBlocks):
|
|
CATEGORY = "advanced/model_merging/model_specific"
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
arg_dict = { "model1": ("MODEL",),
|
|
"model2": ("MODEL",)}
|
|
|
|
argument = ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "advanced": True})
|
|
|
|
arg_dict["pos_embeds."] = argument
|
|
arg_dict["img_in."] = argument
|
|
arg_dict["txt_norm."] = argument
|
|
arg_dict["txt_in."] = argument
|
|
arg_dict["time_text_embed."] = argument
|
|
|
|
for i in range(60):
|
|
arg_dict["transformer_blocks.{}.".format(i)] = argument
|
|
|
|
arg_dict["proj_out."] = argument
|
|
|
|
return {"required": arg_dict}
|
|
|
|
NODE_CLASS_MAPPINGS = {
|
|
"ModelMergeSD1": ModelMergeSD1,
|
|
"ModelMergeSD2": ModelMergeSD1, #SD1 and SD2 have the same blocks
|
|
"ModelMergeSDXL": ModelMergeSDXL,
|
|
"ModelMergeSD3_2B": ModelMergeSD3_2B,
|
|
"ModelMergeAuraflow": ModelMergeAuraflow,
|
|
"ModelMergeFlux1": ModelMergeFlux1,
|
|
"ModelMergeSD35_Large": ModelMergeSD35_Large,
|
|
"ModelMergeMochiPreview": ModelMergeMochiPreview,
|
|
"ModelMergeLTXV": ModelMergeLTXV,
|
|
"ModelMergeCosmos7B": ModelMergeCosmos7B,
|
|
"ModelMergeCosmos14B": ModelMergeCosmos14B,
|
|
"ModelMergeWAN2_1": ModelMergeWAN2_1,
|
|
"ModelMergeCosmosPredict2_2B": ModelMergeCosmosPredict2_2B,
|
|
"ModelMergeCosmosPredict2_14B": ModelMergeCosmosPredict2_14B,
|
|
"ModelMergeQwenImage": ModelMergeQwenImage,
|
|
}
|