Merge branch 'master' into hypernetwork-training

1 files changed, 2 insertions, 4 deletions

diff --git a/modules/esrgan_model.py b/modules/esrgan_model.py
index d17e730f..46ad0da3 100644
--- a/modules/esrgan_model.py
+++ b/modules/esrgan_model.py
@@ -5,9 +5,8 @@ import torch
 from PIL import Image

 from basicsr.utils.download_util import load_file_from_url

 

-import modules.esrgam_model_arch as arch

+import modules.esrgan_model_arch as arch

 from modules import shared, modelloader, images, devices

-from modules.paths import models_path

 from modules.upscaler import Upscaler, UpscalerData

 from modules.shared import opts

 

@@ -76,7 +75,6 @@ class UpscalerESRGAN(Upscaler):
         self.model_name = "ESRGAN_4x"

         self.scalers = []

         self.user_path = dirname

-        self.model_path = os.path.join(models_path, self.name)

         super().__init__()

         model_paths = self.find_models(ext_filter=[".pt", ".pth"])

         scalers = []

@@ -111,7 +109,7 @@ class UpscalerESRGAN(Upscaler):
             print("Unable to load %s from %s" % (self.model_path, filename))

             return None

 

-        pretrained_net = torch.load(filename, map_location='cpu' if shared.device.type == 'mps' else None)

+        pretrained_net = torch.load(filename, map_location='cpu' if devices.device_esrgan.type == 'mps' else None)

         crt_model = arch.RRDBNet(3, 3, 64, 23, gc=32)

 

         pretrained_net = fix_model_layers(crt_model, pretrained_net)