From f90c56d72de4848a2dc5844a97458aaf09df07c2 Mon Sep 17 00:00:00 2001 From: Derek Lamberti Date: Fri, 10 Jan 2020 17:14:08 +0000 Subject: Rename quantized data types to remove ambiguity for signed/unsigned payloads !android-nn-driver:2572 Change-Id: I8fe52ceb09987b3d05c539409510f535165455cc Signed-off-by: Derek Lamberti --- src/armnnDeserializer/Deserializer.cpp | 6 ++++-- src/armnnDeserializer/test/DeserializeActivation.cpp | 4 ++-- src/armnnDeserializer/test/DeserializeAdd.cpp | 2 +- src/armnnDeserializer/test/DeserializeComparison.cpp | 10 ++++++++++ src/armnnDeserializer/test/DeserializeConstant.cpp | 2 +- src/armnnDeserializer/test/DeserializeDivision.cpp | 2 +- src/armnnDeserializer/test/DeserializeFullyConnected.cpp | 2 +- src/armnnDeserializer/test/DeserializeMultiplication.cpp | 2 +- src/armnnDeserializer/test/DeserializePad.cpp | 2 +- src/armnnDeserializer/test/DeserializePermute.cpp | 4 ++-- src/armnnDeserializer/test/DeserializePooling2d.cpp | 4 ++-- src/armnnDeserializer/test/DeserializeReshape.cpp | 2 +- src/armnnDeserializer/test/DeserializeSubtraction.cpp | 2 +- 13 files changed, 28 insertions(+), 16 deletions(-) (limited to 'src/armnnDeserializer') diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index 6a65c6d6d5..aaf6aa9696 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -475,10 +475,12 @@ armnn::TensorInfo ToTensorInfo(Deserializer::TensorRawPtr tensorPtr) switch (tensorPtr->dataType()) { case DataType_QuantisedAsymm8: - type = armnn::DataType::QuantisedAsymm8; + case DataType_QAsymmU8: + type = armnn::DataType::QAsymmU8; break; + case DataType_QSymmS16: case DataType_QuantisedSymm16: - type = armnn::DataType::QuantisedSymm16; + type = armnn::DataType::QSymmS16; break; case DataType_Signed32: type = armnn::DataType::Signed32; diff --git a/src/armnnDeserializer/test/DeserializeActivation.cpp b/src/armnnDeserializer/test/DeserializeActivation.cpp index 9e98893038..44765d56a0 100644 --- a/src/armnnDeserializer/test/DeserializeActivation.cpp +++ b/src/armnnDeserializer/test/DeserializeActivation.cpp @@ -144,7 +144,7 @@ struct SimpleActivationFixture4 : ActivationFixture BOOST_FIXTURE_TEST_CASE(ActivationReluQuantisedAsymm8, SimpleActivationFixture) { - RunTest<4, armnn::DataType::QuantisedAsymm8>( + RunTest<4, armnn::DataType::QAsymmU8>( 0, {{"InputLayer", {10, 0, 2, 0}}}, {{"OutputLayer", {10, 0, 2, 0}}}); @@ -161,7 +161,7 @@ BOOST_FIXTURE_TEST_CASE(ActivationReluFloat32, SimpleActivationFixture2) BOOST_FIXTURE_TEST_CASE(ActivationBoundedReluQuantisedAsymm8, SimpleActivationFixture3) { - RunTest<4, armnn::DataType::QuantisedAsymm8>( + RunTest<4, armnn::DataType::QAsymmU8>( 0, {{"InputLayer", {10, 0, 2, 0}}}, {{"OutputLayer", {5, 0, 2, 0}}}); diff --git a/src/armnnDeserializer/test/DeserializeAdd.cpp b/src/armnnDeserializer/test/DeserializeAdd.cpp index be292bc304..325bb6e1c3 100644 --- a/src/armnnDeserializer/test/DeserializeAdd.cpp +++ b/src/armnnDeserializer/test/DeserializeAdd.cpp @@ -145,7 +145,7 @@ struct SimpleAddFixture2 : AddFixture BOOST_FIXTURE_TEST_CASE(AddQuantisedAsymm8, SimpleAddFixture) { - RunTest<2, armnn::DataType::QuantisedAsymm8>( + RunTest<2, armnn::DataType::QAsymmU8>( 0, {{"InputLayer1", { 0, 1, 2, 3 }}, {"InputLayer2", { 4, 5, 6, 7 }}}, diff --git a/src/armnnDeserializer/test/DeserializeComparison.cpp b/src/armnnDeserializer/test/DeserializeComparison.cpp index 6616398b73..9881b9e61e 100644 --- a/src/armnnDeserializer/test/DeserializeComparison.cpp +++ b/src/armnnDeserializer/test/DeserializeComparison.cpp @@ -242,11 +242,21 @@ DECLARE_SIMPLE_COMPARISON_TEST_CASE(Less, Float32) DECLARE_SIMPLE_COMPARISON_TEST_CASE(LessOrEqual, Float32) DECLARE_SIMPLE_COMPARISON_TEST_CASE(NotEqual, Float32) + +ARMNN_NO_DEPRECATE_WARN_BEGIN DECLARE_SIMPLE_COMPARISON_TEST_CASE(Equal, QuantisedAsymm8) DECLARE_SIMPLE_COMPARISON_TEST_CASE(Greater, QuantisedAsymm8) DECLARE_SIMPLE_COMPARISON_TEST_CASE(GreaterOrEqual, QuantisedAsymm8) DECLARE_SIMPLE_COMPARISON_TEST_CASE(Less, QuantisedAsymm8) DECLARE_SIMPLE_COMPARISON_TEST_CASE(LessOrEqual, QuantisedAsymm8) DECLARE_SIMPLE_COMPARISON_TEST_CASE(NotEqual, QuantisedAsymm8) +ARMNN_NO_DEPRECATE_WARN_END + +DECLARE_SIMPLE_COMPARISON_TEST_CASE(Equal, QAsymmU8) +DECLARE_SIMPLE_COMPARISON_TEST_CASE(Greater, QAsymmU8) +DECLARE_SIMPLE_COMPARISON_TEST_CASE(GreaterOrEqual, QAsymmU8) +DECLARE_SIMPLE_COMPARISON_TEST_CASE(Less, QAsymmU8) +DECLARE_SIMPLE_COMPARISON_TEST_CASE(LessOrEqual, QAsymmU8) +DECLARE_SIMPLE_COMPARISON_TEST_CASE(NotEqual, QAsymmU8) BOOST_AUTO_TEST_SUITE_END() diff --git a/src/armnnDeserializer/test/DeserializeConstant.cpp b/src/armnnDeserializer/test/DeserializeConstant.cpp index 0abe5e6ca1..cb0e4ad42f 100644 --- a/src/armnnDeserializer/test/DeserializeConstant.cpp +++ b/src/armnnDeserializer/test/DeserializeConstant.cpp @@ -143,7 +143,7 @@ struct SimpleConstantAddFixture : ConstantAddFixture BOOST_FIXTURE_TEST_CASE(SimpleConstantAddQuantisedAsymm8, SimpleConstantAddFixture) { - RunTest<2, armnn::DataType::QuantisedAsymm8>( + RunTest<2, armnn::DataType::QAsymmU8>( 0, { 1, 2, 3, 4, 5, 6 }, { 2, 4, 6, 8, 10, 12 }); diff --git a/src/armnnDeserializer/test/DeserializeDivision.cpp b/src/armnnDeserializer/test/DeserializeDivision.cpp index dc6f5820cf..d12b043ce0 100644 --- a/src/armnnDeserializer/test/DeserializeDivision.cpp +++ b/src/armnnDeserializer/test/DeserializeDivision.cpp @@ -141,7 +141,7 @@ struct SimpleDivisionFixture2 : DivisionFixture BOOST_FIXTURE_TEST_CASE(DivisionQuantisedAsymm8, SimpleDivisionFixture) { - RunTest<2, armnn::DataType::QuantisedAsymm8>( + RunTest<2, armnn::DataType::QAsymmU8>( 0, {{"InputLayer1", { 0, 5, 24, 21 }}, {"InputLayer2", { 4, 1, 6, 7 }}}, diff --git a/src/armnnDeserializer/test/DeserializeFullyConnected.cpp b/src/armnnDeserializer/test/DeserializeFullyConnected.cpp index 77d0acc782..90698cb993 100644 --- a/src/armnnDeserializer/test/DeserializeFullyConnected.cpp +++ b/src/armnnDeserializer/test/DeserializeFullyConnected.cpp @@ -131,7 +131,7 @@ struct FullyConnectedWithNoBiasFixture : FullyConnectedFixture BOOST_FIXTURE_TEST_CASE(FullyConnectedWithNoBias, FullyConnectedWithNoBiasFixture) { - RunTest<2, armnn::DataType::QuantisedAsymm8>( + RunTest<2, armnn::DataType::QAsymmU8>( 0, {{"InputLayer", { 10, 20, 30, 40 }}}, {{"OutputLayer", { 400/2 }}}); diff --git a/src/armnnDeserializer/test/DeserializeMultiplication.cpp b/src/armnnDeserializer/test/DeserializeMultiplication.cpp index f784ba6f31..c0bb13e17b 100644 --- a/src/armnnDeserializer/test/DeserializeMultiplication.cpp +++ b/src/armnnDeserializer/test/DeserializeMultiplication.cpp @@ -145,7 +145,7 @@ struct SimpleMultiplicationFixture2 : MultiplicationFixture BOOST_FIXTURE_TEST_CASE(MultiplicationQuantisedAsymm8, SimpleMultiplicationFixture) { - RunTest<2, armnn::DataType::QuantisedAsymm8>( + RunTest<2, armnn::DataType::QAsymmU8>( 0, {{"InputLayer1", { 0, 1, 2, 3 }}, {"InputLayer2", { 4, 5, 6, 7 }}}, diff --git a/src/armnnDeserializer/test/DeserializePad.cpp b/src/armnnDeserializer/test/DeserializePad.cpp index b18710a381..d9087d963e 100644 --- a/src/armnnDeserializer/test/DeserializePad.cpp +++ b/src/armnnDeserializer/test/DeserializePad.cpp @@ -112,7 +112,7 @@ struct SimplePadFixture : PadFixture BOOST_FIXTURE_TEST_CASE(SimplePadQuantisedAsymm8, SimplePadFixture) { - RunTest<3, armnn::DataType::QuantisedAsymm8>(0, + RunTest<3, armnn::DataType::QAsymmU8>(0, { 0, 4, 2, 5, 6, 1, 5, 2 }, diff --git a/src/armnnDeserializer/test/DeserializePermute.cpp b/src/armnnDeserializer/test/DeserializePermute.cpp index 6d08b5fee9..be50a67328 100644 --- a/src/armnnDeserializer/test/DeserializePermute.cpp +++ b/src/armnnDeserializer/test/DeserializePermute.cpp @@ -112,7 +112,7 @@ struct SimplePermute2DFixture : PermuteFixture BOOST_FIXTURE_TEST_CASE(SimplePermute2DQuantisedAsymm8, SimplePermute2DFixture) { - RunTest<2, armnn::DataType::QuantisedAsymm8>(0, + RunTest<2, armnn::DataType::QAsymmU8>(0, { 1, 2, 3, 4, 5, 6 }, { 1, 4, 2, 5, 3, 6 }); } @@ -127,7 +127,7 @@ struct SimplePermute4DFixture : PermuteFixture BOOST_FIXTURE_TEST_CASE(SimplePermute4DQuantisedAsymm8, SimplePermute4DFixture) { - RunTest<4, armnn::DataType::QuantisedAsymm8>(0, + RunTest<4, armnn::DataType::QAsymmU8>(0, { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24 }, { 1, 13, 5, 17, 9, 21, 2, 14, 6, 18, 10, 22, diff --git a/src/armnnDeserializer/test/DeserializePooling2d.cpp b/src/armnnDeserializer/test/DeserializePooling2d.cpp index 55fb655b34..b63aeb5fdc 100644 --- a/src/armnnDeserializer/test/DeserializePooling2d.cpp +++ b/src/armnnDeserializer/test/DeserializePooling2d.cpp @@ -141,7 +141,7 @@ BOOST_FIXTURE_TEST_CASE(Pooling2dFloat32Avg, SimpleAvgPooling2dFixture) BOOST_FIXTURE_TEST_CASE(Pooling2dQuantisedAsymm8Avg, SimpleAvgPooling2dFixture2) { - RunTest<4, armnn::DataType::QuantisedAsymm8>(0, + RunTest<4, armnn::DataType::QAsymmU8>(0, { 20, 40, 60, 80 }, { 50 }); } @@ -153,7 +153,7 @@ BOOST_FIXTURE_TEST_CASE(Pooling2dFloat32Max, SimpleMaxPooling2dFixture) BOOST_FIXTURE_TEST_CASE(Pooling2dQuantisedAsymm8Max, SimpleMaxPooling2dFixture2) { - RunTest<4, armnn::DataType::QuantisedAsymm8>(0, + RunTest<4, armnn::DataType::QAsymmU8>(0, { 20, 40, 60, 80 }, { 80 }); } diff --git a/src/armnnDeserializer/test/DeserializeReshape.cpp b/src/armnnDeserializer/test/DeserializeReshape.cpp index 301d8986c0..554b867db7 100644 --- a/src/armnnDeserializer/test/DeserializeReshape.cpp +++ b/src/armnnDeserializer/test/DeserializeReshape.cpp @@ -112,7 +112,7 @@ struct SimpleReshapeFixture2 : ReshapeFixture BOOST_FIXTURE_TEST_CASE(ReshapeQuantisedAsymm8, SimpleReshapeFixture) { - RunTest<2, armnn::DataType::QuantisedAsymm8>(0, + RunTest<2, armnn::DataType::QAsymmU8>(0, { 1, 2, 3, 4, 5, 6, 7, 8, 9 }, { 1, 2, 3, 4, 5, 6, 7, 8, 9 }); } diff --git a/src/armnnDeserializer/test/DeserializeSubtraction.cpp b/src/armnnDeserializer/test/DeserializeSubtraction.cpp index 5058bb840d..a4bd0fbeb4 100644 --- a/src/armnnDeserializer/test/DeserializeSubtraction.cpp +++ b/src/armnnDeserializer/test/DeserializeSubtraction.cpp @@ -148,7 +148,7 @@ struct SimpleSubtractionFixtureBroadcast : SubtractionFixture BOOST_FIXTURE_TEST_CASE(SubtractionQuantisedAsymm8, SimpleSubtractionFixture) { - RunTest<2, armnn::DataType::QuantisedAsymm8>( + RunTest<2, armnn::DataType::QAsymmU8>( 0, {{"inputLayer1", { 4, 5, 6, 7 }}, {"inputLayer2", { 3, 2, 1, 0 }}}, -- cgit v1.2.1