From f29c41bf6dd04a721e1dc0a162b042cad269f247 Mon Sep 17 00:00:00 2001
From: Sakura-Luna <53183413+Sakura-Luna@users.noreply.github.com>
Date: Sun, 14 May 2023 22:29:28 +0800
Subject: Modify pytorch command

---
 launch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index cfc0cffa..b00420d0 100644
--- a/launch.py
+++ b/launch.py
@@ -237,7 +237,7 @@ def run_extensions_installers(settings_file):
 
 
 def prepare_environment():
-    torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==2.0.1 torchvision==0.15.2 --extra-index-url https://download.pytorch.org/whl/cu118")
+    torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==2.0.1+cu118 torchvision==0.15.2+cu118 --index-url https://download.pytorch.org/whl/cu118")
     requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")
 
     xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.17')
-- 
cgit v1.2.3


From 9a9557ecfc824c4a005dc79466dba8f5884dbfb1 Mon Sep 17 00:00:00 2001
From: Sakura-Luna <53183413+Sakura-Luna@users.noreply.github.com>
Date: Mon, 15 May 2023 03:00:23 +0800
Subject: Change to extra-index-url

---
 launch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index b00420d0..034de0a9 100644
--- a/launch.py
+++ b/launch.py
@@ -237,7 +237,7 @@ def run_extensions_installers(settings_file):
 
 
 def prepare_environment():
-    torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==2.0.1+cu118 torchvision==0.15.2+cu118 --index-url https://download.pytorch.org/whl/cu118")
+    torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==2.0.1+cu118 torchvision==0.15.2+cu118 --extra-index-url https://download.pytorch.org/whl/cu118")
     requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")
 
     xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.17')
-- 
cgit v1.2.3


From 96cba45d71cf25ab2f3bb7d7085347c8b6ef6d7d Mon Sep 17 00:00:00 2001
From: Sakura-Luna <53183413+Sakura-Luna@users.noreply.github.com>
Date: Thu, 18 May 2023 17:29:47 +0800
Subject: Modify xformers instead of pytorch

---
 launch.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index 034de0a9..de8bde24 100644
--- a/launch.py
+++ b/launch.py
@@ -237,7 +237,8 @@ def run_extensions_installers(settings_file):
 
 
 def prepare_environment():
-    torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==2.0.1+cu118 torchvision==0.15.2+cu118 --extra-index-url https://download.pytorch.org/whl/cu118")
+    torch_index_url = os.environ.get('TORCH_INDEX_URL', "https://download.pytorch.org/whl/cu118")
+    torch_command = os.environ.get('TORCH_COMMAND', f"pip install torch==2.0.1 torchvision==0.15.2 --extra-index-url {torch_index_url}")
     requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")
 
     xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.17')
@@ -292,7 +293,7 @@ def prepare_environment():
                 if not is_installed("xformers"):
                     exit(0)
         elif platform.system() == "Linux":
-            run_pip(f"install {xformers_package}", "xformers")
+            run_pip(f"install -U -I --no-deps {xformers_package}", "xformers")
 
     if not is_installed("pyngrok") and args.ngrok:
         run_pip("install pyngrok", "ngrok")
-- 
cgit v1.2.3