diff --git a/extensions-builtin/Lora/lora.py b/extensions-builtin/Lora/lora.py index bddbb3f60..fe2ff7016 100644 --- a/extensions-builtin/Lora/lora.py +++ b/extensions-builtin/Lora/lora.py @@ -359,7 +359,6 @@ def lora_MultiheadAttention_load_state_dict(self, *args, **kwargs): def list_available_loras(): available_loras.clear() - os.makedirs(shared.cmd_opts.lora_dir, exist_ok=True) candidates = \ diff --git a/extensions-builtin/Lora/preload.py b/extensions-builtin/Lora/preload.py deleted file mode 100644 index 863dc5c0b..000000000 --- a/extensions-builtin/Lora/preload.py +++ /dev/null @@ -1,6 +0,0 @@ -import os -from modules import paths - - -def preload(parser): - parser.add_argument("--lora-dir", type=str, help="Path to directory with Lora networks.", default=os.path.join(paths.models_path, 'Lora')) diff --git a/extensions-builtin/Lora/ui_extra_networks_lora.py b/extensions-builtin/Lora/ui_extra_networks_lora.py index 2e84f9b5f..c0a1ad2d3 100644 --- a/extensions-builtin/Lora/ui_extra_networks_lora.py +++ b/extensions-builtin/Lora/ui_extra_networks_lora.py @@ -27,4 +27,4 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage): } def allowed_directories_for_previews(self): - return [shared.cmd_opts.lora_dir] + return [shared.opts.lora_dir] diff --git a/modules/cmd_args.py b/modules/cmd_args.py index c3f7f1dd9..1864a063a 100644 --- a/modules/cmd_args.py +++ b/modules/cmd_args.py @@ -66,6 +66,7 @@ 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() return args + diff --git a/setup.py b/setup.py index f5493c733..2159f9d5c 100644 --- a/setup.py +++ b/setup.py @@ -334,7 +334,7 @@ def ensure_base_requirements(): def install_requirements(): if args.skip_requirements: return - log.info('Installing requirements') + log.info('Verifying requirements') with open('requirements.txt', 'r', encoding='utf8') as f: lines = [line.strip() for line in f.readlines() if line.strip() != '' and not line.startswith('#') and line is not None] for line in lines: @@ -513,7 +513,7 @@ def run_setup(): check_torch() install_requirements() if check_timestamp(): - log.info('No changes detected: quick launch active') + log.info('No changes detected: Quick launch active') return log.info("Running setup") log.debug(f"Args: {vars(args)}")