diff --git a/comfy/conds.py b/comfy/conds.py index 2af2a43a3..6a23ef4bb 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_supports_non_blocking class CONDRegular: @@ -10,8 +11,13 @@ class CONDRegular: def _copy_with(self, cond): return self.__class__(cond) + def _pin_cond(self, device): + if self.cond.device == torch.device('cpu') and device_supports_non_blocking(device): + self.cond = self.cond.pin_memory(device) + def process_cond(self, batch_size, device, **kwargs): - return self._copy_with(comfy.utils.repeat_to_batch_size(self.cond, batch_size).to(device)) + self._pin_cond(device) + return self._copy_with(comfy.utils.repeat_to_batch_size(self.cond.to(device, non_blocking=device_supports_non_blocking(device)), batch_size)) def can_concat(self, other): if self.cond.shape != other.cond.shape: