xinyun/ComfyUI
1
0
Fork 0
mirror of https://git.datalinker.icu/comfyanonymous/ComfyUI synced 2026-11-13 00:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge

Browse Source
This commit is contained in:
LeagueRaINi 2024-05-11 20:21:23 +02:00
parent 0c745430df
commit 98f4bb8a37
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
comfy/model_management.py
View File

@ -253,7 +253,6 @@ def get_torch_device_name(device):
return "CUDA {}: {}".format(device, torch.cuda.get_device_name(device))
try:
<<<<<<< HEAD
torch_device_name = get_torch_device_name(get_torch_device())
if "[ZLUDA]" in torch_device_name:
@ -268,9 +267,6 @@ try:
torch.backends.cuda.enable_mem_efficient_sdp(False)
print("Device:", torch_device_name)
=======
logging.info("Device: {}".format(get_torch_device_name(get_torch_device())))
>>>>>>> upstream/master
except:
logging.warning("Could not pick default device.")