From a6deca6d9ae36ec60722d66ad5c31cbb05725383 Mon Sep 17 00:00:00 2001 From: comfyanonymous Date: Fri, 21 Feb 2025 20:14:30 -0500 Subject: [PATCH 1/4] Latest mac still has the black image bug. --- comfy/model_management.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comfy/model_management.py b/comfy/model_management.py index 331aa9fd3..86b4727a3 100644 --- a/comfy/model_management.py +++ b/comfy/model_management.py @@ -943,7 +943,7 @@ def force_upcast_attention_dtype(): upcast = args.force_upcast_attention macos_version = mac_version() - if macos_version is not None and ((14, 5) <= macos_version <= (15, 2)): # black image bug on recent versions of macOS + if macos_version is not None and ((14, 5) <= macos_version <= (15, 3)): # black image bug on recent versions of macOS upcast = True if upcast: From 072db3bea6e530ad14c168a94cb83024358ecb9b Mon Sep 17 00:00:00 2001 From: comfyanonymous Date: Fri, 21 Feb 2025 20:24:07 -0500 Subject: [PATCH 2/4] Assume the mac black image bug won't be fixed before v16. --- comfy/model_management.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comfy/model_management.py b/comfy/model_management.py index 86b4727a3..8b6c4a667 100644 --- a/comfy/model_management.py +++ b/comfy/model_management.py @@ -943,7 +943,7 @@ def force_upcast_attention_dtype(): upcast = args.force_upcast_attention macos_version = mac_version() - if macos_version is not None and ((14, 5) <= macos_version <= (15, 3)): # black image bug on recent versions of macOS + if macos_version is not None and ((14, 5) <= macos_version < (16,)): # black image bug on recent versions of macOS upcast = True if upcast: From b50ab153f96fd396ea26a76529f164c5ae3b50a6 Mon Sep 17 00:00:00 2001 From: comfyanonymous Date: Fri, 21 Feb 2025 20:28:28 -0500 Subject: [PATCH 3/4] Bump ComfyUI version to v0.3.15 --- comfyui_version.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/comfyui_version.py b/comfyui_version.py index 6be6f59f0..fc7bb1df8 100644 --- a/comfyui_version.py +++ b/comfyui_version.py @@ -1,3 +1,3 @@ # This file is automatically generated by the build process when version is # updated in pyproject.toml. -__version__ = "0.3.14" +__version__ = "0.3.15" diff --git a/pyproject.toml b/pyproject.toml index a450b9b0c..877ae4d70 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "ComfyUI" -version = "0.3.14" +version = "0.3.15" readme = "README.md" license = { file = "LICENSE" } requires-python = ">=3.9" From aff16532d4505d3df2129802f89309ec6eb4499a Mon Sep 17 00:00:00 2001 From: comfyanonymous Date: Sat, 22 Feb 2025 04:45:14 -0500 Subject: [PATCH 4/4] Remove some useless code. --- comfy/ldm/modules/attention.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/comfy/ldm/modules/attention.py b/comfy/ldm/modules/attention.py index 975faa21f..24fb9d950 100644 --- a/comfy/ldm/modules/attention.py +++ b/comfy/ldm/modules/attention.py @@ -41,27 +41,12 @@ def exists(val): return val is not None -def uniq(arr): - return{el: True for el in arr}.keys() - - def default(val, d): if exists(val): return val return d -def max_neg_value(t): - return -torch.finfo(t.dtype).max - - -def init_(tensor): - dim = tensor.shape[-1] - std = 1 / math.sqrt(dim) - tensor.uniform_(-std, std) - return tensor - - # feedforward class GEGLU(nn.Module): def __init__(self, dim_in, dim_out, dtype=None, device=None, operations=ops):