move CLIP out of requirements and into launcher to make it possible to launch the program offline

3 files changed, 4 insertions, 3 deletions

diff --git a/launch.py b/launch.py
index d2793ed2..57405fea 100644
--- a/launch.py
+++ b/launch.py
@@ -15,6 +15,7 @@ requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")
 commandline_args = os.environ.get('COMMANDLINE_ARGS', "")

 

 gfpgan_package = os.environ.get('GFPGAN_PACKAGE', "git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379")

+clip_package = os.environ.get('CLIP_PACKAGE', "git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1")

 

 stable_diffusion_commit_hash = os.environ.get('STABLE_DIFFUSION_COMMIT_HASH', "69ae4b35e0a0f6ee1af8bb9a5d0016ccb27e36dc")

 taming_transformers_commit_hash = os.environ.get('TAMING_TRANSFORMERS_COMMIT_HASH', "24268930bf1dce879235a7fddd0b2355b84d7ea6")

@@ -111,6 +112,9 @@ if not skip_torch_cuda_test:
 if not is_installed("gfpgan"):

     run_pip(f"install {gfpgan_package}", "gfpgan")

 

+if not is_installed("clip"):

+    run_pip(f"install {clip_package}", "clip")

+

 os.makedirs(dir_repos, exist_ok=True)

 

 git_clone("https://github.com/CompVis/stable-diffusion.git", repo_dir('stable-diffusion'), "Stable Diffusion", stable_diffusion_commit_hash)

diff --git a/requirements.txt b/requirements.txt
index 7cb9d329..d4b337fc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,14 +13,12 @@ Pillow
 pytorch_lightning

 realesrgan

 scikit-image>=0.19

-git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379

 timm==0.4.12

 transformers==4.19.2

 torch

 einops

 jsonmerge

 clean-fid

-git+https://github.com/openai/CLIP@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1

 resize-right

 torchdiffeq

 kornia

diff --git a/requirements_versions.txt b/requirements_versions.txt
index 1e8006e0..8a9acf20 100644
--- a/requirements_versions.txt
+++ b/requirements_versions.txt
@@ -18,7 +18,6 @@ piexif==1.1.3
 einops==0.4.1

 jsonmerge==1.8.0

 clean-fid==0.1.29

-git+https://github.com/openai/CLIP@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1

 resize-right==0.0.2

 torchdiffeq==0.2.3

 kornia==0.6.7