wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-01-26 06:10:15 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge branch 'comfyanonymous:master' into master

Browse Source
This commit is contained in:
patientx 2025-01-15 23:33:05 +03:00 committed by GitHub
commit fb0d92b160
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/stable-release.yml vendored
View File

@ -22,7 +22,7 @@ on:
description: 'Python patch version' description: 'Python patch version'
required: true required: true
type: string type: string
default: "7" default: "8"
jobs: jobs:

2
.github/workflows/windows_release_dependencies.yml vendored
View File

@ -29,7 +29,7 @@ on:
description: 'python patch version' description: 'python patch version'
required: true required: true
type: string type: string
default: "7" default: "8"
# push: # push:
# branches: # branches:
# - master # - master

2
.github/workflows/windows_release_package.yml vendored
View File

@ -19,7 +19,7 @@ on:
description: 'python patch version' description: 'python patch version'
required: true required: true
type: string type: string
default: "7" default: "8"
# push: # push:
# branches: # branches:
# - master # - master

11
comfy/sd1_clip.py
View File

@ -388,13 +388,10 @@ def load_embed(embedding_name, embedding_directory, embedding_size, embed_key=No
import safetensors.torch import safetensors.torch
embed = safetensors.torch.load_file(embed_path, device="cpu") embed = safetensors.torch.load_file(embed_path, device="cpu")
else: else:
if 'weights_only' in torch.load.__code__.co_varnames: try:
try: embed = torch.load(embed_path, weights_only=True, map_location="cpu")
embed = torch.load(embed_path, weights_only=True, map_location="cpu") except:
except: embed_out = safe_load_embed_zip(embed_path)
embed_out = safe_load_embed_zip(embed_path)
else:
embed = torch.load(embed_path, map_location="cpu")
except Exception: except Exception:
logging.warning("{}\n\nerror loading embedding, skipping loading: {}".format(traceback.format_exc(), embedding_name)) logging.warning("{}\n\nerror loading embedding, skipping loading: {}".format(traceback.format_exc(), embedding_name))
return None return None