Merge branch 'master' into fix-vram

1 files changed, 11 insertions, 5 deletions

diff --git a/modules/codeformer_model.py b/modules/codeformer_model.py
index 8769e1db..e6d9fa4f 100644
--- a/modules/codeformer_model.py
+++ b/modules/codeformer_model.py
@@ -69,10 +69,14 @@ def setup_model(dirname):
 

                 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 +86,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)

@@ -97,7 +103,7 @@ def setup_model(dirname):
                             output = self.net(cropped_face_t, w=w if w is not None else shared.opts.code_former_weight, adain=True)[0]

                             restored_face = tensor2img(output, rgb2bgr=True, min_max=(-1, 1))

                         del output

-                        devices.torch_gc()

+                        torch.cuda.empty_cache()

                     except Exception as error:

                         print(f'\tFailed inference for CodeFormer: {error}', file=sys.stderr)

                         restored_face = tensor2img(cropped_face_t, rgb2bgr=True, min_max=(-1, 1))

@@ -113,10 +119,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 = None

-                    self.face_helper = None

-                    devices.torch_gc()

+                    self.send_model_to(devices.cpu)

 

                 return restored_img