From cc92dc1f8d73dd4d574c4c8ccab78b7fc61e440b Mon Sep 17 00:00:00 2001
From: ssysm <me@theeditorstudio.com>
Date: Sun, 9 Oct 2022 23:17:29 -0400
Subject: add vae path args

---
 modules/sd_models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/sd_models.py')

diff --git a/modules/sd_models.py b/modules/sd_models.py
index cb3982b1..b6979432 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -147,7 +147,7 @@ def load_model_weights(model, checkpoint_info):
 
     devices.dtype = torch.float32 if shared.cmd_opts.no_half else torch.float16
 
-    vae_file = os.path.splitext(checkpoint_file)[0] + ".vae.pt"
+    vae_file = shared.cmd_opts.vae_path or os.path.splitext(checkpoint_file)[0] + ".vae.pt"
     if os.path.exists(vae_file):
         print(f"Loading VAE weights from: {vae_file}")
         vae_ckpt = torch.load(vae_file, map_location="cpu")
-- 
cgit v1.2.3


From 7349088d32b080f64058b6e5de5f0380a71ecd09 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Mon, 10 Oct 2022 16:11:14 +0300
Subject: --no-half-vae

---
 modules/sd_models.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'modules/sd_models.py')

diff --git a/modules/sd_models.py b/modules/sd_models.py
index e63d3c29..2cdcd84f 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -149,6 +149,7 @@ def load_model_weights(model, checkpoint_info):
         model.half()
 
     devices.dtype = torch.float32 if shared.cmd_opts.no_half 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"
     if os.path.exists(vae_file):
@@ -158,6 +159,8 @@ def load_model_weights(model, checkpoint_info):
 
         model.first_stage_model.load_state_dict(vae_dict)
 
+    model.first_stage_model.to(devices.dtype_vae)
+
     model.sd_model_hash = sd_model_hash
     model.sd_model_checkpoint = checkpoint_file
     model.sd_checkpoint_info = checkpoint_info
-- 
cgit v1.2.3


From af62ad4d25dcd0454944368f4925d83101cdedbc Mon Sep 17 00:00:00 2001
From: ssysm <me@theeditorstudio.com>
Date: Mon, 10 Oct 2022 13:25:28 -0400
Subject: change vae loading method

---
 modules/sd_models.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'modules/sd_models.py')

diff --git a/modules/sd_models.py b/modules/sd_models.py
index b0e1d8bd..7a42d924 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -150,9 +150,16 @@ def load_model_weights(model, checkpoint_info):
 
     devices.dtype = torch.float32 if shared.cmd_opts.no_half else torch.float16
 
-    vae_file = shared.cmd_opts.vae_path or 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}")
+    elif shared.cmd_opts.vae_path != None:
+        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):
-        print(f"Loading VAE weights from: {vae_file}")
         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"}
 
-- 
cgit v1.2.3


From 727e4d108674dc2813507e2a973a733ef21e8d53 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Mon, 10 Oct 2022 20:46:55 +0300
Subject: no to different messages plus fix using != to compare to None

---
 modules/sd_models.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'modules/sd_models.py')

diff --git a/modules/sd_models.py b/modules/sd_models.py
index 4c06051e..0a55b4c3 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -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
 
     vae_file = os.path.splitext(checkpoint_file)[0] + ".vae.pt"
-    if os.path.exists(vae_file):
-        print(f"Found VAE Weights: {vae_file}")
-    elif shared.cmd_opts.vae_path != None:
+
+    if not os.path.exists(vae_file) and shared.cmd_opts.vae_path is not None:
         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):
+        print(f"Loading VAE weights from: {vae_file}")
         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"}
 
-- 
cgit v1.2.3