wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-04-14 20:42:31 +08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge e1ec301db3 into a500f1edac

Browse Source
This commit is contained in:
tashiscool 2026-03-29 08:51:24 +00:00 committed by GitHub
commit 6f5006194c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
comfy/model_management.py
View File

@ -460,7 +460,7 @@ if cpu_state != CPUState.GPU:
vram_state = VRAMState.DISABLED vram_state = VRAMState.DISABLED
if cpu_state == CPUState.MPS: if cpu_state == CPUState.MPS:
vram_state = VRAMState.SHARED vram_state = VRAMState.NORMAL_VRAM
logging.info(f"Set vram state to: {vram_state.name}") logging.info(f"Set vram state to: {vram_state.name}")
@ -900,7 +900,7 @@ def unet_inital_load_device(parameters, dtype):
return cpu_dev return cpu_dev
torch_dev = get_torch_device() torch_dev = get_torch_device()
if vram_state == VRAMState.HIGH_VRAM or vram_state == VRAMState.SHARED: if vram_state == VRAMState.HIGH_VRAM:
return torch_dev return torch_dev
if DISABLE_SMART_MEMORY or vram_state == VRAMState.NO_VRAM: if DISABLE_SMART_MEMORY or vram_state == VRAMState.NO_VRAM:
@ -1019,9 +1019,6 @@ def text_encoder_initial_device(load_device, offload_device, model_size=0):
if load_device == offload_device or model_size <= 1024 * 1024 * 1024: if load_device == offload_device or model_size <= 1024 * 1024 * 1024:
return offload_device return offload_device
if is_device_mps(load_device):
return load_device
mem_l = get_free_memory(load_device) mem_l = get_free_memory(load_device)
mem_o = get_free_memory(offload_device) mem_o = get_free_memory(offload_device)
if mem_l > (mem_o * 0.5) and model_size * 1.2 < mem_l: if mem_l > (mem_o * 0.5) and model_size * 1.2 < mem_l: