wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-02-10 21:42:37 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge branch 'comfyanonymous:master' into feature/settings

Browse Source
This commit is contained in:
Dr.Lt.Data 2023-06-25 09:27:02 +09:00 committed by GitHub
commit c13ad202bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
comfy/ldm/modules/attention.py
View File

@ -565,7 +565,10 @@ class BasicTransformerBlock(nn.Module):
for p in patch: for p in patch:
n, context_attn1, value_attn1 = p(n, context_attn1, value_attn1, extra_options) n, context_attn1, value_attn1 = p(n, context_attn1, value_attn1, extra_options)
transformer_block = (block[0], block[1], block_index) if block is not None:
transformer_block = (block[0], block[1], block_index)
else:
transformer_block = None
attn1_replace_patch = transformer_patches_replace.get("attn1", {}) attn1_replace_patch = transformer_patches_replace.get("attn1", {})
block_attn1 = transformer_block block_attn1 = transformer_block
if block_attn1 not in attn1_replace_patch: if block_attn1 not in attn1_replace_patch:

15
comfy/sd.py
View File

@ -961,12 +961,19 @@ def load_style_model(ckpt_path):
def load_clip(ckpt_path, embedding_directory=None): def load_clip(ckpt_path, embedding_directory=None):
clip_data = utils.load_torch_file(ckpt_path, safe_load=True) clip_data = utils.load_torch_file(ckpt_path, safe_load=True)
config = {} class EmptyClass:
pass
clip_target = EmptyClass()
clip_target.params = {}
if "text_model.encoder.layers.22.mlp.fc1.weight" in clip_data: if "text_model.encoder.layers.22.mlp.fc1.weight" in clip_data:
config['target'] = 'comfy.ldm.modules.encoders.modules.FrozenOpenCLIPEmbedder' clip_target.clip = sd2_clip.SD2ClipModel
clip_target.tokenizer = sd2_clip.SD2Tokenizer
else: else:
config['target'] = 'comfy.ldm.modules.encoders.modules.FrozenCLIPEmbedder' clip_target.clip = sd1_clip.SD1ClipModel
clip = CLIP(config=config, embedding_directory=embedding_directory) clip_target.tokenizer = sd1_clip.SD1Tokenizer
clip = CLIP(clip_target, embedding_directory=embedding_directory)
clip.load_from_state_dict(clip_data) clip.load_from_state_dict(clip_data)
return clip return clip