Merge branch 'comfyanonymous:master' into master

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

View File

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

View File

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

View File

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

View File

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