mirrors/Fooocus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try fix #1671 (#1678)

Browse Source
This commit is contained in:
lllyasviel 2023-12-31 03:38:16 -08:00 committed by GitHub
parent 8e62a72a63
commit 2521af308b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
extras/ip_adapter.py
View File

@ -2,12 +2,13 @@ import torch
import ldm_patched.modules.clip_vision import ldm_patched.modules.clip_vision
import safetensors.torch as sf import safetensors.torch as sf
import ldm_patched.modules.model_management as model_management import ldm_patched.modules.model_management as model_management
import contextlib
import ldm_patched.ldm.modules.attention as attention import ldm_patched.ldm.modules.attention as attention
from extras.resampler import Resampler from extras.resampler import Resampler
from ldm_patched.modules.model_patcher import ModelPatcher from ldm_patched.modules.model_patcher import ModelPatcher
from modules.core import numpy_to_pytorch from modules.core import numpy_to_pytorch
from modules.ops import use_patched_ops
from ldm_patched.modules.ops import manual_cast
SD_V12_CHANNELS = [320] * 4 + [640] * 4 + [1280] * 4 + [1280] * 6 + [640] * 6 + [320] * 6 + [1280] * 2 SD_V12_CHANNELS = [320] * 4 + [640] * 4 + [1280] * 4 + [1280] * 6 + [640] * 6 + [320] * 6 + [1280] * 2
@ -116,14 +117,16 @@ def load_ip_adapter(clip_vision_path, ip_negative_path, ip_adapter_path):
clip_extra_context_tokens = ip_state_dict["image_proj"]["proj.weight"].shape[0] // cross_attention_dim clip_extra_context_tokens = ip_state_dict["image_proj"]["proj.weight"].shape[0] // cross_attention_dim
clip_embeddings_dim = None clip_embeddings_dim = None
ip_adapter = IPAdapterModel( with use_patched_ops(manual_cast):
ip_state_dict, ip_adapter = IPAdapterModel(
plus=plus, ip_state_dict,
cross_attention_dim=cross_attention_dim, plus=plus,
clip_embeddings_dim=clip_embeddings_dim, cross_attention_dim=cross_attention_dim,
clip_extra_context_tokens=clip_extra_context_tokens, clip_embeddings_dim=clip_embeddings_dim,
sdxl_plus=sdxl_plus clip_extra_context_tokens=clip_extra_context_tokens,
) sdxl_plus=sdxl_plus
)
ip_adapter.sdxl = sdxl ip_adapter.sdxl = sdxl
ip_adapter.load_device = load_device ip_adapter.load_device = load_device
ip_adapter.offload_device = offload_device ip_adapter.offload_device = offload_device

2
fooocus_version.py
View File

@ -1 +1 @@
version = '2.1.857' version = '2.1.858'