From 79dedc08c1cf6961d426997a54a07d7482f574af Mon Sep 17 00:00:00 2001 From: roberto-corno-nttdata Date: Mon, 9 Dec 2024 14:45:34 +0100 Subject: [PATCH] fix: added input_shape to YoloFacialRecognitionClient --- deepface/models/facial_recognition/Yolo.py | 7 ++++--- deepface/modules/representation.py | 11 +++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/deepface/models/facial_recognition/Yolo.py b/deepface/models/facial_recognition/Yolo.py index fb8054d..1e08218 100644 --- a/deepface/models/facial_recognition/Yolo.py +++ b/deepface/models/facial_recognition/Yolo.py @@ -35,10 +35,11 @@ WEIGHT_URLS = ["https://drive.google.com/uc?id=1qcr9DbgsX3ryrz2uU8w4Xm3cOrRywXqb class YoloFacialRecognitionClient(FacialRecognition): def __init__(self, model: YoloModel): - super().__init__(model) + super().__init__() self.model_name = "Yolo" - self.input_shape = None + self.input_shape = (224, 224) self.output_shape = 512 + self.model = self.build_model(model) def build_model(self, model: YoloModel) -> Any: """ @@ -64,7 +65,7 @@ class YoloFacialRecognitionClient(FacialRecognition): return YOLO(weight_file) def forward(self, img: np.ndarray) -> List[float]: - return self.model.embed(img)[0].tolist() + return self.model.embed(np.squeeze(img, axis=0))[0].tolist() class YoloFacialRecognitionClientV8n(YoloFacialRecognitionClient): diff --git a/deepface/modules/representation.py b/deepface/modules/representation.py index f9e751d..c1e2a5f 100644 --- a/deepface/modules/representation.py +++ b/deepface/modules/representation.py @@ -122,12 +122,11 @@ def represent( confidence = img_obj["confidence"] # resize to expected shape of ml model - if target_size is not None: - img = preprocessing.resize_image( - img=img, - # thanks to DeepId (!) - target_size=(target_size[1], target_size[0]), - ) + img = preprocessing.resize_image( + img=img, + # thanks to DeepId (!) + target_size=(target_size[1], target_size[0]), + ) # custom normalization img = preprocessing.normalize_input(img=img, normalization=normalization)