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/RefLayerSupport.cpp

diff --git a/src/backends/reference/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp
index 491081d..ee6462d 100644
--- a/src/backends/reference/RefLayerSupport.cpp
+++ b/src/backends/reference/RefLayerSupport.cpp
@@ -437,11 +437,14 @@
     const DataType inputType = input.GetDataType();
     if (inputType == DataType::QAsymmU8)
     {
-        std::array<DataType, 2> supportedWeightTypes =
+        ARMNN_NO_DEPRECATE_WARN_BEGIN
+        std::array<DataType, 3> supportedWeightTypes =
         {
             DataType::QAsymmU8,
-            DataType::QuantizedSymm8PerAxis
+            DataType::QSymmS8,
+            DataType::QuantizedSymm8PerAxis // deprecated
         };
+        ARMNN_NO_DEPRECATE_WARN_END
 
         supported &= CheckSupportRule(TypeAnyOf(weights, supportedWeightTypes), reasonIfUnsupported,
                                       "Reference convolution2d: weights type not supported for quantized input.");
@@ -554,14 +557,18 @@
     supported &= CheckSupportRule(TypesAreEqual(input, output), reasonIfUnsupported,
                                   "Reference DepthwiseConvolution2d: input and output types mismatched.");
 
+    ARMNN_NO_DEPRECATE_WARN_BEGIN
+    std::array<DataType, 3> supportedWeightTypes =
+        {
+            DataType::QAsymmU8,
+            DataType::QSymmS8,
+            DataType::QuantizedSymm8PerAxis // deprecated
+        };
+    ARMNN_NO_DEPRECATE_WARN_END
+
     const DataType inputType = input.GetDataType();
     if (inputType == DataType::QAsymmU8)
     {
-        std::array<DataType, 2> supportedWeightTypes =
-        {
-            DataType::QAsymmU8,
-            DataType::QuantizedSymm8PerAxis
-        };
 
         supported &= CheckSupportRule(TypeAnyOf(weights, supportedWeightTypes), reasonIfUnsupported,
                                       "Reference convolution2d: weights type not supported for quantized input.");
@@ -607,6 +614,9 @@
     supported &= CheckSupportRule(TypeAnyOf(input, supportedInputTypes), reasonIfUnsupported,
                                   "Reference dequantize: input type not supported.");
 
+    supported &= CheckSupportRule(TypeNotPerAxisQuantized(input), reasonIfUnsupported,
+                                  "Reference dequantize: per-axis quantized input not support .");
+
     std::array<DataType,2> supportedOutputTypes = {
         DataType::Float32,
         DataType::Float16
@@ -1836,11 +1846,14 @@
     const DataType inputType = input.GetDataType();
     if (inputType == DataType::QAsymmU8)
     {
-        std::array<DataType, 2> supportedWeightTypes =
+        ARMNN_NO_DEPRECATE_WARN_BEGIN
+        std::array<DataType, 3> supportedWeightTypes =
         {
             DataType::QAsymmU8,
-            DataType::QuantizedSymm8PerAxis
+            DataType::QSymmS8,
+            DataType::QuantizedSymm8PerAxis //Deprecated
         };
+        ARMNN_NO_DEPRECATE_WARN_END
 
         supported &= CheckSupportRule(TypeAnyOf(weights, supportedWeightTypes), reasonIfUnsupported,
                                       "Reference TransposeConvolution2d: weights type not supported for "