diff options
| author | AUTOMATIC <16777216c@gmail.com> | 2023-05-19 06:09:00 +0000 |
|---|---|---|
| committer | AUTOMATIC <16777216c@gmail.com> | 2023-05-19 06:09:18 +0000 |
| commit | df6fffb054f8d3444baa887151a4874506a68be1 (patch) | |
| tree | 6b2ab174215a1525a62d1fdd9fd46f7c61302e1d /extensions-builtin | |
| parent | 379fd6204dfc27e16acc03f705ecd9ff23c2d1c0 (diff) | |
| download | stable-diffusion-webui-gfx803-df6fffb054f8d3444baa887151a4874506a68be1.tar.gz stable-diffusion-webui-gfx803-df6fffb054f8d3444baa887151a4874506a68be1.tar.bz2 stable-diffusion-webui-gfx803-df6fffb054f8d3444baa887151a4874506a68be1.zip | |
change upscalers to download models into user-specified directory (from commandline args) rather than the default models/<...>
Diffstat (limited to 'extensions-builtin')
| -rw-r--r-- | extensions-builtin/LDSR/scripts/ldsr_model.py | 4 | ||||
| -rw-r--r-- | extensions-builtin/ScuNET/scripts/scunet_model.py | 3 | ||||
| -rw-r--r-- | extensions-builtin/SwinIR/scripts/swinir_model.py | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/extensions-builtin/LDSR/scripts/ldsr_model.py b/extensions-builtin/LDSR/scripts/ldsr_model.py index fbbe9005..c4da79f3 100644 --- a/extensions-builtin/LDSR/scripts/ldsr_model.py +++ b/extensions-builtin/LDSR/scripts/ldsr_model.py @@ -45,9 +45,9 @@ class UpscalerLDSR(Upscaler): if local_safetensors_path is not None and os.path.exists(local_safetensors_path): model = local_safetensors_path else: - model = local_ckpt_path if local_ckpt_path is not None else load_file_from_url(url=self.model_url, model_dir=self.model_path, file_name="model.ckpt", progress=True) + model = local_ckpt_path if local_ckpt_path is not None else load_file_from_url(url=self.model_url, model_dir=self.model_download_path, file_name="model.ckpt", progress=True) - yaml = local_yaml_path if local_yaml_path is not None else load_file_from_url(url=self.yaml_url, model_dir=self.model_path, file_name="project.yaml", progress=True) + yaml = local_yaml_path if local_yaml_path is not None else load_file_from_url(url=self.yaml_url, model_dir=self.model_download_path, file_name="project.yaml", progress=True) try: return LDSR(model, yaml) diff --git a/extensions-builtin/ScuNET/scripts/scunet_model.py b/extensions-builtin/ScuNET/scripts/scunet_model.py index cc2cbc6a..45d9297b 100644 --- a/extensions-builtin/ScuNET/scripts/scunet_model.py +++ b/extensions-builtin/ScuNET/scripts/scunet_model.py @@ -121,8 +121,7 @@ class UpscalerScuNET(modules.upscaler.Upscaler): def load_model(self, path: str): device = devices.get_device_for('scunet') if "http" in path: - filename = load_file_from_url(url=self.model_url, model_dir=self.model_path, file_name="%s.pth" % self.name, - progress=True) + filename = load_file_from_url(url=self.model_url, model_dir=self.model_download_path, file_name="%s.pth" % self.name, progress=True) else: filename = path if not os.path.exists(os.path.join(self.model_path, filename)) or filename is None: diff --git a/extensions-builtin/SwinIR/scripts/swinir_model.py b/extensions-builtin/SwinIR/scripts/swinir_model.py index 0ba50487..1c7bf325 100644 --- a/extensions-builtin/SwinIR/scripts/swinir_model.py +++ b/extensions-builtin/SwinIR/scripts/swinir_model.py @@ -51,7 +51,7 @@ class UpscalerSwinIR(Upscaler): def load_model(self, path, scale=4): if "http" in path: dl_name = "%s%s" % (self.model_name.replace(" ", "_"), ".pth") - filename = load_file_from_url(url=path, model_dir=self.model_path, file_name=dl_name, progress=True) + filename = load_file_from_url(url=path, model_dir=self.model_download_path, file_name=dl_name, progress=True) else: filename = path if filename is None or not os.path.exists(filename): |