Merge pull request #803 from cuicheng01/develop_reg

Update ImageNet configs
2025-06-03 21:55:06 +08:00 · 2021-06-08 12:13:49 +08:00 · 2021-06-08 12:13:49 +08:00 · cc583459c6
commit cc583459c6
parent e5df00a02d 36f4b36349
37 changed files with 144 additions and 180 deletions
--- a/ppcls/configs/ImageNet/HRNet/HRNet_W18_C.yaml
+++ b/ppcls/configs/ImageNet/HRNet/HRNet_W18_C.yaml
@ -118,9 +118,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/HRNet/HRNet_W30_C.yaml
+++ b/ppcls/configs/ImageNet/HRNet/HRNet_W30_C.yaml
@ -118,9 +118,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/HRNet/HRNet_W32_C.yaml
+++ b/ppcls/configs/ImageNet/HRNet/HRNet_W32_C.yaml
@ -118,9 +118,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/HRNet/HRNet_W40_C.yaml
+++ b/ppcls/configs/ImageNet/HRNet/HRNet_W40_C.yaml
@ -118,9 +118,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/HRNet/HRNet_W44_C.yaml
+++ b/ppcls/configs/ImageNet/HRNet/HRNet_W44_C.yaml
@ -116,9 +116,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/HRNet/HRNet_W48_C.yaml
+++ b/ppcls/configs/ImageNet/HRNet/HRNet_W48_C.yaml
@ -118,9 +118,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/HRNet/HRNet_W64_C.yaml
+++ b/ppcls/configs/ImageNet/HRNet/HRNet_W64_C.yaml
@ -118,9 +118,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/Ineption/InceptionV3.yaml
+++ b/ppcls/configs/ImageNet/Ineption/InceptionV3.yaml
@ -118,9 +118,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1.yaml
+++ b/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1.yaml
@ -118,9 +118,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_25.yaml
+++ b/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_25.yaml
@ -118,9 +118,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_5.yaml
+++ b/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_5.yaml
@ -118,9 +118,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_75.yaml
+++ b/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_75.yaml
@ -118,9 +118,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_35.yaml
+++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_35.yaml
@ -117,9 +117,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_5.yaml
+++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_5.yaml
@ -117,9 +117,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_75.yaml
+++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_75.yaml
@ -117,9 +117,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x1_0.yaml
+++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x1_0.yaml
@ -118,9 +118,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x1_25.yaml
+++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x1_25.yaml
@ -117,9 +117,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_35.yaml
+++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_35.yaml
@ -117,9 +117,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_5.yaml
+++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_5.yaml
@ -117,9 +117,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_75.yaml
+++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_75.yaml
@ -117,9 +117,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x1_0.yaml
+++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x1_0.yaml
@ -117,9 +117,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x1_25.yaml
+++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x1_25.yaml
@ -117,9 +117,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/ResNet/ResNet101.yaml
+++ b/ppcls/configs/ImageNet/ResNet/ResNet101.yaml
@ -118,9 +118,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/ResNet/ResNet101_vd.yaml
+++ b/ppcls/configs/ImageNet/ResNet/ResNet101_vd.yaml
@ -116,9 +116,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/ResNet/ResNet152.yaml
+++ b/ppcls/configs/ImageNet/ResNet/ResNet152.yaml
@ -118,9 +118,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/ResNet/ResNet152_vd.yaml
+++ b/ppcls/configs/ImageNet/ResNet/ResNet152_vd.yaml
@ -116,9 +116,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/ResNet/ResNet18.yaml
+++ b/ppcls/configs/ImageNet/ResNet/ResNet18.yaml
@ -118,9 +118,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/ResNet/ResNet18_vd.yaml
+++ b/ppcls/configs/ImageNet/ResNet/ResNet18_vd.yaml
@ -116,9 +116,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/ResNet/ResNet200_vd.yaml
+++ b/ppcls/configs/ImageNet/ResNet/ResNet200_vd.yaml
@ -116,9 +116,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/ResNet/ResNet34.yaml
+++ b/ppcls/configs/ImageNet/ResNet/ResNet34.yaml
@ -118,9 +118,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/ResNet/ResNet34_vd.yaml
+++ b/ppcls/configs/ImageNet/ResNet/ResNet34_vd.yaml
@ -116,9 +116,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/ResNet/ResNet50.yaml
+++ b/ppcls/configs/ImageNet/ResNet/ResNet50.yaml
@ -123,4 +123,3 @@ Metric:
    Eval:
    - TopkAcc:
        topk: [1, 5]
-
--- a/ppcls/configs/ImageNet/ResNet/ResNet50_vd.yaml
+++ b/ppcls/configs/ImageNet/ResNet/ResNet50_vd.yaml
@ -116,9 +116,9 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]

--- a/ppcls/configs/ImageNet/VGG/VGG11.yaml
+++ b/ppcls/configs/ImageNet/VGG/VGG11.yaml
@ -116,9 +116,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/VGG/VGG13.yaml
+++ b/ppcls/configs/ImageNet/VGG/VGG13.yaml
@ -116,9 +116,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/VGG/VGG16.yaml
+++ b/ppcls/configs/ImageNet/VGG/VGG16.yaml
@ -116,9 +116,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]
--- a/ppcls/configs/ImageNet/VGG/VGG19.yaml
+++ b/ppcls/configs/ImageNet/VGG/VGG19.yaml
@ -116,9 +116,8 @@ Infer:

 Metric:
    Train:
-    - Topk:
-        k: [1, 5]
+    - TopkAcc:
+        topk: [1, 5]
    Eval:
-    - Topk:
-        k: [1, 5]
-
+    - TopkAcc:
+        topk: [1, 5]