commit d466a54e79560f0ccacc6b13cd64e08defbac47c
author Derek Lamberti <derek.lamberti@arm.com> Wed Jan 22 15:37:29 2020 +0000
committer Derek Lamberti <derek.lamberti@arm.com> Fri Jan 24 09:21:47 2020 +0000
tree d8f8d5226d71178aed32c6ad407570071e55dded
parent 4a3c61091037e7e86e8b03bb060d8c1ab82731a9

IVGCVSW-4370 Deprecate DataType::QuantizedSymm8PerAxis

!android-nn-driver:2622

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

src/backends/reference/workloads/Decoders.hpp

diff --git a/src/backends/reference/workloads/Decoders.hpp b/src/backends/reference/workloads/Decoders.hpp
index faabdcd..6f30978 100644
--- a/src/backends/reference/workloads/Decoders.hpp
+++ b/src/backends/reference/workloads/Decoders.hpp
@@ -71,6 +71,7 @@
 {
     switch(info.GetDataType())
     {
+        ARMNN_NO_DEPRECATE_WARN_BEGIN
         case armnn::DataType::QuantizedSymm8PerAxis:
         {
             std::pair<unsigned int, std::vector<float>> params = armnnUtils::GetPerAxisParams(info);
@@ -79,6 +80,7 @@
                 params.second,
                 params.first);
         }
+        ARMNN_NO_DEPRECATE_WARN_END
         case DataType::QAsymmU8:
         {
             return std::make_unique<QASymm8Decoder>(
@@ -107,10 +109,21 @@
         }
         case DataType::QSymmS8:
         {
-            return std::make_unique<QSymmS8Decoder>(
-            static_cast<const int8_t*>(data),
-            info.GetQuantizationScale(),
-            info.GetQuantizationOffset());
+            if (info.HasPerAxisQuantization())
+            {
+                std::pair<unsigned int, std::vector<float>> params = armnnUtils::GetPerAxisParams(info);
+                return std::make_unique<QSymm8PerAxisDecoder>(
+                    static_cast<const int8_t*>(data),
+                    params.second,
+                    params.first);
+            }
+            else
+            {
+                return std::make_unique<QSymmS8Decoder>(
+                    static_cast<const int8_t*>(data),
+                    info.GetQuantizationScale(),
+                    info.GetQuantizationOffset());
+            }
         }
         default:
         {