diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2022-10-22 10:57:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-22 10:57:20 +0000 |
| commit | 1fa53dab2c5a857b9773f904fadf853dac1f1bd6 (patch) | |
| tree | 347f8cbcdf644885fcf3481ed7a2dc55f8942c6e /modules/sd_models.py | |
| parent | 29bfacd63cb5c73b9643d94f255cca818fd49d9c (diff) | |
| parent | 5aa9525046b7520d39fe8fc8c5c6cc10ab4d5fdb (diff) | |
| download | stable-diffusion-webui-gfx803-1fa53dab2c5a857b9773f904fadf853dac1f1bd6.tar.gz stable-diffusion-webui-gfx803-1fa53dab2c5a857b9773f904fadf853dac1f1bd6.tar.bz2 stable-diffusion-webui-gfx803-1fa53dab2c5a857b9773f904fadf853dac1f1bd6.zip | |
Merge branch 'master' into cuda-device-id-selection
Diffstat (limited to 'modules/sd_models.py')
| -rw-r--r-- | modules/sd_models.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/sd_models.py b/modules/sd_models.py index d99dbce8..f9b3063d 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -7,7 +7,7 @@ from omegaconf import OmegaConf from ldm.util import instantiate_from_config
-from modules import shared, modelloader, devices
+from modules import shared, modelloader, devices, script_callbacks
from modules.paths import models_path
from modules.sd_hijack_inpainting import do_inpainting_hijack, should_hijack_inpainting
@@ -238,6 +238,9 @@ def load_model(checkpoint_info=None): sd_hijack.model_hijack.hijack(sd_model)
sd_model.eval()
+ shared.sd_model = sd_model
+
+ script_callbacks.model_loaded_callback(sd_model)
print(f"Model loaded.")
return sd_model
@@ -252,7 +255,7 @@ def reload_model_weights(sd_model, info=None): if sd_model.sd_checkpoint_info.config != checkpoint_info.config or should_hijack_inpainting(checkpoint_info) != should_hijack_inpainting(sd_model.sd_checkpoint_info):
checkpoints_loaded.clear()
- shared.sd_model = load_model(checkpoint_info)
+ load_model(checkpoint_info)
return shared.sd_model
if shared.cmd_opts.lowvram or shared.cmd_opts.medvram:
|