Merge pull request #1109 from d8ahazard/ModelLoader

Model Loader, Fixes

1 files changed, 6 insertions, 5 deletions

diff --git a/launch.py b/launch.py
index ad41ee41..3b8d8f23 100644
--- a/launch.py
+++ b/launch.py
@@ -1,5 +1,5 @@
 # this scripts installs necessary requirements and launches main program in webui.py

-

+import shutil

 import subprocess

 import os

 import sys

@@ -22,7 +22,6 @@ taming_transformers_commit_hash = os.environ.get('TAMING_TRANSFORMERS_COMMIT_HAS
 k_diffusion_commit_hash = os.environ.get('K_DIFFUSION_COMMIT_HASH', "a7ec1974d4ccb394c2dca275f42cd97490618924")

 codeformer_commit_hash = os.environ.get('CODEFORMER_COMMIT_HASH', "c5b4593074ba6214284d6acd5f1719b6c5d739af")

 blip_commit_hash = os.environ.get('BLIP_COMMIT_HASH', "48211a1594f1321b00f14c9f7a5b4813144b2fb9")

-ldsr_commit_hash = os.environ.get('LDSR_COMMIT_HASH', "abf33e7002d59d9085081bce93ec798dcabd49af")

 

 args = shlex.split(commandline_args)

 

@@ -120,9 +119,11 @@ git_clone("https://github.com/CompVis/taming-transformers.git", repo_dir('taming
 git_clone("https://github.com/crowsonkb/k-diffusion.git", repo_dir('k-diffusion'), "K-diffusion", k_diffusion_commit_hash)

 git_clone("https://github.com/sczhou/CodeFormer.git", repo_dir('CodeFormer'), "CodeFormer", codeformer_commit_hash)

 git_clone("https://github.com/salesforce/BLIP.git", repo_dir('BLIP'), "BLIP", blip_commit_hash)

-# Using my repo until my changes are merged, as this makes interfacing with our version of SD-web a lot easier

-git_clone("https://github.com/Hafiidz/latent-diffusion", repo_dir('latent-diffusion'), "LDSR", ldsr_commit_hash)

-

+if os.path.isdir(repo_dir('latent-diffusion')):

+    try:

+        shutil.rmtree(repo_dir('latent-diffusion'))

+    except:

+        pass

 if not is_installed("lpips"):

     run_pip(f"install -r {os.path.join(repo_dir('CodeFormer'), 'requirements.txt')}", "requirements for CodeFormer")