Merge pull request #817 from Intsigstephon/develop_reg

fix eval bug

ppcls/configs/Cartoonface/ResNet50_icartoon.yaml

@@ -138,4 +138,4 @@ Metric:
         topk: [1, 5]
     Eval:
     - Recallk:
-        topk: 1
+        topk: [1]

ppcls/metric/metrics.py

@@ -69,7 +69,7 @@ class mINP(nn.Layer):
 class Recallk(nn.Layer):
     def __init__(self, topk=(1, 5)):
         super().__init__()
-        assert isinstance(topk, (int, list))
+        assert isinstance(topk, (int, list, tuple))
         if isinstance(topk, int):
             topk = [topk]
         self.topk = topk
@@ -97,6 +97,9 @@ class RetriMetric(nn.Layer):
                                    gallery_img_id, self.max_rank)
         if "Recallk" in self.config.keys():
             topk = self.config['Recallk']['topk']
+            assert isinstance(topk, (int, list, tuple))
+            if isinstance(topk, int):
+                topk = [topk]
             for k in topk:
                 metric_dict["recall{}".format(k)] = all_cmc[k - 1]
         if "mAP" in self.config.keys():