Commit ffd3932c authored by Your Name's avatar Your Name

Fix --loadall model preloading bugs

- Fixed model_key variable scope issue in GGUF->sd.cpp fallback
- Fixed model_path undefined in diffusers preloading section
- These fixes prevent startup crashes when using --loadall
parent 7f5bf82d
...@@ -4824,6 +4824,9 @@ def main(): ...@@ -4824,6 +4824,9 @@ def main():
try: try:
from stable_diffusion_cpp import StableDiffusion from stable_diffusion_cpp import StableDiffusion
# Initialize model_key to None first so Python knows it exists
model_key = None
# Define model_key for this scope # Define model_key for this scope
model_key = f"image:{model_path}" model_key = f"image:{model_path}"
print(f"Loading with sd.cpp: {model_path}") print(f"Loading with sd.cpp: {model_path}")
...@@ -4932,10 +4935,9 @@ def main(): ...@@ -4932,10 +4935,9 @@ def main():
import torch import torch
from diffusers import StableDiffusionXLPipeline, DiffusionPipeline from diffusers import StableDiffusionXLPipeline, DiffusionPipeline
# Use cached path if available # Use model name directly for diffusers (model_path is only set in GGUF branch)
key_model = model_path if model_path and os.path.isfile(model_path) else model_name model_key = f"image:{model_name}"
model_key = f"image:{key_model}" print(f"Loading diffusers pipeline: {model_name}")
print(f"Loading diffusers pipeline: {key_model}")
# Try to load as Stable Diffusion XL first # Try to load as Stable Diffusion XL first
try: try:
...@@ -5519,10 +5521,9 @@ def main(): ...@@ -5519,10 +5521,9 @@ def main():
import torch import torch
from diffusers import StableDiffusionXLPipeline, DiffusionPipeline from diffusers import StableDiffusionXLPipeline, DiffusionPipeline
# Use cached path if available # Use model name directly for diffusers (model_path is only set in GGUF branch)
key_model = model_path if model_path and os.path.isfile(model_path) else model_name model_key = f"image:{model_name}"
model_key = f"image:{key_model}" print(f"Loading diffusers pipeline: {model_name}")
print(f"Loading diffusers pipeline: {key_model}")
# Try to load as Stable Diffusion XL first # Try to load as Stable Diffusion XL first
try: try:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment