From 1c793e83577bcfdc97d87968fcc783a5a60f22ac Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Fri, 10 May 2024 16:35:36 -0400 Subject: [PATCH] fix embeddings load --- CHANGELOG.md | 2 +- modules/sd_models.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39543e72c..44e69893e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,6 @@ - PixArt-Σ - IP adapter masking - InstantStyle -- ### Note @@ -166,6 +165,7 @@ it is time to give credit to original [author](https://github.com/auTOMATIC1111) - Control module restore button full functionality - Control improved handling with multiple control units and different init images - Control add correct metadata to image + - Time embeddings load part of model load - A1111 update OptionInfo properties - MOTD exception handling - Notifications not triggering diff --git a/modules/sd_models.py b/modules/sd_models.py index b1841e6c7..e6d842fac 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -1129,12 +1129,6 @@ def load_diffuser(checkpoint_info=None, already_loaded_state_dict=None, timer=No sd_model.set_progress_bar_config(bar_format='Progress {rate_fmt}{postfix} {bar} {percentage:3.0f}% {n_fmt}/{total_fmt} {elapsed} {remaining}', ncols=80, colour='#327fba') sd_unet.load_unet(sd_model) - - from modules.textual_inversion import textual_inversion - sd_model.embedding_db = textual_inversion.EmbeddingDatabase() - sd_model.embedding_db.add_embedding_dir(shared.opts.embeddings_dir) - sd_model.embedding_db.load_textual_inversion_embeddings(force_reload=True) - set_diffuser_options(sd_model, vae, op) if op == 'refiner' and shared.opts.diffusers_move_refiner: @@ -1160,8 +1154,14 @@ def load_diffuser(checkpoint_info=None, already_loaded_state_dict=None, timer=No model_data.sd_refiner = sd_model else: model_data.sd_model = sd_model - timer.record("load") + + from modules.textual_inversion import textual_inversion + sd_model.embedding_db = textual_inversion.EmbeddingDatabase() + sd_model.embedding_db.add_embedding_dir(shared.opts.embeddings_dir) + sd_model.embedding_db.load_textual_inversion_embeddings(force_reload=True) + timer.record("embeddings") + devices.torch_gc(force=True) if shared.cmd_opts.profile: errors.profile(pr, 'Load')