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

fix upscaler compile, diffusers enum, svd

Browse Source
This commit is contained in:
Vladimir Mandic
2024-03-09 08:35:18 -05:00
parent 867677115c
commit 6cb20edf7e
6 changed files with 85 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/sd_models.py
+4 -5
View File
@@ -23,7 +23,6 @@ from ldm.util import instantiate_from_config
from modules import paths, shared, shared_items, shared_state, modelloader, devices, script_callbacks, sd_vae, errors, hashes, sd_models_config, sd_models_compile, sd_hijack_accelerate
from modules.timer import Timer
from modules.memstats import memory_stats
from modules.paths import models_path, script_path
from modules.modeldata import model_data
@@ -48,7 +47,7 @@ class CheckpointInfo:
self.filename = filename
self.type = ''
relname = filename
app_path = os.path.abspath(script_path)
app_path = os.path.abspath(paths.script_path)
def rel(fn, path):
try:
@@ -64,8 +63,8 @@ class CheckpointInfo:
relname = rel(filename, shared.opts.diffusers_dir)
elif relname.startswith(model_path):
relname = rel(filename, model_path)
elif relname.startswith(script_path):
relname = rel(filename, script_path)
elif relname.startswith(paths.script_path):
relname = rel(filename, paths.script_path)
elif relname.startswith(app_path):
relname = rel(filename, app_path)
else:
@@ -147,7 +146,7 @@ def list_models():
ext_filter = [".ckpt", ".safetensors"]
model_list = list(modelloader.load_models(model_path=model_path, model_url=None, command_path=shared.opts.ckpt_dir, ext_filter=ext_filter, download_name=None, ext_blacklist=[".vae.ckpt", ".vae.safetensors"]))
if shared.backend == shared.Backend.DIFFUSERS:
model_list += modelloader.load_diffusers_models(model_path=os.path.join(models_path, 'Diffusers'), command_path=shared.opts.diffusers_dir, clear=True)
model_list += modelloader.load_diffusers_models(clear=True)
for filename in sorted(model_list, key=str.lower):
checkpoint_info = CheckpointInfo(filename)
if checkpoint_info.name is not None: