From 673fdcf4e6284e7af551ac91345f417524dea8d1 Mon Sep 17 00:00:00 2001 From: Lev Proleev Date: Thu, 2 Jan 2020 18:22:30 +0000 Subject: [PATCH] Add exceptions to the signed quantization coupling tests Main commit is in frameworks/ml/nn. This one only renames testModel.hasQuant8AsymmOperands() to testModel.hasQuant8CoupledOperands(). Bug: 143935412 Bug: 143934188 Bug: 143935353 Bug: 143934467 Bug: 143934184 Test: quantization coupling tests in CTS and VTS Change-Id: I0f7c331c355fe61ee06605786f09bc1ca7cdef57 Merged-In: I0f7c331c355fe61ee06605786f09bc1ca7cdef57 (cherry picked from commit 6a1d5e405fdc9be075c73bcde69fc8785ad390d1) --- neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp index be894f27c7..e3c537635a 100644 --- a/neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp +++ b/neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp @@ -452,7 +452,7 @@ void Execute(const sp& device, const TestModel& testModel, TestKind tes EvaluatePreparedModel(preparedModel, testModel, TestKind::DYNAMIC_SHAPE); } break; case TestKind::QUANTIZATION_COUPLING: { - ASSERT_TRUE(testModel.hasQuant8AsymmOperands()); + ASSERT_TRUE(testModel.hasQuant8CoupledOperands()); createPreparedModel(device, model, &preparedModel, /*reportSkipping*/ false); TestModel signedQuantizedModel = convertQuant8AsymmOperandsToSigned(testModel); sp preparedCoupledModel; @@ -521,7 +521,7 @@ INSTANTIATE_GENERATED_TEST(DynamicOutputShapeTest, [](const TestModel& testModel) { return !testModel.expectFailure; }); INSTANTIATE_GENERATED_TEST(DISABLED_QuantizationCouplingTest, [](const TestModel& testModel) { - return testModel.hasQuant8AsymmOperands() && testModel.operations.size() == 1; + return testModel.hasQuant8CoupledOperands() && testModel.operations.size() == 1; }); } // namespace android::hardware::neuralnetworks::V1_3::vts::functional