From 3c68b3412fe276a9d51fcb34b3dae73125e08515 Mon Sep 17 00:00:00 2001 From: Lev Proleev Date: Thu, 9 Jan 2020 16:37:28 +0000 Subject: [PATCH] Enable QuantizationCouplingTest in NNAPI VTS Bug: 137828994 Test: NNTest_static and VtsHalNeuralnetworksV1_3TargetTest Change-Id: I9b4f20ab0287be9cae9fc1b69a8f64cc8f1996b0 Merged-In: I9b4f20ab0287be9cae9fc1b69a8f64cc8f1996b0 (cherry picked from commit baac15d5fd9678b1bb3b69b764e069b43407c272) --- neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp index e3c537635a..eced063416 100644 --- a/neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp +++ b/neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp @@ -500,7 +500,7 @@ class GeneratedTest : public GeneratedTestBase {}; class DynamicOutputShapeTest : public GeneratedTest {}; // Tag for the dynamic output shape tests -class DISABLED_QuantizationCouplingTest : public GeneratedTest {}; +class QuantizationCouplingTest : public GeneratedTest {}; TEST_P(GeneratedTest, Test) { Execute(kDevice, kTestModel, /*testKind=*/TestKind::GENERAL); @@ -510,7 +510,7 @@ TEST_P(DynamicOutputShapeTest, Test) { Execute(kDevice, kTestModel, /*testKind=*/TestKind::DYNAMIC_SHAPE); } -TEST_P(DISABLED_QuantizationCouplingTest, Test) { +TEST_P(QuantizationCouplingTest, Test) { Execute(kDevice, kTestModel, /*testKind=*/TestKind::QUANTIZATION_COUPLING); } @@ -520,7 +520,7 @@ INSTANTIATE_GENERATED_TEST(GeneratedTest, INSTANTIATE_GENERATED_TEST(DynamicOutputShapeTest, [](const TestModel& testModel) { return !testModel.expectFailure; }); -INSTANTIATE_GENERATED_TEST(DISABLED_QuantizationCouplingTest, [](const TestModel& testModel) { +INSTANTIATE_GENERATED_TEST(QuantizationCouplingTest, [](const TestModel& testModel) { return testModel.hasQuant8CoupledOperands() && testModel.operations.size() == 1; });