From 435fd2112aee9a0e61408ac56663e41beea1e446 Mon Sep 17 00:00:00 2001
From: d8ahazard <d8ahazard@gmail.com>
Date: Thu, 29 Sep 2022 19:59:53 -0500
Subject: [PATCH] Fixes, cleanup.

---
 modules/ldsr_model_arch.py |  6 ++++--
 modules/modelloader.py     | 14 --------------
 modules/swinir_model.py    |  2 +-
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/modules/ldsr_model_arch.py b/modules/ldsr_model_arch.py
index 8fe87c6a9..f8f3c3d38 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 6de65c69f..51b3ecd5a 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 ea7b6301a..41fda5a7c 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
-- 
GitLab