From 98f4bb8a37a56dab1be8e6731a6a646291627e55 Mon Sep 17 00:00:00 2001 From: LeagueRaINi Date: Sat, 11 May 2024 20:21:23 +0200 Subject: [PATCH] fix: merge --- comfy/model_management.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/comfy/model_management.py b/comfy/model_management.py index da0f1d769..0d4a9265f 100644 --- a/comfy/model_management.py +++ b/comfy/model_management.py @@ -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.")