Merge branch 'master' into master

2 files changed, 3 insertions, 2 deletions

diff --git a/modules/sd_models.py b/modules/sd_models.py
index ab014efb..2539f14c 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -69,6 +69,7 @@ def list_models():
         h = model_hash(cmd_ckpt)

         title, short_model_name = modeltitle(cmd_ckpt, h)

         checkpoints_list[title] = CheckpointInfo(cmd_ckpt, title, h, short_model_name)

+        shared.opts.sd_model_checkpoint = title

     elif cmd_ckpt is not None and cmd_ckpt != shared.default_sd_model_file:

         print(f"Checkpoint in --ckpt argument not found (Possible it was moved to {model_path}: {cmd_ckpt}", file=sys.stderr)

     for filename in model_list:

diff --git a/modules/shared.py b/modules/shared.py
index 76233ea0..ac968b2d 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -20,8 +20,8 @@ default_sd_model_file = sd_model_file
 model_path = os.path.join(script_path, 'models')

 parser = argparse.ArgumentParser()

 parser.add_argument("--config", type=str, default=os.path.join(sd_path, "configs/stable-diffusion/v1-inference.yaml"), help="path to config which constructs model",)

-parser.add_argument("--ckpt", type=str, default=sd_model_file, help="path to checkpoint of stable diffusion model; this checkpoint will be added to the list of checkpoints and loaded by default if you don't have a checkpoint selected in settings",)

-parser.add_argument("--ckpt-dir", type=str, default=os.path.join(model_path, "Stable-diffusion"), help="Path to directory with stable diffusion checkpoints")

+parser.add_argument("--ckpt", type=str, default=sd_model_file, help="path to checkpoint of stable diffusion model; if specified, this checkpoint will be added to the list of checkpoints and loaded",)

+parser.add_argument("--ckpt-dir", type=str, default=None, help="Path to directory with stable diffusion checkpoints")

 parser.add_argument("--gfpgan-dir", type=str, help="GFPGAN directory", default=('./src/gfpgan' if os.path.exists('./src/gfpgan') else './GFPGAN'))

 parser.add_argument("--gfpgan-model", type=str, help="GFPGAN model file name", default=None)

 parser.add_argument("--no-half", action='store_true', help="do not switch the model to 16-bit floats")