Enable QuantizationCouplingTest in NNAPI VTS

Bug: 137828994
Test: NNTest_static and VtsHalNeuralnetworksV1_3TargetTest
Change-Id: I9b4f20ab0287be9cae9fc1b69a8f64cc8f1996b0
Merged-In: I9b4f20ab0287be9cae9fc1b69a8f64cc8f1996b0
(cherry picked from commit baac15d5fd)
This commit is contained in:
Lev Proleev 2020-01-09 16:37:28 +00:00 committed by Slava Shklyaev
parent 24148274cd
commit 3c68b3412f

View file

@ -500,7 +500,7 @@ class GeneratedTest : public GeneratedTestBase {};
class DynamicOutputShapeTest : public GeneratedTest {}; class DynamicOutputShapeTest : public GeneratedTest {};
// Tag for the dynamic output shape tests // Tag for the dynamic output shape tests
class DISABLED_QuantizationCouplingTest : public GeneratedTest {}; class QuantizationCouplingTest : public GeneratedTest {};
TEST_P(GeneratedTest, Test) { TEST_P(GeneratedTest, Test) {
Execute(kDevice, kTestModel, /*testKind=*/TestKind::GENERAL); Execute(kDevice, kTestModel, /*testKind=*/TestKind::GENERAL);
@ -510,7 +510,7 @@ TEST_P(DynamicOutputShapeTest, Test) {
Execute(kDevice, kTestModel, /*testKind=*/TestKind::DYNAMIC_SHAPE); Execute(kDevice, kTestModel, /*testKind=*/TestKind::DYNAMIC_SHAPE);
} }
TEST_P(DISABLED_QuantizationCouplingTest, Test) { TEST_P(QuantizationCouplingTest, Test) {
Execute(kDevice, kTestModel, /*testKind=*/TestKind::QUANTIZATION_COUPLING); Execute(kDevice, kTestModel, /*testKind=*/TestKind::QUANTIZATION_COUPLING);
} }
@ -520,7 +520,7 @@ INSTANTIATE_GENERATED_TEST(GeneratedTest,
INSTANTIATE_GENERATED_TEST(DynamicOutputShapeTest, INSTANTIATE_GENERATED_TEST(DynamicOutputShapeTest,
[](const TestModel& testModel) { return !testModel.expectFailure; }); [](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; return testModel.hasQuant8CoupledOperands() && testModel.operations.size() == 1;
}); });