From 711bb1bae0de0448a46d9bfcba365f377bf23a0e Mon Sep 17 00:00:00 2001 From: Jedrzej Kosinski Date: Fri, 22 May 2026 19:55:50 -0700 Subject: [PATCH] Simplify aimdo init call - drop redundant type/index filter get_all_torch_devices() only enumerates one vendor at a time (the is_nvidia/is_intel_xpu/is_ascend_npu branches are exclusive and each constructs devices via torch.device("type", i) with a real integer index), and aimdo_control.init_devices short-circuits on lib is None before iterating, so the d.type == "cuda" and d.index is not None filter cannot ever change the result. Match master's trust level and just pass the indices directly. Reduces the divergence from master to a single line: init_device(get_torch_device().index) -> init_devices(d.index for d in get_all_torch_devices()) Amp-Thread-ID: https://ampcode.com/threads/T-019e52b4-31ee-72cd-996b-64ecd9420e13 Co-authored-by: Amp --- main.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/main.py b/main.py index b1a19c7bf..fe824439c 100644 --- a/main.py +++ b/main.py @@ -218,10 +218,7 @@ import comfy.model_patcher if args.enable_dynamic_vram or (enables_dynamic_vram() and comfy.model_management.is_nvidia() and not comfy.model_management.is_wsl()): if (not args.enable_dynamic_vram) and (comfy.model_management.torch_version_numeric < (2, 8)): logging.warning("Unsupported Pytorch detected. DynamicVRAM support requires Pytorch version 2.8 or later. Falling back to legacy ModelPatcher. VRAM estimates may be unreliable especially on Windows") - elif comfy_aimdo.control.init_devices( - d.index for d in comfy.model_management.get_all_torch_devices() - if d.type == "cuda" and d.index is not None - ): + elif comfy_aimdo.control.init_devices(d.index for d in comfy.model_management.get_all_torch_devices()): if args.verbose == 'DEBUG': comfy_aimdo.control.set_log_debug() elif args.verbose == 'CRITICAL':