Set default dimensions to 768; add config inheritance

1 files changed, 5 insertions, 6 deletions

diff --git a/infer.py b/infer.py
index f566114..ae0b4da 100644
--- a/infer.py
+++ b/infer.py
@@ -24,7 +24,7 @@ from transformers import CLIPTextModel, CLIPTokenizer
 from slugify import slugify
 
 from pipelines.stable_diffusion.vlpn_stable_diffusion import VlpnStableDiffusion
-from common import load_text_embeddings
+from common import load_text_embeddings, load_config
 
 
 torch.backends.cuda.matmul.allow_tf32 = True
@@ -46,8 +46,8 @@ default_cmds = {
     "negative_prompt": None,
     "image": None,
     "image_noise": .7,
-    "width": 512,
-    "height": 512,
+    "width": 768,
+    "height": 768,
     "batch_size": 1,
     "batch_num": 1,
     "steps": 30,
@@ -163,9 +163,8 @@ def run_parser(parser, defaults, input=None):
     conf_args = argparse.Namespace()
 
     if args.config is not None:
-        with open(args.config, 'rt') as f:
-            conf_args = parser.parse_known_args(
-                namespace=argparse.Namespace(**json.load(f)["args"]))[0]
+        args = load_config(args.config)
+        args = parser.parse_args(namespace=argparse.Namespace(**args))
 
     res = defaults.copy()
     for dict in [vars(conf_args), vars(args)]: