The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
[BlockInfo] Wan (#10845)
Haomingea2c117bc3c9
diff --git a/comfy/ldm/wan/model.py b/comfy/ldm/wan/model.pyindex a9d5e10d9..4216ce831 100644--- a/comfy/ldm/wan/model.py+++ b/comfy/ldm/wan/model.py@@ -568,7 +568,10 @@ class WanModel(torch.nn.Module):patches_replace = transformer_options.get("patches_replace", {})blocks_replace = patches_replace.get("dit", {})+ transformer_options["total_blocks"] = len(self.blocks)+ transformer_options["block_type"] = "double"for i, block in enumerate(self.blocks):+ transformer_options["block_index"] = iif ("double_block", i) in blocks_replace:def block_wrap(args):out = {}@@ -763,7 +766,10 @@ class VaceWanModel(WanModel):patches_replace = transformer_options.get("patches_replace", {})blocks_replace = patches_replace.get("dit", {})+ transformer_options["total_blocks"] = len(self.blocks)+ transformer_options["block_type"] = "double"for i, block in enumerate(self.blocks):+ transformer_options["block_index"] = iif ("double_block", i) in blocks_replace:def block_wrap(args):out = {}@@ -862,7 +868,10 @@ class CameraWanModel(WanModel):patches_replace = transformer_options.get("patches_replace", {})blocks_replace = patches_replace.get("dit", {})+ transformer_options["total_blocks"] = len(self.blocks)+ transformer_options["block_type"] = "double"for i, block in enumerate(self.blocks):+ transformer_options["block_index"] = iif ("double_block", i) in blocks_replace:def block_wrap(args):out = {}@@ -1326,16 +1335,19 @@ class WanModel_S2V(WanModel):patches_replace = transformer_options.get("patches_replace", {})blocks_replace = patches_replace.get("dit", {})+ transformer_options["total_blocks"] = len(self.blocks)+ transformer_options["block_type"] = "double"for i, block in enumerate(self.blocks):+ transformer_options["block_index"] = iif ("double_block", i) in blocks_replace:def block_wrap(args):out = {}- out["img"] = block(args["img"], context=args["txt"], e=args["vec"], freqs=args["pe"])+ out["img"] = block(args["img"], context=args["txt"], e=args["vec"], freqs=args["pe"], transformer_options=args["transformer_options"])return out- out = blocks_replace[("double_block", i)]({"img": x, "txt": context, "vec": e0, "pe": freqs}, {"original_block": block_wrap})+ out = blocks_replace[("double_block", i)]({"img": x, "txt": context, "vec": e0, "pe": freqs, "transformer_options": transformer_options}, {"original_block": block_wrap})x = out["img"]else:- x = block(x, e=e0, freqs=freqs, context=context)+ x = block(x, e=e0, freqs=freqs, context=context, transformer_options=transformer_options)if audio_emb is not None:x = self.audio_injector(x, i, audio_emb, audio_emb_global, seq_len)# head@@ -1574,7 +1586,10 @@ class HumoWanModel(WanModel):patches_replace = transformer_options.get("patches_replace", {})blocks_replace = patches_replace.get("dit", {})+ transformer_options["total_blocks"] = len(self.blocks)+ transformer_options["block_type"] = "double"for i, block in enumerate(self.blocks):+ transformer_options["block_index"] = iif ("double_block", i) in blocks_replace:def block_wrap(args):out = {}diff --git a/comfy/ldm/wan/model_animate.py b/comfy/ldm/wan/model_animate.pyindex 7c87835d4..84d7adec4 100644--- a/comfy/ldm/wan/model_animate.py+++ b/comfy/ldm/wan/model_animate.py@@ -523,7 +523,10 @@ class AnimateWanModel(WanModel):patches_replace = transformer_options.get("patches_replace", {})blocks_replace = patches_replace.get("dit", {})+ transformer_options["total_blocks"] = len(self.blocks)+ transformer_options["block_type"] = "double"for i, block in enumerate(self.blocks):+ transformer_options["block_index"] = iif ("double_block", i) in blocks_replace:def block_wrap(args):out = {}