extern/easydiffusion
1
0
Fork 1
mirror of https://github.com/easydiffusion/easydiffusion.git synced 2025-04-26 04:18:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't search for a yaml config file next to the model, since sdkit now does this automatically

Browse Source
This commit is contained in:
cmdr2 2023-01-11 18:23:56 +05:30
parent 8b764a8fd3
commit a13713adaf
1 changed files with 0 additions and 15 deletions

15
ui/easydiffusion/model_manager.py
View File

@ -43,7 +43,6 @@ def load_default_models(context: Context):
# init default model paths # init default model paths
for model_type in MODELS_TO_LOAD_ON_START: for model_type in MODELS_TO_LOAD_ON_START:
context.model_paths[model_type] = resolve_model_to_use(model_type=model_type) context.model_paths[model_type] = resolve_model_to_use(model_type=model_type)
set_model_config_path(context, model_type)
try: try:
load_model(context, model_type) load_model(context, model_type)
except Exception as e: except Exception as e:
@ -110,24 +109,10 @@ def reload_models_if_necessary(context: Context, task_data: TaskData):
for model_type, model_path_in_req in models_to_reload.items(): for model_type, model_path_in_req in models_to_reload.items():
context.model_paths[model_type] = model_path_in_req context.model_paths[model_type] = model_path_in_req
set_model_config_path(context, model_type)
action_fn = unload_model if context.model_paths[model_type] is None else load_model action_fn = unload_model if context.model_paths[model_type] is None else load_model
action_fn(context, model_type, scan_model=False) # we've scanned them already action_fn(context, model_type, scan_model=False) # we've scanned them already
def set_model_config_path(context: Context, model_type: str):
if model_type != 'stable-diffusion':
return
context.model_configs['stable-diffusion'] = None # reset this, to avoid loading the last config
# look for a yaml file next to the model, otherwise let sdkit match it to a known model
model_path = context.model_paths['stable-diffusion']
file_path, _ = os.path.splitext(model_path)
config_path = file_path + '.yaml'
if os.path.exists(config_path):
context.model_configs['stable-diffusion'] = config_path
def resolve_model_paths(task_data: TaskData): def resolve_model_paths(task_data: TaskData):
task_data.use_stable_diffusion_model = resolve_model_to_use(task_data.use_stable_diffusion_model, model_type='stable-diffusion') task_data.use_stable_diffusion_model = resolve_model_to_use(task_data.use_stable_diffusion_model, model_type='stable-diffusion')
task_data.use_vae_model = resolve_model_to_use(task_data.use_vae_model, model_type='vae') task_data.use_vae_model = resolve_model_to_use(task_data.use_vae_model, model_type='vae')