diff --git a/ppcls/configs/Vehicle/ResNet50.yaml b/ppcls/configs/Vehicle/ResNet50.yaml index 23cb462cb9ed8d9f1b77f461a05fec26201924bb..e7c4736dbec73b3336ea8872a8d743e129fff5c1 100644 --- a/ppcls/configs/Vehicle/ResNet50.yaml +++ b/ppcls/configs/Vehicle/ResNet50.yaml @@ -148,9 +148,9 @@ Infer: Metric: Train: - - Topk: - k: [1, 5] + - TopkAcc: + topk: [1, 5] Eval: - - Topk: - k: [1, 5] + - TopkAcc: + topk: [1, 5] diff --git a/ppcls/configs/Vehicle/ResNet50_ReID.yaml b/ppcls/configs/Vehicle/ResNet50_ReID.yaml index 39862847e090626d25eb93e2cb7a3447a6263fbe..a8d20474460d42077d4e2a6c1d13c0248a66b374 100644 --- a/ppcls/configs/Vehicle/ResNet50_ReID.yaml +++ b/ppcls/configs/Vehicle/ResNet50_ReID.yaml @@ -147,7 +147,7 @@ Metric: Eval: - Recallk: topk: [1, 5] - - mAP: + - mAP: {} Infer: infer_imgs: "docs/images/whl/demo.jpg" diff --git a/ppcls/metric/metrics.py b/ppcls/metric/metrics.py index ac2866392ab664636cb31b9e70cf1bd0438f998b..05723c12303fdf616110a0cccffb883058f62674 100644 --- a/ppcls/metric/metrics.py +++ b/ppcls/metric/metrics.py @@ -39,9 +39,8 @@ class TopkAcc(nn.Layer): class mAP(nn.Layer): - def __init__(self, name="mAP"): + def __init__(self): super().__init__() - self.name = name def forward(self, similarities_matrix, query_img_id, gallery_img_id): metric_dict = dict() @@ -49,14 +48,13 @@ class mAP(nn.Layer): gallery_img_id) mAP = np.mean(all_AP) - metric_dict[self.name] = mAP + metric_dict["mAP"] = mAP return metric_dict class mINP(nn.Layer): - def __init__(self, name="mINP"): + def __init__(self): super().__init__() - self.name = name def forward(self, similarities_matrix, query_img_id, gallery_img_id): metric_dict = dict() @@ -64,7 +62,7 @@ class mINP(nn.Layer): gallery_img_id) mINP = np.mean(all_INP) - metric_dict[self.name] = mINP + metric_dict["mINP"] = mINP return metric_dict