diff options
author | AUTOMATIC <16777216c@gmail.com> | 2022-10-21 10:34:48 +0000 |
---|---|---|
committer | AUTOMATIC <16777216c@gmail.com> | 2022-10-21 10:35:01 +0000 |
commit | 7d6b388d71e5854c48847c09b2dfed683b377027 (patch) | |
tree | 35d1ef42a993387f995955ce36dba7b86e081370 /modules/sd_models.py | |
parent | bf30673f5132c8f28357b31224c54331e788d3e7 (diff) | |
parent | 2362d5f00eeecbe6a6f67fe6085da01a3d78e407 (diff) | |
download | stable-diffusion-webui-gfx803-7d6b388d71e5854c48847c09b2dfed683b377027.tar.gz stable-diffusion-webui-gfx803-7d6b388d71e5854c48847c09b2dfed683b377027.tar.bz2 stable-diffusion-webui-gfx803-7d6b388d71e5854c48847c09b2dfed683b377027.zip |
Merge branch 'ae'
Diffstat (limited to 'modules/sd_models.py')
-rw-r--r-- | modules/sd_models.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/sd_models.py b/modules/sd_models.py index fea84630..05a1df28 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -21,7 +21,7 @@ checkpoints_loaded = collections.OrderedDict() try:
# this silences the annoying "Some weights of the model checkpoint were not used when initializing..." message at start.
- from transformers import logging
+ from transformers import logging, CLIPModel
logging.set_verbosity_error()
except Exception:
@@ -234,6 +234,9 @@ def load_model(checkpoint_info=None): sd_hijack.model_hijack.hijack(sd_model)
+ if shared.clip_model is None or shared.clip_model.transformer.name_or_path != sd_model.cond_stage_model.wrapped.transformer.name_or_path:
+ shared.clip_model = CLIPModel.from_pretrained(sd_model.cond_stage_model.wrapped.transformer.name_or_path)
+
sd_model.eval()
print(f"Model loaded.")
|