diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2022-09-30 06:35:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-30 06:35:58 +0000 |
| commit | 25414bcd05ef8072ce97056039bdd99379b74be9 (patch) | |
| tree | 1fddc7e0921c0626e0b6310b915ab9ad7c65fdcd /webui.py | |
| parent | f80c3696f63a181f720105559d42ee53453ed0eb (diff) | |
| parent | 435fd2112aee9a0e61408ac56663e41beea1e446 (diff) | |
| download | stable-diffusion-webui-gfx803-25414bcd05ef8072ce97056039bdd99379b74be9.tar.gz stable-diffusion-webui-gfx803-25414bcd05ef8072ce97056039bdd99379b74be9.tar.bz2 stable-diffusion-webui-gfx803-25414bcd05ef8072ce97056039bdd99379b74be9.zip | |
Merge pull request #1109 from d8ahazard/ModelLoader
Model Loader, Fixes
Diffstat (limited to 'webui.py')
| -rw-r--r-- | webui.py | 46 |
1 files changed, 23 insertions, 23 deletions
@@ -3,36 +3,36 @@ import threading from modules import devices
from modules.paths import script_path
-
import signal
-
-from modules.shared import opts, cmd_opts, state
-import modules.shared as shared
-import modules.ui
-import modules.scripts
-import modules.sd_hijack
-import modules.codeformer_model
-import modules.gfpgan_model
-import modules.face_restoration
-import modules.realesrgan_model as realesrgan
+import threading
+import modules.paths
+import modules.codeformer_model as codeformer
import modules.esrgan_model as esrgan
-import modules.ldsr_model as ldsr
+import modules.bsrgan_model as bsrgan
import modules.extras
-import modules.lowvram
-import modules.txt2img
+import modules.face_restoration
+import modules.gfpgan_model as gfpgan
import modules.img2img
-import modules.swinir as swinir
+import modules.ldsr_model as ldsr
+import modules.lowvram
+import modules.realesrgan_model as realesrgan
+import modules.scripts
+import modules.sd_hijack
import modules.sd_models
+import modules.shared as shared
+import modules.swinir_model as swinir
+import modules.txt2img
+import modules.ui
+from modules import modelloader
+from modules.paths import script_path
+from modules.shared import cmd_opts
-
-modules.codeformer_model.setup_codeformer()
-modules.gfpgan_model.setup_gfpgan()
+modelloader.cleanup_models()
+modules.sd_models.setup_model(cmd_opts.stablediffusion_models_path)
+codeformer.setup_model(cmd_opts.codeformer_models_path)
+gfpgan.setup_model(cmd_opts.gfpgan_models_path)
shared.face_restorers.append(modules.face_restoration.FaceRestoration())
-
-esrgan.load_models(cmd_opts.esrgan_models_path)
-swinir.load_models(cmd_opts.swinir_models_path)
-realesrgan.setup_realesrgan()
-ldsr.add_lsdr()
+modelloader.load_upscalers()
queue_lock = threading.Lock()
|