fix upscaler compile, diffusers enum, svd

modules/modelloader.py

@@ -87,7 +87,7 @@ def download_civit_model_thread(model_name, model_url, model_path, model_type, p
         model_file = os.path.join(shared.opts.ckpt_dir, model_path, model_name)
         temp_file = os.path.join(shared.opts.ckpt_dir, model_path, temp_file)
 
-    res = f'CivitAI download: name="{model_name}" url="{model_url}" path="{model_path}" temp="{temp_file}"'
+    res = f'Model download: name="{model_name}" url="{model_url}" path="{model_path}" temp="{temp_file}"'
     if os.path.isfile(model_file):
         res += ' already exists'
         shared.log.warning(res)
@@ -144,7 +144,7 @@ def download_civit_model(model_url: str, model_name: str, model_path: str, model
     import threading
     thread = threading.Thread(target=download_civit_model_thread, args=(model_name, model_url, model_path, model_type, preview, token))
     thread.start()
-    return f'CivitAI download: name={model_name} url={model_url} path={model_path}'
+    return f'Model download: name={model_name} url={model_url} path={model_path}'
 
 
 def download_diffusers_model(hub_id: str, cache_dir: str = None, download_config: Dict[str, str] = None, token = None, variant = None, revision = None, mirror = None, custom_pipeline = None):
@@ -215,60 +215,47 @@ def download_diffusers_model(hub_id: str, cache_dir: str = None, download_config
     return pipeline_dir
 
 
-def load_diffusers_models(model_path: str, command_path: str = None, clear=True):
+def load_diffusers_models(clear=True):
     excluded_models = [
         'PhotoMaker', 'inswapper_128', 'IP-Adapter'
     ]
     t0 = time.time()
-    places = []
-    places.append(model_path)
-    if command_path is not None and command_path != model_path:
-        places.append(command_path)
+    place = shared.opts.diffusers_dir
+    if place is None or len(place) == 0 or not os.path.isdir(place):
+        place = os.path.join(models_path, 'Diffusers')
     if clear:
         diffuser_repos.clear()
     output = []
-    for place in places:
-        if not os.path.isdir(place):
-            continue
-        try:
-            """
-            import huggingface_hub as hf
-            res = hf.scan_cache_dir(cache_dir=place)
-            for r in list(res.repos):
-                cache_path = os.path.join(r.repo_path, "snapshots", list(r.revisions)[-1].commit_hash)
-                diffuser_repos.append({ 'name': r.repo_id, 'filename': r.repo_id, 'path': cache_path, 'size': r.size_on_disk, 'mtime': r.last_modified, 'hash': list(r.revisions)[-1].commit_hash, 'model_info': str(os.path.join(cache_path, "model_info.json")) })
-                if not os.path.isfile(os.path.join(cache_path, "hidden")):
-                    output.append(str(r.repo_id))
-            """
-            for folder in os.listdir(place):
-                try:
-                    if any([x in folder for x in excluded_models]): # noqa:C419
-                        continue
-                    if "--" not in folder:
-                        continue
-                    if folder.endswith("-prior"):
-                        continue
-                    _, name = folder.split("--", maxsplit=1)
-                    name = name.replace("--", "/")
-                    folder = os.path.join(place, folder)
-                    friendly = os.path.join(place, name)
-                    snapshots = os.listdir(os.path.join(folder, "snapshots"))
-                    if len(snapshots) == 0:
-                        shared.log.warning(f"Diffusers folder has no snapshots: location={place} folder={folder} name={name}")
-                        continue
-                    commit = os.path.join(folder, 'snapshots', snapshots[-1])
-                    mtime = os.path.getmtime(commit)
-                    info = os.path.join(commit, "model_info.json")
-                    diffuser_repos.append({ 'name': name, 'filename': name, 'friendly': friendly, 'folder': folder, 'path': commit, 'hash': commit, 'mtime': mtime, 'model_info': info })
-                    if os.path.exists(os.path.join(folder, 'hidden')):
-                        continue
-                    output.append(name)
-                except Exception:
-                    # shared.log.error(f"Error analyzing diffusers model: {folder} {e}")
-                    pass
-        except Exception as e:
-            shared.log.error(f"Error listing diffusers: {place} {e}")
-    shared.log.debug(f'Scanning diffusers cache: {places} items={len(output)} time={time.time()-t0:.2f}')
+    try:
+        for folder in os.listdir(place):
+            try:
+                if any([x in folder for x in excluded_models]): # noqa:C419
+                    continue
+                if "--" not in folder:
+                    continue
+                if folder.endswith("-prior"):
+                    continue
+                _, name = folder.split("--", maxsplit=1)
+                name = name.replace("--", "/")
+                folder = os.path.join(place, folder)
+                friendly = os.path.join(place, name)
+                snapshots = os.listdir(os.path.join(folder, "snapshots"))
+                if len(snapshots) == 0:
+                    shared.log.warning(f"Diffusers folder has no snapshots: location={place} folder={folder} name={name}")
+                    continue
+                commit = os.path.join(folder, 'snapshots', snapshots[-1])
+                mtime = os.path.getmtime(commit)
+                info = os.path.join(commit, "model_info.json")
+                diffuser_repos.append({ 'name': name, 'filename': name, 'friendly': friendly, 'folder': folder, 'path': commit, 'hash': commit, 'mtime': mtime, 'model_info': info })
+                if os.path.exists(os.path.join(folder, 'hidden')):
+                    continue
+                output.append(name)
+            except Exception:
+                # shared.log.error(f"Error analyzing diffusers model: {folder} {e}")
+                pass
+    except Exception as e:
+        shared.log.error(f"Error listing diffusers: {place} {e}")
+    shared.log.debug(f'Scanning diffusers cache: folder={place} items={len(output)} time={time.time()-t0:.2f}')
     return output
 
 

modules/sd_models.py

@@ -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:

modules/upscaler.py

@@ -218,7 +218,11 @@ def compile_upscaler(model):
         if "Upscaler" in shared.opts.cuda_compile and shared.opts.cuda_compile_backend != 'none':
             import torch._dynamo # pylint: disable=unused-import,redefined-outer-name
             torch._dynamo.reset() # pylint: disable=protected-access
-            shared.log.debug(f"Upscaler compile available backends: {torch._dynamo.list_backends()}") # pylint: disable=protected-access
+            if shared.opts.cuda_compile_backend not in torch._dynamo.list_backends(): # pylint: disable=protected-access
+                shared.log.warning(f"Upscaler compile not available: backend={shared.opts.cuda_compile_backend} available={torch._dynamo.list_backends()}") # pylint: disable=protected-access
+                return model
+            else:
+                shared.log.info(f"Upscaler compile: backend={shared.opts.cuda_compile_backend} available={torch._dynamo.list_backends()}") # pylint: disable=protected-access
 
             if shared.opts.cuda_compile_backend == "openvino_fx":
                 from modules.intel.openvino import openvino_fx # pylint: disable=unused-import
@@ -241,11 +245,8 @@ def compile_upscaler(model):
                 shared.log.error(f"Torch inductor config error: {e}")
 
             t0 = time.time()
-
             model = torch.compile(model, mode=shared.opts.cuda_compile_mode, backend=shared.opts.cuda_compile_backend, fullgraph=shared.opts.cuda_compile_fullgraph) # pylint: disable=attribute-defined-outside-init
-
             setup_logging() # compile messes with logging so reset is needed
-
             t1 = time.time()
             shared.log.info(f"Upscaler compile: time={t1-t0:.2f}")
     except Exception as e: