The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Add xpu version for async offload and some other things. (#9004)
Simon Lui255f1398638b
diff --git a/comfy/model_management.py b/comfy/model_management.pyindex 816caf18f..ab1e9bf3a 100644--- a/comfy/model_management.py+++ b/comfy/model_management.py@@ -101,7 +101,7 @@ if args.directml is not None:lowvram_available = False #TODO: need to find a way to get free memory in directml before this can be enabled by default.try:- import intel_extension_for_pytorch as ipex+ import intel_extension_for_pytorch as ipex # noqa: F401_ = torch.xpu.device_count()xpu_available = xpu_available or torch.xpu.is_available()except:@@ -186,8 +186,12 @@ def get_total_memory(dev=None, torch_total_too=False):elif is_intel_xpu():stats = torch.xpu.memory_stats(dev)mem_reserved = stats['reserved_bytes.all.current']+ if torch_version_numeric < (2, 6):+ mem_total_xpu = torch.xpu.get_device_properties(dev).total_memory+ else:+ _, mem_total_xpu = torch.xpu.mem_get_info(dev)mem_total_torch = mem_reserved- mem_total = torch.xpu.get_device_properties(dev).total_memory+ mem_total = mem_total_xpuelif is_ascend_npu():stats = torch.npu.memory_stats(dev)mem_reserved = stats['reserved_bytes.all.current']@@ -929,7 +933,7 @@ def device_supports_non_blocking(device):if is_device_mps(device):return False #pytorch bug? mps doesn't support non blockingif is_intel_xpu():- return False+ return Trueif args.deterministic: #TODO: figure out why deterministic breaks non blocking from gpu to cpu (previews)return Falseif directml_enabled:@@ -968,6 +972,8 @@ def get_offload_stream(device):stream_counter = (stream_counter + 1) % len(ss)if is_device_cuda(device):ss[stream_counter].wait_stream(torch.cuda.current_stream())+ elif is_device_xpu(device):+ ss[stream_counter].wait_stream(torch.xpu.current_stream())stream_counters[device] = stream_counterreturn selif is_device_cuda(device):@@ -979,6 +985,15 @@ def get_offload_stream(device):stream_counter = (stream_counter + 1) % len(ss)stream_counters[device] = stream_counterreturn s+ elif is_device_xpu(device):+ ss = []+ for k in range(NUM_STREAMS):+ ss.append(torch.xpu.Stream(device=device, priority=0))+ STREAMS[device] = ss+ s = ss[stream_counter]+ stream_counter = (stream_counter + 1) % len(ss)+ stream_counters[device] = stream_counter+ return sreturn Nonedef sync_stream(device, stream):@@ -986,6 +1001,8 @@ def sync_stream(device, stream):returnif is_device_cuda(device):torch.cuda.current_stream().wait_stream(stream)+ elif is_device_xpu(device):+ torch.xpu.current_stream().wait_stream(stream)def cast_to(weight, dtype=None, device=None, non_blocking=False, copy=False, stream=None):if device is None or weight.device == device:@@ -1092,8 +1109,11 @@ def get_free_memory(dev=None, torch_free_too=False):stats = torch.xpu.memory_stats(dev)mem_active = stats['active_bytes.all.current']mem_reserved = stats['reserved_bytes.all.current']+ if torch_version_numeric < (2, 6):+ mem_free_xpu = torch.xpu.get_device_properties(dev).total_memory - mem_reserved+ else:+ mem_free_xpu, _ = torch.xpu.mem_get_info(dev)mem_free_torch = mem_reserved - mem_active- mem_free_xpu = torch.xpu.get_device_properties(dev).total_memory - mem_reservedmem_free_total = mem_free_xpu + mem_free_torchelif is_ascend_npu():stats = torch.npu.memory_stats(dev)@@ -1142,6 +1162,9 @@ def is_device_cpu(device):def is_device_mps(device):return is_device_type(device, 'mps')+def is_device_xpu(device):+ return is_device_type(device, 'xpu')+def is_device_cuda(device):return is_device_type(device, 'cuda')@@ -1173,7 +1196,10 @@ def should_use_fp16(device=None, model_params=0, prioritize_performance=True, mareturn Falseif is_intel_xpu():- return True+ if torch_version_numeric < (2, 3):+ return True+ else:+ return torch.xpu.get_device_properties(device).has_fp16if is_ascend_npu():return True@@ -1236,7 +1262,10 @@ def should_use_bf16(device=None, model_params=0, prioritize_performance=True, mareturn Falseif is_intel_xpu():- return True+ if torch_version_numeric < (2, 6):+ return True+ else:+ return torch.xpu.get_device_capability(device)['has_bfloat16_conversions']if is_ascend_npu():return True