commit 4427b9fe86ca801cf81a734f0656782cf0c7e225
author Viet Dang <vddang@google.com> Fri Sep 21 00:03:31 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Sep 21 00:03:31 2018 -0700
tree fb2d5620d3d9a987d4ad8a249a27c6d7331a0127
parent 86200e923fccfe418e2b5fe23d672b7bcc828276
parent 42ba47aeb38e5cb6f2faeb8d7c575a6d7c9eff2d

Moves evaluator field one level up in the model configs. am: bba199c7c9
am: 42ba47aeb3

Change-Id: Ia57e8c6715c3f19dd0f645b1a35fe91b29b483b3

assets/models_list/mobilenet_imagenet_aosp.json

diff --git a/assets/models_list/mobilenet_imagenet_aosp.json b/assets/models_list/mobilenet_imagenet_aosp.json
index b0dbc93..52aac24 100644
--- a/assets/models_list/mobilenet_imagenet_aosp.json
+++ b/assets/models_list/mobilenet_imagenet_aosp.json
@@ -4,13 +4,13 @@
       "name": "mobilenet_float_topk_aosp",
       "modelFile": "mobilenet_float",
       "baselineSec": 0.060,
+      "evaluator": "TopK",
       "inputSize": [1, 224, 224, 3],
       "dataSize": 4,
       "dataset": {
           "inputPath": "imagenet_aosp/",
           "groundTruth": "imagenet_aosp/ground_truth_labels.txt",
           "labels": "imagenet_aosp/labels.txt",
-          "evaluator": "TopK",
           "preprocessor": "Inception"
       }
     },
@@ -18,6 +18,7 @@
       "name": "mobilenet_quantized_topk_aosp",
       "modelFile": "mobilenet_quantized",
       "baselineSec": 0.060,
+      "evaluator": "TopK",
       "inputSize": [1, 224, 224, 3],
       "dataSize": 1,
       "inputScale": 0.007812,
@@ -26,7 +27,6 @@
           "inputPath": "imagenet_aosp",
           "groundTruth": "imagenet_aosp/ground_truth_labels.txt",
           "labels": "imagenet_aosp/labels.txt",
-          "evaluator": "TopK",
           "preprocessor": "Inception"
       }
     }