commit e7989ddbaf3500fae7d8af743a7d90944ab0127f
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Fri Oct 05 14:29:19 2018 +0100
committer Przemyslaw Szczepaniak <pszczepaniak@google.com> Mon Oct 15 16:19:24 2018 +0100
tree 41d682bd0950212714079a0fd3875179b2d2b85d
parent 843387f2abf6aad5e46f744648ad873d14e7a3e2

Add mobilenet variants to scoring test

+ Made latency graphs smaller to compansate for
more rows.

Test: NeuralNetworksApiBenchmark
Bug: 113652869
Change-Id: I230ef3f1676c21b7e444e7f477d6dd949e33ac5c
Merged-In: I230ef3f1676c21b7e444e7f477d6dd949e33ac5c
(cherry picked from commit 69a656324007f60628976413381e58ccedb98633)

results/generate_result.py

diff --git a/results/generate_result.py b/results/generate_result.py
index 707f991..7ab319d 100755
--- a/results/generate_result.py
+++ b/results/generate_result.py
@@ -234,7 +234,7 @@
    <td>{testset_size:d}</td>
    <td>{avg_ms:.2f}ms</td>
    {accuracy_values}
-   <td class="container" style="width: 500px;">
+   <td class="container" style="width: 300px;">
     <canvas id="latency_chart{i}" class="latency_chart"></canvas>
   </td>
  </tr>

src/com/android/nn/benchmark/app/NNScoringTest.java

diff --git a/src/com/android/nn/benchmark/app/NNScoringTest.java b/src/com/android/nn/benchmark/app/NNScoringTest.java
index c8b1be8..1ee2815 100644
--- a/src/com/android/nn/benchmark/app/NNScoringTest.java
+++ b/src/com/android/nn/benchmark/app/NNScoringTest.java
@@ -66,14 +66,25 @@
             return Arrays.asList(new TestModels.TestModelEntry[]{
                     TestModels.getModelByName("mobilenet_v1_1.0_224_quant_topk"),
                     TestModels.getModelByName("mobilenet_v1_1.0_224_topk"),
+                    TestModels.getModelByName("mobilenet_v1_0.75_192_quant_topk"),
+                    TestModels.getModelByName("mobilenet_v1_0.75_192_topk"),
+                    TestModels.getModelByName("mobilenet_v1_0.5_160_quant_topk"),
+                    TestModels.getModelByName("mobilenet_v1_0.5_160_topk"),
+                    TestModels.getModelByName("mobilenet_v1_0.25_128_quant_topk"),
+                    TestModels.getModelByName("mobilenet_v1_0.25_128_topk"),
                     TestModels.getModelByName("tts_float"),
-
             });
         } catch (IllegalArgumentException e) {
             // No internal datasets, use AOSP ones.
             return Arrays.asList(new TestModels.TestModelEntry[]{
                     TestModels.getModelByName("mobilenet_v1_1.0_224_quant_topk_aosp"),
                     TestModels.getModelByName("mobilenet_v1_1.0_224_topk_aosp"),
+                    TestModels.getModelByName("mobilenet_v1_0.75_192_quant_topk_aosp"),
+                    TestModels.getModelByName("mobilenet_v1_0.75_192_topk_aosp"),
+                    TestModels.getModelByName("mobilenet_v1_0.5_160_quant_topk_aosp"),
+                    TestModels.getModelByName("mobilenet_v1_0.5_160_topk_aosp"),
+                    TestModels.getModelByName("mobilenet_v1_0.25_128_quant_topk_aosp"),
+                    TestModels.getModelByName("mobilenet_v1_0.25_128_topk_aosp"),
                     TestModels.getModelByName("tts_float"),
             });
         }