aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNuullll <vfirst218@gmail.com>2024-01-06 20:03:33 +0800
committerNuullll <vfirst218@gmail.com>2024-01-06 20:03:33 +0800
commita183de04e3f965083e7f3462201327d30c36b958 (patch)
tree32830227a68ae76f7d7ec777cc29beb24023db75
parentb00b429477f8962001ddb556b9d543c5dcf34418 (diff)
Execute model_loaded_callback after moving to target device
-rw-r--r--modules/sd_models.py6
-rw-r--r--modules/sd_vae.py3
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