commit 5b1f53975d7fa482475af781ffa2a2277f40e0c9
author Sadik Armagan <sadik.armagan@arm.com> Tue Jul 19 12:37:20 2022 +0100
committer Sadik Armagan <sadik.armagan@arm.com> Thu Jul 21 09:37:35 2022 +0100
tree 48607813d793d4142c0a2e4bc0b0b4cf15cf8285
parent b6f506b96fb69cc7c023576ac0164b85962e269f

IVGCVSW-6954 'Arm NN Support Library Implementation'

* Fixed model converting issue
* Fixed import memory issue

Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: Ied61810b308e0c5d5754f122a6ea2bac1d0725f1

shim/sl/canonical/ConversionUtils.cpp

diff --git a/shim/sl/canonical/ConversionUtils.cpp b/shim/sl/canonical/ConversionUtils.cpp
index 020410d..96a8ddc 100644
--- a/shim/sl/canonical/ConversionUtils.cpp
+++ b/shim/sl/canonical/ConversionUtils.cpp
@@ -151,7 +151,8 @@
                                               const ConversionData& data,
                                               const armnn::PermutationVector& dimensionMappings,
                                               const armnn::TensorShape* overrideTensorShape,
-                                              bool optional)
+                                              bool optional,
+                                              const armnn::DataType* overrideDataType)
 {
     if (!IsOperandTypeSupportedForTensors(operand.type))
     {
@@ -180,13 +181,18 @@
 
     armnn::TensorInfo tensorInfo = GetTensorInfoForOperand(operand);
 
-    // Make sure isConstant flag is set.
-    tensorInfo.SetConstant();
-
-    if (overrideTensorShape != nullptr)
+    if (overrideTensorShape)
     {
         tensorInfo.SetShape(*overrideTensorShape);
     }
+
+    if (overrideDataType)
+    {
+        tensorInfo.SetDataType(*overrideDataType);
+    }
+
+    // Make sure isConstant flag is set.
+    tensorInfo.SetConstant();
     return ConstTensorPin(tensorInfo, valueStart, operand.location.length, dimensionMappings);
 }
 
@@ -194,7 +200,8 @@
                                            uint32_t inputIndex,
                                            const Model& model,
                                            ConversionData& data,
-                                           const armnn::PermutationVector& dimensionMappings)
+                                           const armnn::PermutationVector& dimensionMappings,
+                                           const LayerInputHandle* inputHandle)
 {
 
     const Operand* operand = GetInputOperand(operation, inputIndex, model);
@@ -268,8 +275,26 @@
             case OperandLifeTime::POINTER:
             case OperandLifeTime::CONSTANT_REFERENCE:
             {
+                auto constantTensorDataType = operandTensorInfo.GetDataType();
+                if (inputHandle)
+                {
+                    if ((inputHandle->GetTensorInfo().GetDataType() == armnn::DataType::Float32
+                         || inputHandle->GetTensorInfo().GetDataType() == armnn::DataType::Float16)
+                        && (operandTensorInfo.GetDataType() == armnn::DataType::QAsymmU8
+                            || operandTensorInfo.GetDataType() == armnn::DataType::QAsymmS8))
+                    {
+                        constantTensorDataType = inputHandle->GetTensorInfo().GetDataType();
+                    }
+                }
+
                 // The tensor has an already known constant value, and can be converted into an ArmNN Constant layer.
-                ConstTensorPin tensorPin = ConvertOperandToConstTensorPin(*operand, model, data, dimensionMappings);
+                ConstTensorPin tensorPin = ConvertOperandToConstTensorPin(*operand,
+                                                                          model,
+                                                                          data,
+                                                                          dimensionMappings,
+                                                                          nullptr,
+                                                                          false,
+                                                                          &constantTensorDataType);
                 if (tensorPin.IsValid())
                 {
                     bool isSupported = false;