diff --git a/insightface_func/face_detect_crop_multi.py b/insightface_func/face_detect_crop_multi.py index d75c36b5..3b75b9e2 100644 --- a/insightface_func/face_detect_crop_multi.py +++ b/insightface_func/face_detect_crop_multi.py @@ -49,7 +49,7 @@ def __init__(self, name, root='~/.insightface_func/models'): def prepare(self, ctx_id, det_thresh=0.5, det_size=(640, 640), mode ='None'): - self.det_thresh = det_thresh + self.det_model.det_thresh = det_thresh self.mode = mode assert det_size is not None print('set det-size:', det_size) @@ -62,7 +62,6 @@ def prepare(self, ctx_id, det_thresh=0.5, det_size=(640, 640), mode ='None'): def get(self, img, crop_size, max_num=0): bboxes, kpss = self.det_model.detect(img, - threshold=self.det_thresh, max_num=max_num, metric='default') if bboxes.shape[0] == 0: diff --git a/insightface_func/face_detect_crop_single.py b/insightface_func/face_detect_crop_single.py index f3f648f3..9061d470 100644 --- a/insightface_func/face_detect_crop_single.py +++ b/insightface_func/face_detect_crop_single.py @@ -49,7 +49,7 @@ def __init__(self, name, root='~/.insightface_func/models'): def prepare(self, ctx_id, det_thresh=0.5, det_size=(640, 640), mode ='None'): - self.det_thresh = det_thresh + self.det_model.det_thresh = det_thresh self.mode = mode assert det_size is not None print('set det-size:', det_size) @@ -62,7 +62,6 @@ def prepare(self, ctx_id, det_thresh=0.5, det_size=(640, 640), mode ='None'): def get(self, img, crop_size, max_num=0): bboxes, kpss = self.det_model.detect(img, - threshold=self.det_thresh, max_num=max_num, metric='default') if bboxes.shape[0] == 0: diff --git a/util/reverse2original.py b/util/reverse2original.py index 83f1bdb8..fb7b1937 100644 --- a/util/reverse2original.py +++ b/util/reverse2original.py @@ -154,9 +154,9 @@ def reverse2wholeimage(b_align_crop_tenor_list,swaped_imgs, mats, crop_size, ori # target_image_parsing = postprocess(target_image, source_image, tgt_mask) if use_mask: - target_image = np.array(target_image, dtype=np.float) * 255 + target_image = np.array(target_image, dtype=np.float32) * 255 else: - target_image = np.array(target_image, dtype=np.float)[..., ::-1] * 255 + target_image = np.array(target_image, dtype=np.float32)[..., ::-1] * 255 img_mask_list.append(img_mask) @@ -165,7 +165,7 @@ def reverse2wholeimage(b_align_crop_tenor_list,swaped_imgs, mats, crop_size, ori # target_image /= 255 # target_image = 0 - img = np.array(oriimg, dtype=np.float) + img = np.array(oriimg, dtype=np.float32) for img_mask, target_image in zip(img_mask_list, target_image_list): img = img_mask * target_image + (1-img_mask) * img