diff options
| author | JaredTherriault <noirjt@live.com> | 2023-09-04 17:29:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-04 17:29:33 -0700 |
| commit | 5e16914a4e157ab3ed96f8b7841e1290a56f4484 (patch) | |
| tree | 655f4582e692f0fc3667b3b668ad365ac3ab92ae /modules/sd_hijack_clip.py | |
| parent | 8f3b02f09535f55d3673aa9ea589396b8614f799 (diff) | |
| parent | 5ef669de080814067961f28357256e8fe27544f4 (diff) | |
Merge branch 'AUTOMATIC1111:master' into master
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):
|