From 8a575afae66ee5c28dc9e12fb96ba4eb3ef71c22 Mon Sep 17 00:00:00 2001 From: gaclove Date: Sun, 26 Oct 2025 15:28:12 +0000 Subject: [PATCH] refactor: remove mm_config parameter from LightX2V configuration files for cleaner implementation and improved clarity --- bridge.py | 1 - config_builder.py | 1 - nodes.py | 16 ++++++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/bridge.py b/bridge.py index 30a1e06..f5e2d48 100644 --- a/bridge.py +++ b/bridge.py @@ -129,7 +129,6 @@ class LightX2VDefaultConfig: "t5_quant_scheme": DEFAULT_QUANTIZATION_SCHEMES["t5"], "clip_quant_scheme": DEFAULT_QUANTIZATION_SCHEMES["clip"], "adapter_quant_scheme": DEFAULT_QUANTIZATION_SCHEMES["adapter"], - "mm_config": {"mm_type": "Default"}, # Memory Optimization "rotary_chunk": False, "rotary_chunk_size": 100, diff --git a/config_builder.py b/config_builder.py index ed79ec3..97d557c 100644 --- a/config_builder.py +++ b/config_builder.py @@ -313,7 +313,6 @@ class ConfigBuilder: "t5_quantized": getattr(config, "t5_quantized", False), "clip_quantized": getattr(config, "clip_quantized", False), "lora_configs": getattr(config, "lora_configs", None), - "mm_config": getattr(config, "mm_config", None), "cross_attn_1_type": getattr(config, "cross_attn_1_type", None), "cross_attn_2_type": getattr(config, "cross_attn_2_type", None), "self_attn_1_type": getattr(config, "self_attn_1_type", None), diff --git a/nodes.py b/nodes.py index 5bb4061..bfeb3cf 100644 --- a/nodes.py +++ b/nodes.py @@ -1117,12 +1117,16 @@ class LightX2VConfigCombinerV2: logging.warning(f"Mask file not found: {obj['mask']}") if processed_talk_objects: - # config.talk_objects = processed_talk_objects - temp_dir = self.temp_manager.create_temp_dir() - with open(os.path.join(temp_dir, "config.json"), "w") as f: - json.dump({"talk_objects": processed_talk_objects}, f) - config.audio_path = temp_dir - logging.info(f"Processed {len(processed_talk_objects)} talk objects") + if len(processed_talk_objects) == 1: + if "mask" not in processed_talk_objects[0]: + config.audio_path = processed_talk_objects[0]["audio"] + logging.info(f"Convert Processed 1 talk object to audio path: {config.audio_path}") + else: + temp_dir = self.temp_manager.create_temp_dir() + with open(os.path.join(temp_dir, "config.json"), "w") as f: + json.dump({"talk_objects": processed_talk_objects}, f) + config.audio_path = temp_dir + logging.info(f"Processed {len(processed_talk_objects)} talk objects") logging.info("lightx2v prepared config: " + json.dumps(config, indent=2, ensure_ascii=False))