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

reorg server startup

Browse Source
This commit is contained in:
Vladimir Mandic
2023-06-11 09:00:38 -04:00
parent 76e54938be
commit 1d0a18ef4a
8 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/scripts.py
+10 -5
View File
@@ -219,8 +219,9 @@ def load_scripts():
script_callbacks.clear_callbacks()
scripts_list = list_scripts("scripts", ".py")
syspath = sys.path
time_load = {}
def register_scripts_from_module(module):
def register_scripts_from_module(module, scriptfile):
for _key, script_class in module.__dict__.items():
if type(script_class) != type:
continue
@@ -231,17 +232,21 @@ def load_scripts():
postprocessing_scripts_data.append(ScriptClassData(script_class, scriptfile.path, scriptfile.basedir, module))
for scriptfile in scripts_list:
t0 = time.time()
try:
if scriptfile.basedir != paths.script_path:
sys.path = [scriptfile.basedir] + sys.path
current_basedir = scriptfile.basedir
script_module = script_loading.load_module(scriptfile.path)
register_scripts_from_module(script_module)
register_scripts_from_module(script_module, scriptfile)
except Exception as e:
errors.display(e, f'Loading script: {scriptfile.filename}')
finally:
sys.path = syspath
current_basedir = paths.script_path
current_basedir = paths.script_path
time_load[scriptfile.basedir] = time_load.get(scriptfile.basedir, 0) + (time.time()-t0)
sys.path = syspath
current_basedir = paths.script_path
time_load = [f'{os.path.basename(k)}:{round(v,3)}s' for (k,v) in time_load.items() if v > 0.05]
log.debug(f'Scripts load: {time_load}')
def wrap_call(func, filename, funcname, *args, default=None, **kwargs):
modules/sd_models.py
+1 -1
View File
@@ -524,7 +524,7 @@ def load_model(checkpoint_info=None, already_loaded_state_dict=None, timer=None)
sd_model = instantiate_from_config(sd_config.model)
except Exception:
sd_model = instantiate_from_config(sd_config.model)
shared.log.info(f"Model created from config: {checkpoint_config}")
shared.log.debug(f"Model created from config: {checkpoint_config}")
sd_model.used_config = checkpoint_config
timer.record("create")
load_model_weights(sd_model, checkpoint_info, state_dict, timer)
modules/ui.py
+4 -3
View File
@@ -1498,9 +1498,10 @@ def create_ui():
show_progress=info.refresh is not None,
)
image_cfg_scale_visibility = (modules.shared.sd_model is not None) and hasattr(modules.shared.sd_model, 'cond_stage_key') and (modules.shared.sd_model.cond_stage_key == "edit") # pix2pix
text_settings.change(fn=lambda: gr.update(visible=image_cfg_scale_visibility), inputs=[], outputs=[image_cfg_scale])
demo.load(fn=lambda: gr.update(visible=image_cfg_scale_visibility), inputs=[], outputs=[image_cfg_scale])
# TODO image_cfg_scale_visibility should be on model change, not on ui create
# image_cfg_scale_visibility = (modules.shared.sd_model is not None) and hasattr(modules.shared.sd_model, 'cond_stage_key') and (modules.shared.sd_model.cond_stage_key == "edit") # pix2pix
# text_settings.change(fn=lambda: gr.update(visible=image_cfg_scale_visibility), inputs=[], outputs=[image_cfg_scale])
# demo.load(fn=lambda: gr.update(visible=image_cfg_scale_visibility), inputs=[], outputs=[image_cfg_scale])
button_set_checkpoint = gr.Button('Change checkpoint', elem_id='change_checkpoint', visible=False)
button_set_checkpoint.click(