Merge branch 'master' into xygrid_infotext_improvements

1 files changed, 13 insertions, 2 deletions

diff --git a/modules/codeformer_model.py b/modules/codeformer_model.py
index a29f3855..ab40d842 100644
--- a/modules/codeformer_model.py
+++ b/modules/codeformer_model.py
@@ -36,6 +36,7 @@ def setup_model(dirname):
         from basicsr.utils.download_util import load_file_from_url

         from basicsr.utils import imwrite, img2tensor, tensor2img

         from facelib.utils.face_restoration_helper import FaceRestoreHelper

+        from facelib.detection.retinaface import retinaface

         from modules.shared import cmd_opts

 

         net_class = CodeFormer

@@ -65,14 +66,20 @@ def setup_model(dirname):
                 net.load_state_dict(checkpoint)

                 net.eval()

 

+                if hasattr(retinaface, 'device'):

+                    retinaface.device = devices.device_codeformer

                 face_helper = FaceRestoreHelper(1, face_size=512, crop_ratio=(1, 1), det_model='retinaface_resnet50', save_ext='png', use_parse=True, device=devices.device_codeformer)

 

                 self.net = net

                 self.face_helper = face_helper

-                self.net.to(devices.device_codeformer)

 

                 return net, face_helper

 

+            def send_model_to(self, device):

+                self.net.to(device)

+                self.face_helper.face_det.to(device)

+                self.face_helper.face_parse.to(device)

+

             def restore(self, np_image, w=None):

                 np_image = np_image[:, :, ::-1]

 

@@ -82,6 +89,8 @@ def setup_model(dirname):
                 if self.net is None or self.face_helper is None:

                     return np_image

 

+                self.send_model_to(devices.device_codeformer)

+

                 self.face_helper.clean_all()

                 self.face_helper.read_image(np_image)

                 self.face_helper.get_face_landmarks_5(only_center_face=False, resize=640, eye_dist_threshold=5)

@@ -113,8 +122,10 @@ def setup_model(dirname):
                 if original_resolution != restored_img.shape[0:2]:

                     restored_img = cv2.resize(restored_img, (0, 0), fx=original_resolution[1]/restored_img.shape[1], fy=original_resolution[0]/restored_img.shape[0], interpolation=cv2.INTER_LINEAR)

 

+                self.face_helper.clean_all()

+

                 if shared.opts.face_restoration_unload:

-                    self.net.to(devices.cpu)

+                    self.send_model_to(devices.cpu)

 

                 return restored_img