Merge branch 'master' into master

1 files changed, 2 insertions, 1 deletions

diff --git a/modules/paths.py b/modules/paths.py
index ceb80417..1e7a2fbc 100644
--- a/modules/paths.py
+++ b/modules/paths.py
@@ -1,6 +1,7 @@
 import argparse

 import os

 import sys

+import modules.safe

 

 script_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))

 models_path = os.path.join(script_path, "models")

@@ -12,6 +13,7 @@ possible_sd_paths = [os.path.join(script_path, 'repositories/stable-diffusion'),
 for possible_sd_path in possible_sd_paths:

     if os.path.exists(os.path.join(possible_sd_path, 'ldm/models/diffusion/ddpm.py')):

         sd_path = os.path.abspath(possible_sd_path)

+        break

 

 assert sd_path is not None, "Couldn't find Stable Diffusion in any of: " + str(possible_sd_paths)

 

@@ -20,7 +22,6 @@ path_dirs = [
     (os.path.join(sd_path, '../taming-transformers'), 'taming', 'Taming Transformers', []),

     (os.path.join(sd_path, '../CodeFormer'), 'inference_codeformer.py', 'CodeFormer', []),

     (os.path.join(sd_path, '../BLIP'), 'models/blip.py', 'BLIP', []),

-    (os.path.join(sd_path, '../latent-diffusion'), 'LDSR.py', 'LDSR', []),

     (os.path.join(sd_path, '../k-diffusion'), 'k_diffusion/sampling.py', 'k_diffusion', ["atstart"]),

 ]