From 2ddbb6670484ed31120dc7bcdef4c292400e7a27 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Fri, 21 Apr 2023 00:07:38 -0400 Subject: [PATCH] update setup --- extensions-builtin/sd-webui-controlnet | 2 +- setup.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index d7c5dd45b..57c8e0341 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit d7c5dd45b15b4164e99b4690fd23d98145a1c4b9 +Subproject commit 57c8e0341755945268f0f080f43f308db816f2a2 diff --git a/setup.py b/setup.py index 63b5818c2..fd1c50d10 100644 --- a/setup.py +++ b/setup.py @@ -11,9 +11,6 @@ try: except: import argparse parser = argparse.ArgumentParser(description="Stable Diffusion", formatter_class=lambda prog: argparse.HelpFormatter(prog,max_help_position=55,indent_increment=2,width=200)) -from modules.script_loading import preload_extensions -preload_extensions('extensions', parser) -preload_extensions('extensions-builtin', parser) class Dot(dict): # dot notation access to dictionary attributes @@ -445,6 +442,11 @@ def parse_args(): parser.add_argument('--skip-requirements', default = False, action='store_true', help = "Skips checking and installing requirements, default: %(default)s") parser.add_argument('--skip-extensions', default = False, action='store_true', help = "Skips running individual extension installers, default: %(default)s") parser.add_argument('--skip-git', default = False, action='store_true', help = "Skips running all GIT operations, default: %(default)s") + log.info('Running extension preloading') + from modules.script_loading import preload_extensions + preload_extensions('extensions', parser) + preload_extensions('extensions-builtin', parser) + global args # pylint: disable=global-statement args = parser.parse_args()