no to different messages plus fix using != to compare to None

This commit is contained in:
AUTOMATIC 2022-10-10 20:46:55 +03:00
parent b3d3b335cf
commit 727e4d1086

View File

@ -152,15 +152,12 @@ def load_model_weights(model, checkpoint_info):
devices.dtype_vae = torch.float32 if shared.cmd_opts.no_half or shared.cmd_opts.no_half_vae else torch.float16 devices.dtype_vae = torch.float32 if shared.cmd_opts.no_half or shared.cmd_opts.no_half_vae else torch.float16
vae_file = os.path.splitext(checkpoint_file)[0] + ".vae.pt" vae_file = os.path.splitext(checkpoint_file)[0] + ".vae.pt"
if os.path.exists(vae_file):
print(f"Found VAE Weights: {vae_file}") if not os.path.exists(vae_file) and shared.cmd_opts.vae_path is not None:
elif shared.cmd_opts.vae_path != None:
vae_file = shared.cmd_opts.vae_path vae_file = shared.cmd_opts.vae_path
print(f'No VAE found for inside the model folder. Using CLI specified : {vae_file}')
else:
print("No VAE found for inside the model folder. Passing.")
if os.path.exists(vae_file): if os.path.exists(vae_file):
print(f"Loading VAE weights from: {vae_file}")
vae_ckpt = torch.load(vae_file, map_location="cpu") vae_ckpt = torch.load(vae_file, map_location="cpu")
vae_dict = {k: v for k, v in vae_ckpt["state_dict"].items() if k[0:4] != "loss"} vae_dict = {k: v for k, v in vae_ckpt["state_dict"].items() if k[0:4] != "loss"}