"...git@developer.sourcefind.cn:wangsen/paddle_dbnet.git" did not exist on "c4d20782cfab129b7f32215da7560cbac2f92bf6"
Commit 58ed0f2d authored by comfyanonymous's avatar comfyanonymous
Browse files

Fix loading SD1.5 diffusers checkpoint.

parent 8b9ac8fe
...@@ -272,7 +272,8 @@ def load_diffusers(model_path, fp16=True, output_vae=True, output_clip=True, emb ...@@ -272,7 +272,8 @@ def load_diffusers(model_path, fp16=True, output_vae=True, output_clip=True, emb
# magic # magic
v2 = diffusers_unet_conf["sample_size"] == 96 v2 = diffusers_unet_conf["sample_size"] == 96
v_pred = diffusers_scheduler_conf['prediction_type'] == 'v_prediction' if 'prediction_type' in diffusers_scheduler_conf:
v_pred = diffusers_scheduler_conf['prediction_type'] == 'v_prediction'
if v2: if v2:
if v_pred: if v_pred:
...@@ -290,6 +291,7 @@ def load_diffusers(model_path, fp16=True, output_vae=True, output_clip=True, emb ...@@ -290,6 +291,7 @@ def load_diffusers(model_path, fp16=True, output_vae=True, output_clip=True, emb
scale_factor = model_config_params['scale_factor'] scale_factor = model_config_params['scale_factor']
vae_config = model_config_params['first_stage_config'] vae_config = model_config_params['first_stage_config']
vae_config['scale_factor'] = scale_factor vae_config['scale_factor'] = scale_factor
model_config_params["unet_config"]["params"]["use_fp16"] = fp16
unet_path = osp.join(model_path, "unet", "diffusion_pytorch_model.safetensors") unet_path = osp.join(model_path, "unet", "diffusion_pytorch_model.safetensors")
vae_path = osp.join(model_path, "vae", "diffusion_pytorch_model.safetensors") vae_path = osp.join(model_path, "vae", "diffusion_pytorch_model.safetensors")
......
...@@ -231,7 +231,7 @@ class DiffusersLoader: ...@@ -231,7 +231,7 @@ class DiffusersLoader:
RETURN_TYPES = ("MODEL", "CLIP", "VAE") RETURN_TYPES = ("MODEL", "CLIP", "VAE")
FUNCTION = "load_checkpoint" FUNCTION = "load_checkpoint"
CATEGORY = "loaders" CATEGORY = "advanced/loaders"
def load_checkpoint(self, model_path, output_vae=True, output_clip=True): def load_checkpoint(self, model_path, output_vae=True, output_clip=True):
for search_path in folder_paths.get_folder_paths("diffusers"): for search_path in folder_paths.get_folder_paths("diffusers"):
...@@ -240,7 +240,7 @@ class DiffusersLoader: ...@@ -240,7 +240,7 @@ class DiffusersLoader:
if model_path in paths: if model_path in paths:
model_path = os.path.join(search_path, model_path) model_path = os.path.join(search_path, model_path)
break break
search_paths = folder_paths.get_folder_paths("diffusers")
return load_diffusers(model_path, fp16=model_management.should_use_fp16(), output_vae=output_vae, output_clip=output_clip, embedding_directory=folder_paths.get_folder_paths("embeddings")) return load_diffusers(model_path, fp16=model_management.should_use_fp16(), output_vae=output_vae, output_clip=output_clip, embedding_directory=folder_paths.get_folder_paths("embeddings"))
......
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