From ee41f46beb0dfe5b221d2791d88ebce0d0b39df0 Mon Sep 17 00:00:00 2001 From: John Pollock Date: Sat, 4 Oct 2025 06:47:08 -0500 Subject: [PATCH] revert most changes --- __init__.py | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/__init__.py b/__init__.py index f9a1795..70cd537 100644 --- a/__init__.py +++ b/__init__.py @@ -64,7 +64,7 @@ def set_current_text_encoder_device(device): """Set the current text encoder device context for CLIP models.""" global current_text_encoder_device current_text_encoder_device = device - logger.info(f"[MultiGPU Initialization] current_text_encoder_device set to: {device}") + logger.debug(f"[MultiGPU Initialization] current_text_encoder_device set to: {device}") def get_torch_device_patched(): """Return MultiGPU-aware device selection for patched mm.get_torch_device.""" @@ -77,37 +77,22 @@ def get_torch_device_patched(): logger.debug(f"[MultiGPU Core Patching] get_torch_device_patched returning device: {device} (current_device={current_device})") return device -def _get_patched_text_encoder_device(): - """Internal helper to get the patched text encoder device.""" +def text_encoder_device_patched(): + """Return MultiGPU-aware text encoder device for patched mm.text_encoder_device.""" device = None if (not is_accelerator_available() or mm.cpu_state == mm.CPUState.CPU or "cpu" in str(current_text_encoder_device).lower()): device = torch.device("cpu") - logger.info(f"[_get_patched_text_encoder_device] Condition met: accelerator not available, CPU state, or 'cpu' in current device. Returning CPU.") else: devs = set(get_device_list()) - is_current_in_devs = str(current_text_encoder_device) in devs - device = torch.device(current_text_encoder_device) if is_current_in_devs else torch.device("cpu") - logger.info(f"[_get_patched_text_encoder_device] Available devices: {devs}. Current text encoder device: {current_text_encoder_device}. Is in list: {is_current_in_devs}. Returning: {device}") - return device - -def text_encoder_device_patched(): - """Return MultiGPU-aware text encoder device for patched mm.text_encoder_device.""" - device = _get_patched_text_encoder_device() + device = torch.device(current_text_encoder_device) if str(current_text_encoder_device) in devs else torch.device("cpu") logger.info(f"[MultiGPU Core Patching] text_encoder_device_patched returning device: {device} (current_text_encoder_device={current_text_encoder_device})") return device -def text_encoder_initial_device_patched(load_device, offload_device, model_size=0): - """Return MultiGPU-aware initial text encoder device for patched mm.text_encoder_initial_device.""" - device = _get_patched_text_encoder_device() - logger.info(f"[MultiGPU Core Patching] text_encoder_initial_device_patched returning device: {device} (ignoring original args: load_device='{load_device}', offload_device='{offload_device}', model_size='{model_size}')") - return device - -logger.info(f"[MultiGPU Core Patching] Patching mm.get_torch_device, mm.text_encoder_device, and mm.text_encoder_initial_device") -logger.info(f"[MultiGPU INFO] Initial current_device: {current_device}") -logger.info(f"[MultiGPU INFO] Initial current_text_encoder_device: {current_text_encoder_device}") +logger.info(f"[MultiGPU Core Patching] Patching mm.get_torch_device and mm.text_encoder_device") +logger.info(f"[MultiGPU DEBUG] Initial current_device: {current_device}") +logger.info(f"[MultiGPU DEBUG] Initial current_text_encoder_device: {current_text_encoder_device}") mm.get_torch_device = get_torch_device_patched mm.text_encoder_device = text_encoder_device_patched -mm.text_encoder_initial_device = text_encoder_initial_device_patched from .nodes import ( DeviceSelectorMultiGPU, @@ -304,4 +289,4 @@ for item in registration_data: logger.info(fmt_reg.format(item['name'], item['found'], str(item['count']))) logger.info(dash_line) -logger.info(f"[MultiGPU] Registration complete. Final mappings: {', '.join(NODE_CLASS_MAPPINGS.keys())}") +logger.info(f"[MultiGPU] Registration complete. Final mappings: {', '.join(NODE_CLASS_MAPPINGS.keys())}") \ No newline at end of file