LeagueRaINi
commented
7 months ago Ok so i got comfy working, havent tested much beside the basic node layout but here is what i did
here is the code i added to comfy/model_management.py, the torch.backends.cuda.enable_ ones are copied from what vlad does
@@ -194,11 +194,10 @@ if args.fp16_vae:
elif args.bf16_vae:
VAE_DTYPE = torch.bfloat16
elif args.fp32_vae:
VAE_DTYPE = torch.float32
-
if ENABLE_PYTORCH_ATTENTION:
torch.backends.cuda.enable_math_sdp(True)
torch.backends.cuda.enable_flash_sdp(True)
torch.backends.cuda.enable_mem_efficient_sdp(True)
@@ -222,11 +221,10 @@ if args.force_fp16:
if lowvram_available:
if set_vram_to in (VRAMState.LOW_VRAM, VRAMState.NO_VRAM):
vram_state = set_vram_to
-
if cpu_state != CPUState.GPU:
vram_state = VRAMState.DISABLED
if cpu_state == CPUState.MPS:
vram_state = VRAMState.SHARED
@@ -252,11 +250,28 @@ def get_torch_device_name(device):
return "{} {}".format(device, torch.xpu.get_device_name(device))
else:
return "CUDA {}: {}".format(device, torch.cuda.get_device_name(device))
try:
- print("Device:", get_torch_device_name(get_torch_device()))
+ torch_device_name = get_torch_device_name(get_torch_device())
+
+ if "[ZLUDA]" in torch_device_name:
+ print("Detected ZLUDA, this is experimental and may not work properly.")
+
+ if torch.backends.cudnn.enabled:
+ torch.backends.cudnn.enabled = False
+ print("cuDNN is disabled because ZLUDA does currently not support it.")
+
+ torch.backends.cuda.enable_flash_sdp(True)
+ torch.backends.cuda.enable_math_sdp(False)
+ torch.backends.cuda.enable_mem_efficient_sdp(False)
+
+ if ENABLE_PYTORCH_ATTENTION:
+ print("Disabling pytorch cross attention because it's not supported by ZLUDA.")
+ ENABLE_PYTORCH_ATTENTION = False
+
+ print("Device:", torch_device_name)
except:
print("Could not pick default device.")
print("VAE dtype:", VAE_DTYPE)note that it is still required to run comfy with --disable-cuda-malloc, a simple check for non nvidia cards here is probably enough to not need the arg?
@@ -48,11 +48,13 @@ def cuda_malloc_supported():
try:
names = get_gpu_names()
except:
names = set()
for x in names:
- if "NVIDIA" in x:
+ if "AMD" in x:
+ return False
+ elif "NVIDIA" in x:
for b in blacklist:
if b in x:
return False
return True
Andyholm
CraftMaster163
GUUser91
brknsoul
uuzp
patientx
VeteranXT
Kagamine-Rinrin
any chance we will be seeing zluda support for comfy? automatic runs fine for the most part but its not as nice as comfy to work with
so far when forking the repo and applying the same steps as for automatic https://github.com/vladmandic/automatic/wiki/ZLUDA
running it with
--disable-cuda-malloccrashes the driver, running it with--disable-cuda-malloc --use-quad-cross-attentiongets further but errors out when when sampling