diff --git a/modules/ldsr_model_arch.py b/modules/ldsr_model_arch.py index 8fe87c6a93d909a6802f83599b5517477c81d0d2..f8f3c3d38fee06ce838ee2755103dd7ab50009fc 100644 --- a/modules/ldsr_model_arch.py +++ b/modules/ldsr_model_arch.py @@ -101,8 +101,10 @@ class LDSR: print("Foo") down_sample_rate = target_scale / 4 print(f"Downsample rate is {down_sample_rate}") - width_downsampled_pre = width_og * down_sample_rate - height_downsampled_pre = height_og * down_sample_method + wd = width_og * down_sample_rate + hd = height_og * down_sample_rate + width_downsampled_pre = int(wd) + height_downsampled_pre = int(hd) if down_sample_rate != 1: print( diff --git a/modules/modelloader.py b/modules/modelloader.py index 6de65c69f3bc72629c120f2fa40091b49e85d875..51b3ecd5a4b86ce00b2580828f693ad12da97962 100644 --- a/modules/modelloader.py +++ b/modules/modelloader.py @@ -118,11 +118,9 @@ def load_upscalers(): for cls in Upscaler.__subclasses__(): name = cls.__name__ module_name = cls.__module__ - print(f"Class: {name} and {module_name}") module = importlib.import_module(module_name) class_ = getattr(module, name) cmd_name = f"{name.lower().replace('upscaler', '')}-models-path" - print(f"CMD Name: {cmd_name}") opt_string = None try: opt_string = shared.opts.__getattr__(cmd_name) @@ -130,18 +128,6 @@ def load_upscalers(): pass scaler = class_(opt_string) for child in scaler.scalers: - print(f"Appending {child.name}") datas.append(child) shared.sd_upscalers = datas - - # for scaler in subclasses: - # print(f"Found scaler: {type(scaler).__name__}") - # try: - # scaler = scaler() - # for child in scaler.scalers: - # print(f"Appending {child.name}") - # datas.append[child] - # except: - # pass - # shared.sd_upscalers = datas diff --git a/modules/swinir_model.py b/modules/swinir_model.py index ea7b6301acd4c35b99b246ae82168d8ec4bf26c4..41fda5a7cf226f2464521ace1a992221969ffd79 100644 --- a/modules/swinir_model.py +++ b/modules/swinir_model.py @@ -52,7 +52,7 @@ class UpscalerSwinIR(Upscaler): def load_model(self, path, scale=4): if "http" in path: - dl_name = "%s%s" % (self.name.replace(" ", "_"), ".pth") + 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) else: filename = path