From c7b8e7250d03aaa3b2fc3b3b41f1a852385362e8 Mon Sep 17 00:00:00 2001 From: drhead <1313496+drhead@users.noreply.github.com> Date: Sun, 9 Mar 2025 19:42:19 -0400 Subject: [PATCH] make conds use non-blocking transfers --- comfy/conds.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/comfy/conds.py b/comfy/conds.py index 211fb8d57..775785d37 100644 --- a/comfy/conds.py +++ b/comfy/conds.py @@ -1,6 +1,7 @@ import torch import math import comfy.utils +from comfy.model_management import device_should_use_non_blocking class CONDRegular: @@ -10,8 +11,14 @@ class CONDRegular: def _copy_with(self, cond): return self.__class__(cond) + def _pin_memory(self, cond): + if cond.device == torch.device('cpu'): + return cond.pin_memory() + else: + return cond + def process_cond(self, batch_size, device, **kwargs): - return self._copy_with(comfy.utils.repeat_to_batch_size(self.cond, batch_size).to(device)) + return self._copy_with(comfy.utils.repeat_to_batch_size(self._pin_memory(self.cond), batch_size).to(device, non_blocking=device_should_use_non_blocking(device)) def can_concat(self, other): if self.cond.shape != other.cond.shape: