diff options
| author | ssysm <me@theeditorstudio.com> | 2022-10-09 23:20:39 -0400 |
|---|---|---|
| committer | ssysm <me@theeditorstudio.com> | 2022-10-09 23:20:39 -0400 |
| commit | 6fdad291bd5a5edacedec73cf4d0e3852d00300e (patch) | |
| tree | 5901473f27ea0410728150a1a6f2da373ea949b1 /modules/sd_hijack.py | |
| parent | cc92dc1f8d73dd4d574c4c8ccab78b7fc61e440b (diff) | |
| parent | 45fbd1c5fec887988ab555aac75a999d4f3aff40 (diff) | |
Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into upstream-master
Diffstat (limited to 'modules/sd_hijack.py')
| -rw-r--r-- | modules/sd_hijack.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py index f12a9696..437acce4 100644 --- a/modules/sd_hijack.py +++ b/modules/sd_hijack.py @@ -282,14 +282,12 @@ class FrozenCLIPEmbedderWithCustomWords(torch.nn.Module): remade_batch_tokens_of_same_length = [x + [self.wrapped.tokenizer.eos_token_id] * (target_token_count - len(x)) for x in remade_batch_tokens]
tokens = torch.asarray(remade_batch_tokens_of_same_length).to(device)
- tmp = -opts.CLIP_ignore_last_layers
- if (opts.CLIP_ignore_last_layers == 0):
- outputs = self.wrapped.transformer(input_ids=tokens, position_ids=position_ids)
- z = outputs.last_hidden_state
- else:
- outputs = self.wrapped.transformer(input_ids=tokens, position_ids=position_ids, output_hidden_states=tmp)
- z = outputs.hidden_states[tmp]
+ outputs = self.wrapped.transformer(input_ids=tokens, position_ids=position_ids, output_hidden_states=-opts.CLIP_stop_at_last_layers)
+ if opts.CLIP_stop_at_last_layers > 1:
+ z = outputs.hidden_states[-opts.CLIP_stop_at_last_layers]
z = self.wrapped.transformer.text_model.final_layer_norm(z)
+ else:
+ z = outputs.last_hidden_state
# restoring original mean is likely not correct, but it seems to work well to prevent artifacts that happen otherwise
batch_multipliers_of_same_length = [x + [1.0] * (target_token_count - len(x)) for x in batch_multipliers]
|