Merge branch 'main' into main

scripts/dream.py

@@ -71,7 +71,6 @@ def main():
         # this is solely for recreating the prompt
         latent_diffusion_weights=opt.laion400m,
         embedding_path=opt.embedding_path,
-        device=opt.device,
     )
 
     # make sure the output directory exists
@@ -387,13 +386,6 @@ def create_argv_parser():
         type=str,
         help='Path to a pre-trained embedding manager checkpoint - can only be set on command line',
     )
-    parser.add_argument(
-        '--device',
-        '-d',
-        type=str,
-        default='cuda',
-        help='Device to run Stable Diffusion on. Defaults to cuda `torch.cuda.current_device()` if avalible',
-    )
     parser.add_argument(
         '--prompt_as_dir',
         '-p',
@@ -499,6 +491,13 @@ def create_cmd_parser():
         type=str,
         help='Path to input image for img2img mode (supersedes width and height)',
     )
+    parser.add_argument(
+        '-T',
+        '-fit',
+        '--fit',
+        action='store_true',
+        help='If specified, will resize the input image to fit within the dimensions of width x height (512x512 default)',
+    )
     parser.add_argument(
         '-f',
         '--strength',