diff options
| author | missionfloyd <missionfloyd@users.noreply.github.com> | 2023-05-26 00:53:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-26 00:53:33 +0000 |
| commit | 6645f23c4c715b1bc704c88a499b2f4224d7f1e6 (patch) | |
| tree | 6aeb51e366254fe8993856a3db341690bb39dca5 /modules/esrgan_model.py | |
| parent | 43bdaa2f0eda79c685792b06a2bd84c65806a48f (diff) | |
| parent | a6e653be26cc05f4438145fa0082816e9fbbf5fc (diff) | |
| download | stable-diffusion-webui-gfx803-6645f23c4c715b1bc704c88a499b2f4224d7f1e6.tar.gz stable-diffusion-webui-gfx803-6645f23c4c715b1bc704c88a499b2f4224d7f1e6.tar.bz2 stable-diffusion-webui-gfx803-6645f23c4c715b1bc704c88a499b2f4224d7f1e6.zip | |
Merge branch 'dev' into reorder-hotkeys
Diffstat (limited to 'modules/esrgan_model.py')
| -rw-r--r-- | modules/esrgan_model.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/modules/esrgan_model.py b/modules/esrgan_model.py index f4369257..2fced999 100644 --- a/modules/esrgan_model.py +++ b/modules/esrgan_model.py @@ -6,7 +6,7 @@ from PIL import Image from basicsr.utils.download_util import load_file_from_url
import modules.esrgan_model_arch as arch
-from modules import shared, modelloader, images, devices
+from modules import modelloader, images, devices
from modules.upscaler import Upscaler, UpscalerData
from modules.shared import opts
@@ -16,9 +16,7 @@ def mod2normal(state_dict): # this code is copied from https://github.com/victorca25/iNNfer
if 'conv_first.weight' in state_dict:
crt_net = {}
- items = []
- for k, v in state_dict.items():
- items.append(k)
+ items = list(state_dict)
crt_net['model.0.weight'] = state_dict['conv_first.weight']
crt_net['model.0.bias'] = state_dict['conv_first.bias']
@@ -52,9 +50,7 @@ def resrgan2normal(state_dict, nb=23): if "conv_first.weight" in state_dict and "body.0.rdb1.conv1.weight" in state_dict:
re8x = 0
crt_net = {}
- items = []
- for k, v in state_dict.items():
- items.append(k)
+ items = list(state_dict)
crt_net['model.0.weight'] = state_dict['conv_first.weight']
crt_net['model.0.bias'] = state_dict['conv_first.bias']
@@ -158,7 +154,7 @@ class UpscalerESRGAN(Upscaler): if "http" in path:
filename = load_file_from_url(
url=self.model_url,
- model_dir=self.model_path,
+ model_dir=self.model_download_path,
file_name=f"{self.model_name}.pth",
progress=True,
)
|