diff options
author | ParityError <36368048+ParityError@users.noreply.github.com> | 2023-03-29 01:29:59 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-29 01:29:59 +0000 |
commit | f69acfe9a4c09a5c2299e0cc2d5bdcd7a6e62285 (patch) | |
tree | 01852aeac922029273e08a90c683d63c6fc169cd /modules/modelloader.py | |
parent | fb68d93b6a579a424919b22682cf067ce9a8e13f (diff) | |
parent | 3856ada5cc9ac4124e20ff311ce7aa77330845d9 (diff) | |
download | stable-diffusion-webui-gfx803-f69acfe9a4c09a5c2299e0cc2d5bdcd7a6e62285.tar.gz stable-diffusion-webui-gfx803-f69acfe9a4c09a5c2299e0cc2d5bdcd7a6e62285.tar.bz2 stable-diffusion-webui-gfx803-f69acfe9a4c09a5c2299e0cc2d5bdcd7a6e62285.zip |
Merge branch 'AUTOMATIC1111:master' into master
Diffstat (limited to 'modules/modelloader.py')
-rw-r--r-- | modules/modelloader.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/modelloader.py b/modules/modelloader.py index e351d808..522affc6 100644 --- a/modules/modelloader.py +++ b/modules/modelloader.py @@ -4,7 +4,6 @@ import shutil import importlib from urllib.parse import urlparse -from basicsr.utils.download_util import load_file_from_url from modules import shared from modules.upscaler import Upscaler, UpscalerLanczos, UpscalerNearest, UpscalerNone from modules.paths import script_path, models_path @@ -59,6 +58,7 @@ def load_models(model_path: str, model_url: str = None, command_path: str = None if model_url is not None and len(output) == 0: if download_name is not None: + from basicsr.utils.download_util import load_file_from_url dl = load_file_from_url(model_url, model_path, True, download_name) output.append(dl) else: |