TOIL(pip): Refactor pip requirements across the board (invoke-ai#531)

* Refactor pip requirements across the board Signed-off-by: Ben Alkov <[email protected]> * fix name, version in setup.py Signed-off-by: Ben Alkov <[email protected]> * Update notebooks for new requirements file changes Signed-off-by: Ben Alkov <[email protected]>
RedSparrowEU · Sep 14, 2022 · d15c75e · d15c75e
1 parent ecb84ec
commit d15c75e
Show file tree

Hide file tree

Showing 11 changed files with 183 additions and 306 deletions.
diff --git a/notebooks/Stable-Diffusion-local-Windows.ipynb b/notebooks/Stable-Diffusion-local-Windows.ipynb
@@ -40,57 +40,9 @@
    "outputs": [],
    "source": [
     "%%cmd\n",
-    "git clone https://github.com/lstein/stable-diffusion.git"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "%cd stable-diffusion"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "%%writefile requirements.txt\n",
-    "albumentations==0.4.3\n",
-    "einops==0.3.0\n",
-    "huggingface-hub==0.8.1\n",
-    "imageio-ffmpeg==0.4.2\n",
-    "imageio==2.9.0\n",
-    "kornia==0.6.0\n",
-    "# pip will resolve the version which matches torch\n",
-    "numpy\n",
-    "omegaconf==2.1.1\n",
-    "opencv-python==4.6.0.66\n",
-    "pillow==9.2.0\n",
-    "pip>=22\n",
-    "pudb==2019.2\n",
-    "pytorch-lightning==1.4.2\n",
-    "streamlit==1.12.0\n",
-    "# \"CompVis/taming-transformers\" doesn't work\n",
-    "# ldm\\models\\autoencoder.py\", line 6, in <module>\n",
-    "#    from taming.modules.vqvae.quantize import VectorQuantizer2 as VectorQuantizer\n",
-    "# ModuleNotFoundError\n",
-    "taming-transformers-rom1504==0.0.6\n",
-    "test-tube>=0.7.5\n",
-    "torch-fidelity==0.3.0\n",
-    "torchmetrics==0.6.0\n",
-    "transformers==4.19.2\n",
-    "git+https://github.com/openai/CLIP.git@main#egg=clip\n",
-    "git+https://github.com/lstein/k-diffusion.git@master#egg=k-diffusion\n",
-    "# No CUDA in PyPi builds\n",
-    "--extra-index-url https://download.pytorch.org/whl/cu113 --trusted-host https://download.pytorch.org\n",
-    "torch==1.11.0\n",
-    "# Same as numpy - let pip do its thing\n",
-    "torchvision\n",
-    "-e .\n"
+    "git clone https://github.com/lstein/stable-diffusion.git\n",
+    "cd /content/stable-diffusion/\n",
+    "git checkout --quiet development"
    ]
   },
   {
@@ -100,22 +52,22 @@
    "outputs": [],
    "source": [
     "%%cmd\n",
-    "pew new --python 3.10 -r requirements.txt --dont-activate ldm"
+    "pew new --python 3.10 -r requirements-lin-win-colab-CUDA.txt --dont-activate stable-diffusion"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Switch the notebook kernel to the new 'ldm' environment!\n",
+    "# Switch the notebook kernel to the new 'stable-diffusion' environment!\n",
     "\n",
     "## VSCode: restart VSCode and come back to this cell\n",
     "\n",
     "1. Ctrl+Shift+P\n",
     "1. Type \"Select Interpreter\" and select \"Jupyter: Select Interpreter to Start Jupyter Server\"\n",
     "1. VSCode will say that it needs to install packages. Click the \"Install\" button.\n",
     "1. Once the install is finished, do 1 & 2 again\n",
-    "1. Pick 'ldm'\n",
+    "1. Pick 'stable-diffusion'\n",
     "1. Run the following cell"
    ]
   },
@@ -136,7 +88,7 @@
     "## Jupyter/JupyterLab\n",
     "\n",
     "1. Run the cell below\n",
-    "1. Click on the toolbar where it says \"(ipyknel)\" ↗️. You should get a pop-up asking you to \"Select Kernel\". Pick 'ldm' from the drop-down.\n"
+    "1. Click on the toolbar where it says \"(ipyknel)\" ↗️. You should get a pop-up asking you to \"Select Kernel\". Pick 'stable-diffusion' from the drop-down.\n"
    ]
   },
   {
@@ -154,9 +106,9 @@
    "source": [
     "# DO NOT RUN THIS CELL IF YOU ARE USING VSCODE!!\n",
     "%%cmd\n",
-    "pew workon ldm\n",
+    "pew workon stable-diffusion\n",
     "pip3 install ipykernel\n",
-    "python -m ipykernel install --name=ldm"
+    "python -m ipykernel install --name=stable-diffusion"
    ]
   },
   {
@@ -231,7 +183,7 @@
     "Now:\n",
     "\n",
     "1. `cd` to wherever the 'stable-diffusion' directory is\n",
-    "1. Run `pew workon ldm`\n",
+    "1. Run `pew workon stable-diffusion`\n",
     "1. Run `winpty python scripts\\dream.py`"
    ]
   }