From 7ae662672321e01c8ebc7f75024c1634e85cfd61 Mon Sep 17 00:00:00 2001 From: comfyanonymous Date: Sat, 12 Oct 2024 07:16:21 -0400 Subject: [PATCH 1/3] Remove useless argument. --- comfy/sd1_clip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comfy/sd1_clip.py b/comfy/sd1_clip.py index 9f0d95b0a..bb240526f 100644 --- a/comfy/sd1_clip.py +++ b/comfy/sd1_clip.py @@ -80,7 +80,7 @@ class SDClipModel(torch.nn.Module, ClipTokenWeightEncoder): "pooled", "hidden" ] - def __init__(self, version="openai/clip-vit-large-patch14", device="cpu", max_length=77, + def __init__(self, device="cpu", max_length=77, freeze=True, layer="last", layer_idx=None, textmodel_json_config=None, dtype=None, model_class=comfy.clip_model.CLIPTextModel, special_tokens={"start": 49406, "end": 49407, "pad": 49407}, layer_norm_hidden_state=True, enable_attention_masks=False, zero_out_masked=False, return_projected_pooled=True, return_attention_masks=False, model_options={}): # clip-vit-base-patch32 From 3c60ecd7a83da43d694e26a77ca6b93106891251 Mon Sep 17 00:00:00 2001 From: comfyanonymous Date: Sat, 12 Oct 2024 14:10:13 -0400 Subject: [PATCH 2/3] Fix fp8 ops staying enabled. --- comfy/supported_models_base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/comfy/supported_models_base.py b/comfy/supported_models_base.py index 68e895519..e2b70e694 100644 --- a/comfy/supported_models_base.py +++ b/comfy/supported_models_base.py @@ -72,6 +72,7 @@ class BASE: self.unet_config = unet_config.copy() self.sampling_settings = self.sampling_settings.copy() self.latent_format = self.latent_format() + self.optimizations = self.optimizations.copy() for x in self.unet_extra_config: self.unet_config[x] = self.unet_extra_config[x] From 191a0d56b4fc167d5852c0b936964b198c02cc0c Mon Sep 17 00:00:00 2001 From: comfyanonymous Date: Sun, 13 Oct 2024 06:59:31 -0400 Subject: [PATCH 3/3] Switch default packaging workflows to python 3.12 --- .github/workflows/stable-release.yml | 4 ++-- .github/workflows/windows_release_dependencies.yml | 4 ++-- .github/workflows/windows_release_package.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml index e5444d367..0bdd5a3bd 100644 --- a/.github/workflows/stable-release.yml +++ b/.github/workflows/stable-release.yml @@ -17,12 +17,12 @@ on: description: 'Python minor version' required: true type: string - default: "11" + default: "12" python_patch: description: 'Python patch version' required: true type: string - default: "9" + default: "7" jobs: diff --git a/.github/workflows/windows_release_dependencies.yml b/.github/workflows/windows_release_dependencies.yml index 8d3a8665d..6428891ee 100644 --- a/.github/workflows/windows_release_dependencies.yml +++ b/.github/workflows/windows_release_dependencies.yml @@ -23,13 +23,13 @@ on: description: 'python minor version' required: true type: string - default: "11" + default: "12" python_patch: description: 'python patch version' required: true type: string - default: "9" + default: "7" # push: # branches: # - master diff --git a/.github/workflows/windows_release_package.yml b/.github/workflows/windows_release_package.yml index 84d99b8a6..11e724ba7 100644 --- a/.github/workflows/windows_release_package.yml +++ b/.github/workflows/windows_release_package.yml @@ -13,13 +13,13 @@ on: description: 'python minor version' required: true type: string - default: "11" + default: "12" python_patch: description: 'python patch version' required: true type: string - default: "9" + default: "7" # push: # branches: # - master