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

* Refactor pip requirements across the board

Signed-off-by: Ben Alkov <ben.alkov@gmail.com>

* fix name, version in setup.py

Signed-off-by: Ben Alkov <ben.alkov@gmail.com>

* Update notebooks for new requirements file changes

Signed-off-by: Ben Alkov <ben.alkov@gmail.com>

notebooks/Stable_Diffusion_AI_Notebook.ipynb

@@ -1,27 +1,12 @@
 {
-  "nbformat": 4,
-  "nbformat_minor": 0,
-  "metadata": {
-    "colab": {
-      "provenance": [],
-      "collapsed_sections": [],
-      "private_outputs": true
-    },
-    "kernelspec": {
-      "name": "python3",
-      "display_name": "Python 3"
-    },
-    "language_info": {
-      "name": "python"
-    },
-    "accelerator": "GPU",
-    "gpuClass": "standard"
-  },
   "cells": [
     {
       "cell_type": "markdown",
+      "metadata": {
+        "id": "ycYWcsEKc6w7"
+      },
       "source": [
-        "# Stable Diffusion AI Notebook (Release 1.13)\n",
+        "# Stable Diffusion AI Notebook (Release 1.14)\n",
         "\n",
         "<img src=\"https://user-images.githubusercontent.com/60411196/186547976-d9de378a-9de8-4201-9c25-c057a9c59bad.jpeg\" alt=\"stable-diffusion-ai\" width=\"170px\"/> <br>\n",
         "#### Instructions:\n",
@@ -35,33 +20,30 @@
         "<font color=\"red\">Requirements:</font> For this notebook to work you need to have [Stable-Diffusion-v-1-4](https://huggingface.co/CompVis/stable-diffusion-v-1-4-original) stored in your Google Drive, it will be needed in cell #7\n",
         "##### For more details visit Github repository: [lstein/stable-diffusion](https://github.com/lstein/stable-diffusion)\n",
         "---\n"
-      ],
-      "metadata": {
-        "id": "ycYWcsEKc6w7"
-      }
+      ]
     },
     {
       "cell_type": "markdown",
-      "source": [
-        "## ◢ Installation"
-      ],
       "metadata": {
         "id": "dr32VLxlnouf"
-      }
+      },
+      "source": [
+        "## ◢ Installation"
+      ]
     },
     {
       "cell_type": "code",
-      "source": [
-        "#@title 1. Check current GPU assigned\n",
-        "!nvidia-smi -L\n",
-        "!nvidia-smi"
-      ],
+      "execution_count": null,
       "metadata": {
         "cellView": "form",
         "id": "a2Z5Qu_o8VtQ"
       },
-      "execution_count": null,
-      "outputs": []
+      "outputs": [],
+      "source": [
+        "#@title 1. Check current GPU assigned\n",
+        "!nvidia-smi -L\n",
+        "!nvidia-smi"
+      ]
     },
     {
       "cell_type": "code",
@@ -75,90 +57,91 @@
         "#@title 2. Download stable-diffusion Repository\n",
         "from os.path import exists\n",
         "\n",
-        "if exists(\"/content/stable-diffusion/\")==True:\n",
-        "  %cd /content/stable-diffusion/\n",
-        "  print(\"Already downloaded repo\")\n",
-        "else:\n",
-        "  !git clone --quiet https://github.com/lstein/stable-diffusion.git # Original repo\n",
-        "  %cd /content/stable-diffusion/\n",
-        "  !git checkout --quiet tags/release-1.13"
+        "!git clone --quiet https://github.com/lstein/stable-diffusion.git # Original repo\n",
+        "%cd /content/stable-diffusion/\n",
+        "!git checkout --quiet tags/release-1.14.1"
       ]
     },
     {
       "cell_type": "code",
-      "source": [
-        "#@title 3. Install dependencies\n",
-        "import gc\n",
-        "\n",
-        "if exists(\"/content/stable-diffusion/requirements-colab.txt\")==True:\n",
-        "  %cd /content/stable-diffusion/\n",
-        "  print(\"Already downloaded requirements file\")\n",
-        "else:\n",
-        "  !wget https://raw.githubusercontent.com/lstein/stable-diffusion/development/requirements-colab.txt\n",
-        "!pip install colab-xterm\n",
-        "!pip install -r requirements-colab.txt\n",
-        "gc.collect()"
-      ],
+      "execution_count": null,
       "metadata": {
         "cellView": "form",
         "id": "QbXcGXYEFSNB"
       },
-      "execution_count": null,
-      "outputs": []
-    },
-    {
-      "cell_type": "code",
+      "outputs": [],
       "source": [
-        "#@title 4. Load small ML models required\n",
-        "%cd /content/stable-diffusion/\n",
-        "!python scripts/preload_models.py\n",
+        "#@title 3. Install dependencies\n",
+        "import gc\n",
+        "\n",
+        "!wget https://raw.githubusercontent.com/lstein/stable-diffusion/development/requirements.txt\n",
+        "!wget https://raw.githubusercontent.com/lstein/stable-diffusion/development/requirements-lin-win-colab-CUDA.txt\n",
+        "!pip install colab-xterm\n",
+        "!pip install -r requirements-lin-win-colab-CUDA.txt\n",
+        "!pip install clean-fid torchtext\n",
         "gc.collect()"
-      ],
-      "metadata": {
-        "cellView": "form",
-        "id": "ChIDWxLVHGGJ"
-      },
-      "execution_count": null,
-      "outputs": []
+      ]
     },
     {
       "cell_type": "code",
-      "source": [
-        "#@title 5. Restart Runtime\n",
-        "exit()"
-      ],
+      "execution_count": null,
       "metadata": {
         "cellView": "form",
         "id": "8rSMhgnAttQa"
       },
-      "execution_count": null,
-      "outputs": []
-    },
-    {
-      "cell_type": "markdown",
+      "outputs": [],
       "source": [
-        "## ◢ Configuration"
-      ],
-      "metadata": {
-        "id": "795x1tMoo8b1"
-      }
+        "#@title 4. Restart Runtime\n",
+        "exit()"
+      ]
     },
     {
       "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "cellView": "form",
+        "id": "ChIDWxLVHGGJ"
+      },
+      "outputs": [],
       "source": [
-        "#@title 6. Mount google Drive\n",
-        "from google.colab import drive\n",
-        "drive.mount('/content/drive')"
-      ],
+        "#@title 5. Load small ML models required\n",
+        "import gc\n",
+        "%cd /content/stable-diffusion/\n",
+        "!python scripts/preload_models.py\n",
+        "gc.collect()"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "795x1tMoo8b1"
+      },
+      "source": [
+        "## ◢ Configuration"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
       "metadata": {
         "cellView": "form",
         "id": "YEWPV-sF1RDM"
       },
-      "execution_count": null,
-      "outputs": []
+      "outputs": [],
+      "source": [
+        "#@title 6. Mount google Drive\n",
+        "from google.colab import drive\n",
+        "drive.mount('/content/drive')"
+      ]
     },
     {
       "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "cellView": "form",
+        "id": "zRTJeZ461WGu"
+      },
+      "outputs": [],
       "source": [
         "#@title 7. Drive Path to model\n",
         "#@markdown Path should start with /content/drive/path-to-your-file <br>\n",
@@ -167,20 +150,20 @@
         "from os.path import exists\n",
         "\n",
         "model_path = \"\" #@param {type:\"string\"}\n",
-        "if exists(model_path)==True:\n",
-        "  print(\"✅ Valid directory\")\n",
+        "if exists(model_path):\n",
+        "    print(\"✅ Valid directory\")\n",
         "else: \n",
-        "  print(\"❌ File doesn't exist\")"
-      ],
-      "metadata": {
-        "cellView": "form",
-        "id": "zRTJeZ461WGu"
-      },
-      "execution_count": null,
-      "outputs": []
+        "    print(\"❌ File doesn't exist\")"
+      ]
     },
     {
       "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "cellView": "form",
+        "id": "UY-NNz4I8_aG"
+      },
+      "outputs": [],
       "source": [
         "#@title 8. Symlink to model\n",
         "\n",
@@ -188,39 +171,39 @@
         "import os \n",
         "\n",
         "# Folder creation if it doesn't exist\n",
-        "if exists(\"/content/stable-diffusion/models/ldm/stable-diffusion-v1\")==True:\n",
-        "  print(\"❗ Dir stable-diffusion-v1 already exists\")\n",
+        "if exists(\"/content/stable-diffusion/models/ldm/stable-diffusion-v1\"):\n",
+        "     print(\"❗ Dir stable-diffusion-v1 already exists\")\n",
         "else:\n",
-        "  %mkdir /content/stable-diffusion/models/ldm/stable-diffusion-v1\n",
-        "  print(\"✅ Dir stable-diffusion-v1 created\")\n",
+        "    %mkdir /content/stable-diffusion/models/ldm/stable-diffusion-v1\n",
+        "    print(\"✅ Dir stable-diffusion-v1 created\")\n",
         "\n",
         "# Symbolic link if it doesn't exist\n",
-        "if exists(\"/content/stable-diffusion/models/ldm/stable-diffusion-v1/model.ckpt\")==True:\n",
-        "  print(\"❗ Symlink already created\")\n",
+        "if exists(\"/content/stable-diffusion/models/ldm/stable-diffusion-v1/model.ckpt\"):\n",
+        "    print(\"❗ Symlink already created\")\n",
         "else: \n",
-        "  src = model_path\n",
-        "  dst = '/content/stable-diffusion/models/ldm/stable-diffusion-v1/model.ckpt'\n",
-        "  os.symlink(src, dst) \n",
-        "  print(\"✅ Symbolic link created successfully\")"
-      ],
-      "metadata": {
-        "id": "UY-NNz4I8_aG",
-        "cellView": "form"
-      },
-      "execution_count": null,
-      "outputs": []
+        "    src = model_path\n",
+        "    dst = '/content/stable-diffusion/models/ldm/stable-diffusion-v1/model.ckpt'\n",
+        "    os.symlink(src, dst) \n",
+        "    print(\"✅ Symbolic link created successfully\")"
+      ]
     },
     {
       "cell_type": "markdown",
-      "source": [
-        "## ◢ Execution"
-      ],
       "metadata": {
         "id": "Mc28N0_NrCQH"
-      }
+      },
+      "source": [
+        "## ◢ Execution"
+      ]
     },
     {
       "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "cellView": "form",
+        "id": "ir4hCrMIuUpl"
+      },
+      "outputs": [],
       "source": [
         "#@title 9. Run Terminal and Execute Dream bot\n",
         "#@markdown <font color=\"blue\">Steps:</font> <br>\n",
@@ -229,24 +212,21 @@
         "#@markdown 3. Example text: `Astronaut floating in a distant galaxy` <br>\n",
         "#@markdown 4. To quit Dream bot use: `q` command.<br>\n",
         "\n",
-        "import gc\n",
-        "%cd /content/stable-diffusion/\n",
         "%load_ext colabxterm\n",
         "%xterm\n",
         "gc.collect()"
-      ],
-      "metadata": {
-        "id": "ir4hCrMIuUpl",
-        "cellView": "form"
-      },
-      "execution_count": null,
-      "outputs": []
+      ]
     },
     {
       "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "cellView": "form",
+        "id": "qnLohSHmKoGk"
+      },
+      "outputs": [],
       "source": [
         "#@title 10. Show the last 15 generated images\n",
-        "import gc\n",
         "import glob\n",
         "import matplotlib.pyplot as plt\n",
         "import matplotlib.image as mpimg\n",
@@ -269,13 +249,25 @@
         "    plt.imshow(image)\n",
         "    gc.collect()\n",
         "\n"
-      ],
-      "metadata": {
-        "cellView": "form",
-        "id": "qnLohSHmKoGk"
-      },
-      "execution_count": null,
-      "outputs": []
+      ]
     }
-  ]
+  ],
+  "metadata": {
+    "accelerator": "GPU",
+    "colab": {
+      "collapsed_sections": [],
+      "private_outputs": true,
+      "provenance": []
+    },
+    "gpuClass": "standard",
+    "kernelspec": {
+      "display_name": "Python 3",
+      "name": "python3"
+    },
+    "language_info": {
+      "name": "python"
+    }
+  },
+  "nbformat": 4,
+  "nbformat_minor": 0
 }