commit 88bb9b5d60a62737067b15697ea156862c34039d
author Xin Li <delphij@google.com> Mon Nov 23 13:14:51 2020 -0800
committer Xin Li <delphij@google.com> Mon Nov 23 13:14:51 2020 -0800
tree 597e7ce3d3be910795c06ff32418232ab8a4b6d2
parent e14f4b1214d492b971bf5b56a04bbb7f21a6b715
parent 52bf171bec5ee513171d19fcace8de3e114e1b22

Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

Bug: 172690556
Merged-In: Icfc855bf9993c0e639e6484aa31d174e6b702c4c
Change-Id: Idddda38e3277fe33216d1de782bcfe43cebc5bfb

neuralnetworks/V1_2/benchmark/java/src/com/android/nn/benchmark/vts/v1_2/NNAccuracyTest.java

diff --git a/neuralnetworks/V1_2/benchmark/java/src/com/android/nn/benchmark/vts/v1_2/NNAccuracyTest.java b/neuralnetworks/V1_2/benchmark/java/src/com/android/nn/benchmark/vts/v1_2/NNAccuracyTest.java
index 6c1aaf6..17ca0ba 100644
--- a/neuralnetworks/V1_2/benchmark/java/src/com/android/nn/benchmark/vts/v1_2/NNAccuracyTest.java
+++ b/neuralnetworks/V1_2/benchmark/java/src/com/android/nn/benchmark/vts/v1_2/NNAccuracyTest.java
@@ -117,18 +117,17 @@
     @Test
     @LargeTest
     public void testDriver() throws BenchmarkException, IOException {
-        try (NNTestBase test = mModel.mEntry.createNNTestBase()) {
-            test.useNNApi();
-            test.setNNApiDeviceName(mModel.mInstance);
-            if (!test.setupModel(mActivity)) {
-                throw new AssumptionViolatedException("The driver rejected the model.");
-            }
-            Pair<List<InferenceInOutSequence>, List<InferenceResult>> inferenceResults =
-                    test.runBenchmarkCompleteInputSet(/*setRepeat=*/1, /*timeoutSec=*/3600);
-            BenchmarkResult benchmarkResult = BenchmarkResult.fromInferenceResults(
-                    mModel.mEntry.mModelName, BenchmarkResult.BACKEND_TFLITE_NNAPI,
-                    inferenceResults.first, inferenceResults.second, test.getEvaluator());
-            assertFalse(benchmarkResult.hasValidationErrors());
+        NNTestBase test = mModel.mEntry.createNNTestBase();
+        test.useNNApi();
+        test.setNNApiDeviceName(mModel.mInstance);
+        if (!test.setupModel(mActivity)) {
+            throw new AssumptionViolatedException("The driver rejected the model.");
         }
+        Pair<List<InferenceInOutSequence>, List<InferenceResult>> inferenceResults =
+                test.runBenchmarkCompleteInputSet(/*setRepeat=*/1, /*timeoutSec=*/3600);
+        BenchmarkResult benchmarkResult = BenchmarkResult.fromInferenceResults(
+                mModel.mEntry.mModelName, BenchmarkResult.BACKEND_TFLITE_NNAPI,
+                inferenceResults.first, inferenceResults.second, test.getEvaluator());
+        assertFalse(benchmarkResult.hasValidationErrors());
     }
 }

neuralnetworks/V1_3/benchmark/java/src/com/android/nn/benchmark/vts/v1_3/NNAccuracyTest.java

diff --git a/neuralnetworks/V1_3/benchmark/java/src/com/android/nn/benchmark/vts/v1_3/NNAccuracyTest.java b/neuralnetworks/V1_3/benchmark/java/src/com/android/nn/benchmark/vts/v1_3/NNAccuracyTest.java
index d4a05fc..bdc4311 100644
--- a/neuralnetworks/V1_3/benchmark/java/src/com/android/nn/benchmark/vts/v1_3/NNAccuracyTest.java
+++ b/neuralnetworks/V1_3/benchmark/java/src/com/android/nn/benchmark/vts/v1_3/NNAccuracyTest.java
@@ -117,18 +117,17 @@
     @Test
     @LargeTest
     public void testDriver() throws BenchmarkException, IOException {
-        try (NNTestBase test = mModel.mEntry.createNNTestBase()) {
-            test.useNNApi();
-            test.setNNApiDeviceName(mModel.mInstance);
-            if (!test.setupModel(mActivity)) {
-                throw new AssumptionViolatedException("The driver rejected the model.");
-            }
-            Pair<List<InferenceInOutSequence>, List<InferenceResult>> inferenceResults =
-                    test.runBenchmarkCompleteInputSet(/*setRepeat=*/1, /*timeoutSec=*/3600);
-            BenchmarkResult benchmarkResult = BenchmarkResult.fromInferenceResults(
-                    mModel.mEntry.mModelName, BenchmarkResult.BACKEND_TFLITE_NNAPI,
-                    inferenceResults.first, inferenceResults.second, test.getEvaluator());
-            assertFalse(benchmarkResult.hasValidationErrors());
+        NNTestBase test = mModel.mEntry.createNNTestBase();
+        test.useNNApi();
+        test.setNNApiDeviceName(mModel.mInstance);
+        if (!test.setupModel(mActivity)) {
+            throw new AssumptionViolatedException("The driver rejected the model.");
         }
+        Pair<List<InferenceInOutSequence>, List<InferenceResult>> inferenceResults =
+                test.runBenchmarkCompleteInputSet(/*setRepeat=*/1, /*timeoutSec=*/3600);
+        BenchmarkResult benchmarkResult = BenchmarkResult.fromInferenceResults(
+                mModel.mEntry.mModelName, BenchmarkResult.BACKEND_TFLITE_NNAPI,
+                inferenceResults.first, inferenceResults.second, test.getEvaluator());
+        assertFalse(benchmarkResult.hasValidationErrors());
     }
 }