diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2024-01-07 05:22:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-07 05:22:17 +0000 |
| commit | cab1d839b5bf04949f22226aa712b3c9370059a4 (patch) | |
| tree | 7cfd2c9a0e3c171b9460dc12c8201693a0348259 /modules | |
| parent | 71e00571379dd77f6a8695e893a2499251715f9f (diff) | |
| parent | a183de04e3f965083e7f3462201327d30c36b958 (diff) | |
| download | stable-diffusion-webui-gfx803-cab1d839b5bf04949f22226aa712b3c9370059a4.tar.gz stable-diffusion-webui-gfx803-cab1d839b5bf04949f22226aa712b3c9370059a4.tar.bz2 stable-diffusion-webui-gfx803-cab1d839b5bf04949f22226aa712b3c9370059a4.zip | |
Merge pull request #14563 from Nuullll/model-loaded-callback
Execute model_loaded_callback after moving to target device
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/sd_models.py | 6 | ||||
| -rw-r--r-- | modules/sd_vae.py | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/modules/sd_models.py b/modules/sd_models.py index 50bc209e..2c045771 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -842,13 +842,13 @@ def reload_model_weights(sd_model=None, info=None, forced_reload=False): sd_hijack.model_hijack.hijack(sd_model)
timer.record("hijack")
- script_callbacks.model_loaded_callback(sd_model)
- timer.record("script callbacks")
-
if not sd_model.lowvram:
sd_model.to(devices.device)
timer.record("move model to device")
+ script_callbacks.model_loaded_callback(sd_model)
+ timer.record("script callbacks")
+
print(f"Weights loaded in {timer.summary()}.")
model_data.set_sd_model(sd_model)
diff --git a/modules/sd_vae.py b/modules/sd_vae.py index 31306d8b..43687e48 100644 --- a/modules/sd_vae.py +++ b/modules/sd_vae.py @@ -273,10 +273,11 @@ def reload_vae_weights(sd_model=None, vae_file=unspecified): load_vae(sd_model, vae_file, vae_source) sd_hijack.model_hijack.hijack(sd_model) - script_callbacks.model_loaded_callback(sd_model) if not sd_model.lowvram: sd_model.to(devices.device) + script_callbacks.model_loaded_callback(sd_model) + print("VAE weights loaded.") return sd_model |