From b59f9bd3a8e224514cc2baa4f3f085838db87603 Mon Sep 17 00:00:00 2001 From: John Pollock Date: Fri, 8 Aug 2025 14:54:36 -0500 Subject: [PATCH] Rename DisTorchBlockSwap to DisTorch per user feedback - Simplified node naming from DisTorchBlockSwap to DisTorch - Cleaned up accidentally added main_branch directory - Updated all references in __init__.py and core/blockswap.py --- __init__.py | 4 ++-- core/blockswap.py | 6 +++--- main_branch/ComfyUI-MultiGPU | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) delete mode 160000 main_branch/ComfyUI-MultiGPU diff --git a/__init__.py b/__init__.py index 5810450..66cc69f 100644 --- a/__init__.py +++ b/__init__.py @@ -26,7 +26,7 @@ from .nodes import ( WanVideoModelLoader, WanVideoModelLoader_2, WanVideoVAELoader, LoadWanVideoT5TextEncoder, LoadWanVideoClipTextEncoder, WanVideoTextEncode, WanVideoBlockSwap, WanVideoSampler ) -from .core.blockswap import DisTorchBlockSwap +from .core.blockswap import DisTorch current_device = mm.get_torch_device() current_text_encoder_device = mm.text_encoder_device() @@ -584,7 +584,7 @@ def check_module_exists(module_path): NODE_CLASS_MAPPINGS = { "DeviceSelectorMultiGPU": DeviceSelectorMultiGPU, "HunyuanVideoEmbeddingsAdapter": HunyuanVideoEmbeddingsAdapter, - "DisTorchBlockSwap": DisTorchBlockSwap, + "DisTorch": DisTorch, } diff --git a/core/blockswap.py b/core/blockswap.py index 2dcff17..6f666df 100644 --- a/core/blockswap.py +++ b/core/blockswap.py @@ -200,7 +200,7 @@ class BlockSwapManager: logging.info("[BlockSwap] Cleanup complete") -class DisTorchBlockSwap: +class DisTorch: """ComfyUI node for block swap configuration""" @classmethod @@ -250,7 +250,7 @@ class DisTorchBlockSwap: swap_device: str, compute_device: str, use_non_blocking: bool = False): """Apply block swap configuration to model""" - logging.info(f"[DisTorchBlockSwap] Configuring block swap:") + logging.info(f"[DisTorch] Configuring block swap:") logging.info(f" Virtual VRAM: {virtual_vram_gb} GB") logging.info(f" Swap space: {swap_space_gb} GB") logging.info(f" Swap device: {swap_device}") @@ -290,6 +290,6 @@ class DisTorchBlockSwap: if hasattr(model, 'load_device'): model.load_device = config.compute_device - logging.info("[DisTorchBlockSwap] Block swap configuration applied successfully") + logging.info("[DisTorch] Block swap configuration applied successfully") return (model,) diff --git a/main_branch/ComfyUI-MultiGPU b/main_branch/ComfyUI-MultiGPU deleted file mode 160000 index 92a10cc..0000000 --- a/main_branch/ComfyUI-MultiGPU +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 92a10cc6ec1fb4c1389fa356ee47a99393878409