diff --git a/extensions-builtin/LDSR/preload.py b/extensions-builtin/LDSR/preload.py deleted file mode 100644 index d746007c7..000000000 --- a/extensions-builtin/LDSR/preload.py +++ /dev/null @@ -1,6 +0,0 @@ -import os -from modules import paths - - -def preload(parser): - parser.add_argument("--ldsr-models-path", type=str, help="Path to directory with LDSR model file(s).", default=os.path.join(paths.models_path, 'LDSR')) diff --git a/extensions-builtin/ScuNET/preload.py b/extensions-builtin/ScuNET/preload.py deleted file mode 100644 index f12c5b90e..000000000 --- a/extensions-builtin/ScuNET/preload.py +++ /dev/null @@ -1,6 +0,0 @@ -import os -from modules import paths - - -def preload(parser): - parser.add_argument("--scunet-models-path", type=str, help="Path to directory with ScuNET model file(s).", default=os.path.join(paths.models_path, 'ScuNET')) diff --git a/extensions-builtin/SwinIR/preload.py b/extensions-builtin/SwinIR/preload.py deleted file mode 100644 index 567e44bca..000000000 --- a/extensions-builtin/SwinIR/preload.py +++ /dev/null @@ -1,6 +0,0 @@ -import os -from modules import paths - - -def preload(parser): - parser.add_argument("--swinir-models-path", type=str, help="Path to directory with SwinIR model file(s).", default=os.path.join(paths.models_path, 'SwinIR')) diff --git a/modules/cmd_args.py b/modules/cmd_args.py index 1864a063a..b4e0e55a5 100644 --- a/modules/cmd_args.py +++ b/modules/cmd_args.py @@ -57,6 +57,9 @@ def compatibility_args(opts, args): parser.add_argument("--esrgan-models-path", type=str, help=argparse.SUPPRESS, default=opts.esrgan_models_path) parser.add_argument("--bsrgan-models-path", type=str, help=argparse.SUPPRESS, default=opts.bsrgan_models_path) parser.add_argument("--realesrgan-models-path", type=str, help=argparse.SUPPRESS, default=opts.realesrgan_models_path) + parser.add_argument("--scunet-models-path", help=argparse.SUPPRESS, default=opts.scunet_models_path) + parser.add_argument("--swinir-models-path", help=argparse.SUPPRESS, default=opts.swinir_models_path) + parser.add_argument("--ldsr-models-path", help=argparse.SUPPRESS, default=opts.ldsr_models_path) parser.add_argument("--clip-models-path", type=str, help=argparse.SUPPRESS, default=opts.clip_models_path) parser.add_argument("--disable-extension-access", default = False, action='store_true', help=argparse.SUPPRESS) parser.add_argument("--opt-channelslast", help=argparse.SUPPRESS, default=opts.opt_channelslast) @@ -66,7 +69,9 @@ def compatibility_args(opts, args): parser.add_argument("--no-half-vae", help=argparse.SUPPRESS, default=opts.no_half_vae) parser.add_argument("--precision", help=argparse.SUPPRESS, default=opts.precision) parser.add_argument("--api", help=argparse.SUPPRESS, default=True) + parser.add_argument("--lora-dir", help=argparse.SUPPRESS, default=opts.lora_dir) args = parser.parse_args() + if 'lyco_dir' in args: + args.lyco_dir = opts.lyco_dir return args - diff --git a/modules/shared.py b/modules/shared.py index 509d3cf38..a7891aeb8 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -270,6 +270,9 @@ options_templates.update(options_section(('system-paths', "System Paths"), { "esrgan_models_path": OptionInfo(os.path.join(paths.models_path, 'ESRGAN'), "Path to directory with ESRGAN model file(s)"), "bsrgan_models_path": OptionInfo(os.path.join(paths.models_path, 'BSRGAN'), "Path to directory with BSRGAN model file(s)"), "realesrgan_models_path": OptionInfo(os.path.join(paths.models_path, 'RealESRGAN'), "Path to directory with RealESRGAN model file(s)"), + "scunet_models_path": OptionInfo(os.path.join(paths.models_path, 'ScuNET'), "Path to directory with ScuNET model file(s)"), + "swinir_models_path": OptionInfo(os.path.join(paths.models_path, 'SwinIR'), "Path to directory with SwinIR model file(s)"), + "ldsr_models_path": OptionInfo(os.path.join(paths.models_path, 'LDSR'), "Path to directory with LDSR model file(s)"), "clip_models_path": OptionInfo(os.path.join(paths.models_path, 'CLIP'), "Path to directory with CLIP model file(s)"), "lora_dir": OptionInfo(os.path.join(paths.models_path, 'Lora'), "Path to directory with Lora network(s)"), "lyco_dir": OptionInfo(os.path.join(paths.models_path, 'LyCORIS'), "Path to directory with LyCORIS network(s)"),