298977887/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-01-25 15:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some potential issues with the previous commits.

Browse Source
This commit is contained in:
comfyanonymous 2024-08-12 00:23:29 -04:00
parent 9acfe4df41
commit ad76574cb8
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
comfy/model_management.py
View File

@ -688,6 +688,9 @@ 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 offload_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:

3
comfy/sd.py
View File

@ -79,6 +79,9 @@ class CLIP:
for dt in self.cond_stage_model.dtypes: for dt in self.cond_stage_model.dtypes:
if not model_management.supports_cast(load_device, dt): if not model_management.supports_cast(load_device, dt):
load_device = offload_device load_device = offload_device
if params['device'] != offload_device:
self.cond_stage_model.to(offload_device)
logging.warning("Had to shift TE back.")
self.tokenizer = tokenizer(embedding_directory=embedding_directory, tokenizer_data=tokenizer_data) self.tokenizer = tokenizer(embedding_directory=embedding_directory, tokenizer_data=tokenizer_data)
self.patcher = comfy.model_patcher.ModelPatcher(self.cond_stage_model, load_device=load_device, offload_device=offload_device) self.patcher = comfy.model_patcher.ModelPatcher(self.cond_stage_model, load_device=load_device, offload_device=offload_device)