unbreak colab. Again. Argh.

ppbrown · Sep 10, 2023 · d555c15 · d555c15
1 parent 6202228
commit d555c15
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/colab/colab-notebook.ipynb b/colab/colab-notebook.ipynb
@@ -21,7 +21,7 @@
         "drive.mount('/content/drive')\n",
         "SWARMPATH = '/content/drive/MyDrive'\n",
         "\n",
-        "# Colab fails to save venv to drive, so just screw it do a global install of pip reqs if we used a comfy backend in the drive\n",
+        "# Colab breaks venvs, and doesn't save anything valid to drive, so just screw it do a global install of pip reqs if we used a comfy backend in the drive\n",
         "!if [[ -f \"$SWARMPATH/StableSwarmUI/dlbackend/ComfyUI/requirements.txt\" ]]; then rm -rf $SWARMPATH/StableSwarmUI/dlbackend/ComfyUI/venv/; pip install -r $SWARMPATH/StableSwarmUI/dlbackend/ComfyUI/requirements.txt; fi"
       ]
     },
@@ -46,6 +46,9 @@
         "os.environ['SWARMPATH'] = SWARMPATH\n",
         "%cd $SWARMPATH\n",
         "\n",
+        "# Colab breaks venv, so, tell swarm to not make a venv\n",
+        "os.environ['SWARM_NO_VENV'] = 'true'\n",
+        "\n",
         "# Download StableSwarmUI\n",
         "url = \"https://github.com/Stability\" + \"-AI/StableSwarmUI\"\n",
         "!git clone $url"

diff --git a/launchtools/comfy-install-linux.sh b/launchtools/comfy-install-linux.sh
@@ -8,8 +8,11 @@ git clone https://github.com/comfyanonymous/ComfyUI
 
 cd ComfyUI
 
-python3 -m venv venv
+if [ -z "${SWARM_NO_VENV}" ]; then
 
-. venv/bin/activate
+    python3 -m venv venv
+
+    . venv/bin/activate
+fi
 
 pip install -r requirements.txt