Merge branch 'master' into master

1 files changed, 3 insertions, 0 deletions

diff --git a/modules/codeformer_model.py b/modules/codeformer_model.py
index e6d9fa4f..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,6 +66,8 @@ 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