Public/automatic
1
0
Fork 0
mirror of https://github.com/vladmandic/automatic synced 2026-09-19 17:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

reduce memory leak on control unit change

Browse Source 
Signed-off-by: Vladimir Mandic <mandic00@live.com>
This commit is contained in:
Vladimir Mandic
2025-07-18 09:50:36 -04:00
parent af58803adc
commit da90c0c7ff
6 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/control/units/controlnet.py
+11 -13
View File
@@ -195,8 +195,9 @@ class ControlNet():
def reset(self):
if self.model is not None:
debug_log(f'Control {what} model unloaded')
self.model = None
self.model_id = None
self.model = None
self.model_id = None
devices.torch_gc(force=True, reason='controlnet')
def get_class(self, model_id:str=''):
from modules import shared
@@ -226,7 +227,7 @@ class ControlNet():
return None, None
return cls, config
def load_safetensors(self, model_id, model_path):
def load_safetensors(self, model_id, model_path, cls, config):
name = os.path.splitext(model_path)[0]
config_path = None
if not os.path.exists(model_path):
@@ -251,11 +252,7 @@ class ControlNet():
config_path = f'{name}.json'
if config_path is not None:
self.load_config['original_config_file '] = config_path
cls, config = self.get_class(model_id)
if cls is None:
log.error(f'Control {what} model load: unknown base model')
else:
self.model = cls.from_single_file(model_path, config=config, **self.load_config)
self.model = cls.from_single_file(model_path, config=config, **self.load_config)
def load(self, model_id: str = None, force: bool = True) -> str:
with load_lock:
@@ -281,9 +278,13 @@ class ControlNet():
# log.debug(f'Control {what} model: id="{model_id}" path="{model_path}" already loaded')
return
log.debug(f'Control {what} model loading: id="{model_id}" path="{model_path}"')
cls, _config = self.get_class(model_id)
cls, config = self.get_class(model_id)
if cls is None:
log.error(f'Control {what} model load: id="{model_id}" unknown base model')
return
self.reset()
if model_path.endswith('.safetensors'):
self.load_safetensors(model_id, model_path)
self.load_safetensors(model_id, model_path, cls, config)
else:
kwargs = {}
if '/bin' in model_path:
@@ -291,9 +292,6 @@ class ControlNet():
self.load_config['use_safetensors'] = False
else:
self.load_config['use_safetensors'] = True
if cls is None:
log.error(f'Control {what} model load: id="{model_id}" unknown base model')
return
if variants.get(model_id, None) is not None:
kwargs['variant'] = variants[model_id]
try: