diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-08-28 12:03:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-28 12:03:46 +0000 |
| commit | 9e14cac3182b53173f1c356f2f13bd1cb0cedc89 (patch) | |
| tree | 12b4e04a8f17c4275c26bc23870cab0535e053e0 /modules/sd_hijack_clip.py | |
| parent | f898833ea38718e87b39ab090b2a2325638559cb (diff) | |
| parent | 8632452627e1341bcd447dbec3c1516f319200a0 (diff) | |
| download | stable-diffusion-webui-gfx803-9e14cac3182b53173f1c356f2f13bd1cb0cedc89.tar.gz stable-diffusion-webui-gfx803-9e14cac3182b53173f1c356f2f13bd1cb0cedc89.tar.bz2 stable-diffusion-webui-gfx803-9e14cac3182b53173f1c356f2f13bd1cb0cedc89.zip | |
Merge branch 'dev' into patch-1
Diffstat (limited to 'modules/sd_hijack_clip.py')
| -rw-r--r-- | modules/sd_hijack_clip.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/sd_hijack_clip.py b/modules/sd_hijack_clip.py index 16a5500e..8f29057a 100644 --- a/modules/sd_hijack_clip.py +++ b/modules/sd_hijack_clip.py @@ -161,7 +161,7 @@ class FrozenCLIPEmbedderWithCustomWordsBase(torch.nn.Module): position += 1
continue
- emb_len = int(embedding.vec.shape[0])
+ emb_len = int(embedding.vectors)
if len(chunk.tokens) + emb_len > self.chunk_length:
next_chunk()
@@ -245,6 +245,8 @@ class FrozenCLIPEmbedderWithCustomWordsBase(torch.nn.Module): hashes.append(f"{name}: {shorthash}")
if hashes:
+ if self.hijack.extra_generation_params.get("TI hashes"):
+ hashes.append(self.hijack.extra_generation_params.get("TI hashes"))
self.hijack.extra_generation_params["TI hashes"] = ", ".join(hashes)
if getattr(self.wrapped, 'return_pooled', False):
|