From d9b49144066d9b6d8fe8b4213f830c5c6d451749 Mon Sep 17 00:00:00 2001
From: ZeroCool940711 <alejandrogilelias940711@gmail.com>
Date: Fri, 7 Oct 2022 12:40:06 -0700
Subject: [PATCH] Moved the pip dependencies from the environment.yaml to the
 requirements.txt file.

---
 environment.yaml | 50 +-------------------------------------------
 requirements.txt | 54 ++++++++++++++++++++++++++++++++----------------
 2 files changed, 37 insertions(+), 67 deletions(-)

diff --git a/environment.yaml b/environment.yaml
index b966e4a37..f62921929 100644
--- a/environment.yaml
+++ b/environment.yaml
@@ -29,53 +29,5 @@ dependencies:
   - scikit-image=0.19.2
   - torchvision=0.12.0
   - pip:
-    - -e .
-    - -e git+https://github.com/CompVis/taming-transformers#egg=taming-transformers
-    - -e git+https://github.com/openai/CLIP#egg=clip
-    - -e git+https://github.com/hlky/k-diffusion-sd#egg=k_diffusion
-    - -e git+https://github.com/devilismyfriend/latent-diffusion#egg=latent-diffusion
-    - accelerate==0.12.0
-    - albumentations==0.4.3
-    - basicsr>=1.3.4.0
-    - diffusers==0.3.0
-    - einops==0.3.1
-    - facexlib>=0.2.3
-    - ftfy==6.1.1
-    - fairscale==0.4.4
-    - gradio==3.1.6
-    - gfpgan==1.3.8
-    - hydralit_components==1.0.10
-    - hydralit==1.0.14
-    - imageio-ffmpeg==0.4.2
-    - imageio==2.9.0
-    - kornia==0.6
-    - loguru
-    - omegaconf==2.1.1
-    - opencv-python-headless==4.6.0.66
-    - open-clip-torch==2.0.2
-    - pandas==1.4.3
-    - piexif==1.1.3
-    - pudb==2019.2
-    - pynvml==11.4.1
-    - python-slugify>=6.1.2
-    - pytorch-lightning==1.4.2
-    - retry>=0.9.2
-    - regex
-    - realesrgan==0.3.0
-    - streamlit==1.13.0
-    - streamlit-on-Hover-tabs==1.0.1
-    - streamlit-option-menu==0.3.2
-    - streamlit_nested_layout
-    - streamlit-server-state==0.14.2
-    - streamlit-tensorboard==0.0.2
-    - test-tube>=0.7.5
-    - tensorboard==2.10.1
-    - timm==0.6.7
-    - torch-fidelity==0.3.0
-    - torchmetrics==0.6.0
-    - transformers==4.19.2
-    - tensorflow==2.10.0
-    - tqdm==4.64.0
-    - stqdm==0.0.4
-    - wget
+    - -r requirements.txt
 
diff --git a/requirements.txt b/requirements.txt
index c4dc50ef3..d8708a5ae 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,31 +1,28 @@
-transformers==4.19.2 # do not change
-diffusers==0.3.0
-invisible-watermark==0.1.5
-pytorch_lightning==1.7.7
-open-clip-torch
-loguru
-taming-transformers-rom1504==0.0.6  # required by ldm
-wget
+-e .
+
 # See: https://github.com/CompVis/taming-transformers/issues/176
 # -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers # required by ldm
 # Note: taming package needs to be installed with -e option
+-e git+https://github.com/CompVis/taming-transformers#egg=taming-transformers
+invisible-watermark==0.1.5
+taming-transformers-rom1504==0.0.6  # required by ldm
 
+# Note: K-diffusion brings in CLIP 1.0 as a dependency automatically; will create a dependency resolution conflict when explicitly specified together
+git+https://github.com/openai/CLIP.git@main#egg=clip
 
 git+https://github.com/crowsonkb/k-diffusion.git
-# Note: K-diffusion brings in CLIP 1.0 as a dependency automatically; will create a dependency resolution conflict when explicitly specified together
-# git+https://github.com/openai/CLIP.git@main#egg=clip
+# git+https://github.com/hlky/k-diffusion-sd#egg=k_diffusion
 
 # Dependencies required for Stable Diffusion UI
 pynvml==11.4.1
 omegaconf==2.2.3
 
-Jinja2==3.1.2  # Jinja2 is required by Gradio
 # Note: Jinja2 3.x major version required due to breaking changes found in markupsafe==2.1.1; 2.0.1 is incompatible with other upstream dependencies
 # see https://github.com/pallets/markupsafe/issues/304
-
+Jinja2==3.1.2  # Jinja2 is required by Gradio
 
 # Environment Dependencies for WebUI (gradio)
-gradio==3.4
+gradio==3.1.6
 
 # Environment Dependencies for WebUI (streamlit)
 streamlit==1.13.0
@@ -36,6 +33,7 @@ streamlit-server-state==0.14.2
 streamlit-tensorboard==0.0.2
 hydralit==1.0.14
 hydralit_components==1.0.10
+stqdm==0.0.4
 
 # Img2text
 ftfy==6.1.1
@@ -47,9 +45,30 @@ tensorboard==2.10.1
 
 
 # Other
-retry==0.9.2  # used by sdutils
-python-slugify==6.1.2  # used by sdutils
-piexif==1.1.3  # used by sdutils
+retry==0.9.2  # used by sd_utils
+python-slugify==6.1.2  # used by sd_utils
+piexif==1.1.3  # used by sd_utils
+
+accelerate==0.12.0
+albumentations==0.4.3
+diffusers==0.3.0
+einops==0.3.1
+facexlib>=0.2.3
+imageio-ffmpeg==0.4.2
+imageio==2.9.0
+kornia==0.6
+loguru
+opencv-python-headless==4.6.0.66
+open-clip-torch==2.0.2
+pandas==1.4.3
+pudb==2019.2
+pytorch-lightning==1.7.7
+realesrgan==0.3.0
+test-tube>=0.7.5
+timm==0.6.7
+torch-fidelity==0.3.0
+transformers==4.19.2 # do not change
+wget
 
 # Optional packages commonly used with Stable Diffusion workflow
 
@@ -57,11 +76,10 @@ piexif==1.1.3  # used by sdutils
 basicsr==1.4.2  # required by RealESRGAN
 gfpgan==1.3.8  # GFPGAN
 realesrgan==0.3.0  # RealESRGAN brings in GFPGAN as a requirement
--e git+https://github.com/devilismyfriend/latent-diffusion#egg=latent-diffusion  #ldsr
+git+https://github.com/CompVis/latent-diffusion
 
 ## for monocular depth estimation 
 tensorflow==2.10.0
 
-
 # Orphaned Packages:  No usage found