Merge branch 'comfyanonymous:master' into master

This commit is contained in:
patientx 2024-12-12 15:26:42 +03:00 committed by GitHub
commit 5d059779d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -594,7 +594,7 @@ def unet_offload_device():
def unet_inital_load_device(parameters, dtype):
torch_dev = get_torch_device()
if vram_state == VRAMState.HIGH_VRAM:
if vram_state == VRAMState.HIGH_VRAM or vram_state == VRAMState.SHARED:
return torch_dev
cpu_dev = torch.device("cpu")
@ -708,7 +708,7 @@ def text_encoder_initial_device(load_device, offload_device, model_size=0):
return offload_device
if is_device_mps(load_device):
return offload_device
return load_device
mem_l = get_free_memory(load_device)
mem_o = get_free_memory(offload_device)