mirror of
https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
synced 2025-03-09 23:44:55 +08:00
minor bug fix of sd model memory management
This commit is contained in:
parent
bef51aed03
commit
f62217b65d
@ -787,6 +787,13 @@ def reuse_model_from_already_loaded(sd_model, checkpoint_info, timer):
|
|||||||
Additionaly deletes loaded models that are over the limit set in settings (sd_checkpoints_limit).
|
Additionaly deletes loaded models that are over the limit set in settings (sd_checkpoints_limit).
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
if sd_model is not None and sd_model.sd_checkpoint_info.filename == checkpoint_info.filename:
|
||||||
|
return sd_model
|
||||||
|
|
||||||
|
if shared.opts.sd_checkpoints_keep_in_cpu:
|
||||||
|
send_model_to_cpu(sd_model)
|
||||||
|
timer.record("send model to cpu")
|
||||||
|
|
||||||
already_loaded = None
|
already_loaded = None
|
||||||
for i in reversed(range(len(model_data.loaded_sd_models))):
|
for i in reversed(range(len(model_data.loaded_sd_models))):
|
||||||
loaded_model = model_data.loaded_sd_models[i]
|
loaded_model = model_data.loaded_sd_models[i]
|
||||||
@ -800,10 +807,6 @@ def reuse_model_from_already_loaded(sd_model, checkpoint_info, timer):
|
|||||||
send_model_to_trash(loaded_model)
|
send_model_to_trash(loaded_model)
|
||||||
timer.record("send model to trash")
|
timer.record("send model to trash")
|
||||||
|
|
||||||
if shared.opts.sd_checkpoints_keep_in_cpu:
|
|
||||||
send_model_to_cpu(sd_model)
|
|
||||||
timer.record("send model to cpu")
|
|
||||||
|
|
||||||
if already_loaded is not None:
|
if already_loaded is not None:
|
||||||
send_model_to_device(already_loaded)
|
send_model_to_device(already_loaded)
|
||||||
timer.record("send model to device")
|
timer.record("send model to device")
|
||||||
|
Loading…
Reference in New Issue
Block a user