diff --git a/configs/models.yaml b/configs/models.yaml index 40bdc88cd8..162da38da2 100644 --- a/configs/models.yaml +++ b/configs/models.yaml @@ -12,6 +12,7 @@ stable-diffusion-1.4: description: Stable Diffusion inference model version 1.4 width: 512 height: 512 + default: true inpainting-1.5: description: runwayML tuned inpainting model v1.5 weights: models/ldm/stable-diffusion-v1/sd-v1-5-inpainting.ckpt @@ -19,7 +20,6 @@ inpainting-1.5: # vae: models/ldm/stable-diffusion-v1/vae-ft-mse-840000-ema-pruned.ckpt width: 512 height: 512 - default: true stable-diffusion-1.5: config: configs/stable-diffusion/v1-inference.yaml weights: models/ldm/stable-diffusion-v1/v1-5-pruned-emaonly.ckpt diff --git a/ldm/invoke/args.py b/ldm/invoke/args.py index 7068bd83c1..a57928e22f 100644 --- a/ldm/invoke/args.py +++ b/ldm/invoke/args.py @@ -219,7 +219,6 @@ class Args(object): switches.append(f'-W {a["width"]}') switches.append(f'-H {a["height"]}') switches.append(f'-C {a["cfg_scale"]}') - switches.append(f'--fnformat {a["fnformat"]}') if a['perlin'] > 0: switches.append(f'--perlin {a["perlin"]}') if a['threshold'] > 0: @@ -245,6 +244,8 @@ class Args(object): switches.append(f'-f {a["strength"]}') if a['inpaint_replace']: switches.append(f'--inpaint_replace') + if a['text_mask']: + switches.append(f'-tm {" ".join([str(u) for u in a["text_mask"]])}') else: switches.append(f'-A {a["sampler_name"]}')