aboutsummaryrefslogtreecommitdiffstats
path: root/extensions-builtin/LDSR
diff options
context:
space:
mode:
authorAarni Koskela <akx@iki.fi>2023-05-29 06:34:26 +0000
committerAarni Koskela <akx@iki.fi>2023-06-13 09:38:28 +0000
commit89352a2f52c6be51318192cedd86c8a342966a49 (patch)
treefde621a62c1778d10aa1834597ec367de429642f /extensions-builtin/LDSR
parent59419bd64a1581caccaac04dceb66c1c069a2db1 (diff)
downloadstable-diffusion-webui-gfx803-89352a2f52c6be51318192cedd86c8a342966a49.tar.gz
stable-diffusion-webui-gfx803-89352a2f52c6be51318192cedd86c8a342966a49.tar.bz2
stable-diffusion-webui-gfx803-89352a2f52c6be51318192cedd86c8a342966a49.zip
Move `load_file_from_url` to modelloader
Diffstat (limited to 'extensions-builtin/LDSR')
-rw-r--r--extensions-builtin/LDSR/scripts/ldsr_model.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/extensions-builtin/LDSR/scripts/ldsr_model.py b/extensions-builtin/LDSR/scripts/ldsr_model.py
index dbd6d331..bf9b6de2 100644
--- a/extensions-builtin/LDSR/scripts/ldsr_model.py
+++ b/extensions-builtin/LDSR/scripts/ldsr_model.py
@@ -1,7 +1,6 @@
import os
-from basicsr.utils.download_util import load_file_from_url
-
+from modules.modelloader import load_file_from_url
from modules.upscaler import Upscaler, UpscalerData
from ldsr_model_arch import LDSR
from modules import shared, script_callbacks, errors
@@ -43,9 +42,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_download_path, file_name="model.ckpt", progress=True)
+ model = local_ckpt_path or load_file_from_url(self.model_url, model_dir=self.model_download_path, file_name="model.ckpt")
- 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)
+ yaml = local_yaml_path or load_file_from_url(self.yaml_url, model_dir=self.model_download_path, file_name="project.yaml")
try:
return LDSR(model, yaml)