Skip to content

Commit 19a64d6

Browse files
Cleanup some mac related code.
1 parent b486885 commit 19a64d6

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

comfy/model_management.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -969,17 +969,13 @@ def should_use_fp16(device=None, model_params=0, prioritize_performance=True, ma
969969
if FORCE_FP16:
970970
return True
971971

972-
if device is not None:
973-
if is_device_mps(device):
974-
return True
975-
976972
if FORCE_FP32:
977973
return False
978974

979975
if directml_enabled:
980976
return False
981977

982-
if mps_mode():
978+
if (device is not None and is_device_mps(device)) or mps_mode():
983979
return True
984980

985981
if cpu_mode():
@@ -1028,17 +1024,13 @@ def should_use_bf16(device=None, model_params=0, prioritize_performance=True, ma
10281024
if is_device_cpu(device): #TODO ? bf16 works on CPU but is extremely slow
10291025
return False
10301026

1031-
if device is not None:
1032-
if is_device_mps(device):
1033-
return True
1034-
10351027
if FORCE_FP32:
10361028
return False
10371029

10381030
if directml_enabled:
10391031
return False
10401032

1041-
if mps_mode():
1033+
if (device is not None and is_device_mps(device)) or mps_mode():
10421034
if mac_version() < (14,):
10431035
return False
10441036
return True

0 commit comments

Comments
 (0)