From 8a7a4275a83f428582648a6872b5491e56ebae7b Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 29 Aug 2023 08:32:48 +0300
Subject: Merge pull request #12842 from dhwz/dev

remove xformers Python version check
---
 modules/launch_utils.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'modules/launch_utils.py')

diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index 7e4d5a61..14252c3a 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -366,17 +366,7 @@ def prepare_environment():
         startup_timer.record("install open_clip")
 
     if (not is_installed("xformers") or args.reinstall_xformers) and args.xformers:
-        if platform.system() == "Windows":
-            if platform.python_version().startswith("3.10"):
-                run_pip(f"install -U -I --no-deps {xformers_package}", "xformers", live=True)
-            else:
-                print("Installation of xformers is not supported in this version of Python.")
-                print("You can also check this and build manually: https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Xformers#building-xformers-on-windows-by-duckness")
-                if not is_installed("xformers"):
-                    exit(0)
-        elif platform.system() == "Linux":
-            run_pip(f"install -U -I --no-deps {xformers_package}", "xformers")
-
+        run_pip(f"install -U -I --no-deps {xformers_package}", "xformers")
         startup_timer.record("install xformers")
 
     if not is_installed("ngrok") and args.ngrok:
-- 
cgit v1.2.1


From 0c9282b84d68a9b01528a663d90c7acbb0c5e266 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 29 Aug 2023 08:58:01 +0300
Subject: Merge pull request #12832 from catboxanon/fix/skip-install-extensions

Honor `--skip-install` for extension installers
---
 modules/launch_utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules/launch_utils.py')

diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index 14252c3a..090be328 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -394,7 +394,8 @@ def prepare_environment():
         run_pip(f"install -r \"{requirements_file}\"", "requirements")
         startup_timer.record("install requirements")
 
-    run_extensions_installers(settings_file=args.ui_settings_file)
+    if not args.skip_install:
+        run_extensions_installers(settings_file=args.ui_settings_file)
 
     if args.update_check:
         version_check(commit)
-- 
cgit v1.2.1


From 00e393ce10901e7c7c8bcf85d641382c7fe2efb4 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 29 Aug 2023 09:00:34 +0300
Subject: Merge pull request #12833 from catboxanon/fix/dont-print-blank-stdout

Don't print blank stdout in extension installers
---
 modules/launch_utils.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'modules/launch_utils.py')

diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index 090be328..9aa0f071 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -228,7 +228,9 @@ def run_extension_installer(extension_dir):
         env = os.environ.copy()
         env['PYTHONPATH'] = f"{os.path.abspath('.')}{os.pathsep}{env.get('PYTHONPATH', '')}"
 
-        print(run(f'"{python}" "{path_installer}"', errdesc=f"Error running install.py for extension {extension_dir}", custom_env=env))
+        stdout = run(f'"{python}" "{path_installer}"', errdesc=f"Error running install.py for extension {extension_dir}", custom_env=env)
+        if stdout:
+            print(stdout)
     except Exception as e:
         errors.report(str(e))
 
-- 
cgit v1.2.1


From 323dcadea2a04387449159e56586a247efbca56c Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 07:27:45 +0300
Subject: Merge pull request #12855 from dhwz/dev

don't print empty lines
---
 modules/launch_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/launch_utils.py')

diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index 9aa0f071..05488fe6 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -228,7 +228,7 @@ def run_extension_installer(extension_dir):
         env = os.environ.copy()
         env['PYTHONPATH'] = f"{os.path.abspath('.')}{os.pathsep}{env.get('PYTHONPATH', '')}"
 
-        stdout = run(f'"{python}" "{path_installer}"', errdesc=f"Error running install.py for extension {extension_dir}", custom_env=env)
+        stdout = run(f'"{python}" "{path_installer}"', errdesc=f"Error running install.py for extension {extension_dir}", custom_env=env).strip()
         if stdout:
             print(stdout)
     except Exception as e:
-- 
cgit v1.2.1


From d0026da4833ce24c0fbb74c6a21fee84cc81da76 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 19:48:47 +0300
Subject: add --dump-sysinfo, a cmd arg to dump limited sysinfo file at startup

---
 modules/launch_utils.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'modules/launch_utils.py')

diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index 05488fe6..6e54d063 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -434,3 +434,16 @@ def start():
         webui.api_only()
     else:
         webui.webui()
+
+
+def dump_sysinfo():
+    from modules import sysinfo
+    import datetime
+
+    text = sysinfo.get()
+    filename = f"sysinfo-{datetime.datetime.utcnow().strftime('%Y-%m-%d-%H-%M')}.txt"
+
+    with open(filename, "w", encoding="utf8") as file:
+        file.write(text)
+
+    return filename
-- 
cgit v1.2.1