commit f90c56d72de4848a2dc5844a97458aaf09df07c2
author Derek Lamberti <derek.lamberti@arm.com> Fri Jan 10 17:14:08 2020 +0000
committer Kevin May <kevin.may@arm.com> Mon Jan 13 18:18:12 2020 +0000
tree 71f1c6f16a4687286614f5526ed70938a611b27d
parent 842e0dbd40114e19bf26916fefe06c869dbe416d

Rename quantized data types to remove ambiguity for signed/unsigned payloads

!android-nn-driver:2572

Change-Id: I8fe52ceb09987b3d05c539409510f535165455cc
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>

src/armnnTfLiteParser/test/Concatenation.cpp

diff --git a/src/armnnTfLiteParser/test/Concatenation.cpp b/src/armnnTfLiteParser/test/Concatenation.cpp
index d3d571f..8e31a3e 100644
--- a/src/armnnTfLiteParser/test/Concatenation.cpp
+++ b/src/armnnTfLiteParser/test/Concatenation.cpp
@@ -100,7 +100,7 @@
 
 BOOST_FIXTURE_TEST_CASE(ParseConcatenationNegativeDim, ConcatenationFixtureNegativeDim)
 {
-    RunTest<4, armnn::DataType::QuantisedAsymm8>(
+    RunTest<4, armnn::DataType::QAsymmU8>(
         0,
         {{"inputTensor1", { 0, 1, 2, 3 }},
         {"inputTensor2", { 4, 5, 6, 7 }}},
@@ -114,7 +114,7 @@
 
 BOOST_FIXTURE_TEST_CASE(ParseConcatenationNCHW, ConcatenationFixtureNCHW)
 {
-    RunTest<4, armnn::DataType::QuantisedAsymm8>(
+    RunTest<4, armnn::DataType::QAsymmU8>(
         0,
         {{"inputTensor1", { 0, 1, 2, 3 }},
         {"inputTensor2", { 4, 5, 6, 7 }}},
@@ -128,7 +128,7 @@
 
 BOOST_FIXTURE_TEST_CASE(ParseConcatenationNHWC, ConcatenationFixtureNHWC)
 {
-    RunTest<4, armnn::DataType::QuantisedAsymm8>(
+    RunTest<4, armnn::DataType::QAsymmU8>(
         0,
         {{"inputTensor1", { 0, 1, 2, 3 }},
         {"inputTensor2", { 4, 5, 6, 7 }}},
@@ -142,7 +142,7 @@
 
 BOOST_FIXTURE_TEST_CASE(ParseConcatenationDim1, ConcatenationFixtureDim1)
 {
-    RunTest<4, armnn::DataType::QuantisedAsymm8>(
+    RunTest<4, armnn::DataType::QAsymmU8>(
         0,
         { { "inputTensor1", {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
                                12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 } },
@@ -161,7 +161,7 @@
 
 BOOST_FIXTURE_TEST_CASE(ParseConcatenationDim3, ConcatenationFixtureDim3)
 {
-    RunTest<4, armnn::DataType::QuantisedAsymm8>(
+    RunTest<4, armnn::DataType::QAsymmU8>(
         0,
         { { "inputTensor1", {  0,  1,  2,  3,
                                4,  5,  6,  7,
@@ -196,7 +196,7 @@
 
 BOOST_FIXTURE_TEST_CASE(ParseConcatenation3DDim0, ConcatenationFixture3DDim0)
 {
-    RunTest<3, armnn::DataType::QuantisedAsymm8>(
+    RunTest<3, armnn::DataType::QAsymmU8>(
         0,
         { { "inputTensor1", { 0,  1,  2,  3,  4,  5 } },
           { "inputTensor2", { 6,  7,  8,  9, 10, 11,
@@ -213,7 +213,7 @@
 
 BOOST_FIXTURE_TEST_CASE(ParseConcatenation3DDim1, ConcatenationFixture3DDim1)
 {
-    RunTest<3, armnn::DataType::QuantisedAsymm8>(
+    RunTest<3, armnn::DataType::QAsymmU8>(
         0,
         { { "inputTensor1", { 0,  1,  2,  3,  4,  5 } },
           { "inputTensor2", { 6,  7,  8,  9, 10, 11,
@@ -230,7 +230,7 @@
 
 BOOST_FIXTURE_TEST_CASE(ParseConcatenation3DDim2, ConcatenationFixture3DDim2)
 {
-    RunTest<3, armnn::DataType::QuantisedAsymm8>(
+    RunTest<3, armnn::DataType::QAsymmU8>(
         0,
         { { "inputTensor1", { 0,  1,  2,
                               3,  4,  5 } },