From 070716eef1f7f07612ed8a37b03ceeb6fb8fd317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=E5=8D=BF?= <64625668+leo-q8@users.noreply.github.com> Date: Tue, 10 Dec 2024 13:57:00 +0800 Subject: [PATCH] fix resnet50_face metric (#3310) * fix resnet50_face metric * fix face rec model to_static bug --- .../FaceRecognition_ArcFace_ResNet50.yaml | 2 +- ppcls/engine/evaluation/face_recognition.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ppcls/configs/Face_Recognition/FaceRecognition_ArcFace_ResNet50.yaml b/ppcls/configs/Face_Recognition/FaceRecognition_ArcFace_ResNet50.yaml index fcfd0cd87..5d1557d70 100644 --- a/ppcls/configs/Face_Recognition/FaceRecognition_ArcFace_ResNet50.yaml +++ b/ppcls/configs/Face_Recognition/FaceRecognition_ArcFace_ResNet50.yaml @@ -128,4 +128,4 @@ DataLoader: Metric: Eval: - - BestAccOnFiveDatasets: {} + - FaceAccOnFiveDatasets: {} diff --git a/ppcls/engine/evaluation/face_recognition.py b/ppcls/engine/evaluation/face_recognition.py index fcedca3c1..83bf34edb 100644 --- a/ppcls/engine/evaluation/face_recognition.py +++ b/ppcls/engine/evaluation/face_recognition.py @@ -66,8 +66,12 @@ def face_recognition_eval(engine, epoch_id=0): [images_right, paddle.flip(images_right, axis=-1)], 0) with engine.auto_cast(is_eval=True): - out_left = engine.model(images_left) - out_right = engine.model(images_right) + if engine.is_rec: + out_left = engine.model(images_left, labels.reshape([-1, 1])) + out_right = engine.model(images_right, labels.reshape([-1, 1])) + else: + out_left = engine.model(images_left) + out_right = engine.model(images_right) # get features if engine.config["Global"].get("retrieval_feature_from", @@ -149,4 +153,5 @@ def face_recognition_eval(engine, epoch_id=0): if engine.eval_metric_func is None: return -1 # return 1st metric in the dict - return engine.eval_metric_func.avg \ No newline at end of file + return engine.eval_metric_func.avg +