IVGCVSW-5377 'Add ArmNN TfLite delegate to ExecuteNetwork'
* Assign correct input values for the model
* Call the right Validate function for Mul and Sub operators
* Return the correct data type for kTfLiteInt8
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I6d23adf68d33d8be9a1fbf5d19dfe47939a6d3d6
diff --git a/delegate/src/DelegateUtils.hpp b/delegate/src/DelegateUtils.hpp
index 0537ba9..fad07ff 100644
--- a/delegate/src/DelegateUtils.hpp
+++ b/delegate/src/DelegateUtils.hpp
@@ -342,14 +342,26 @@
case kTfLiteUInt8:
return armnn::DataType::QAsymmU8;
case kTfLiteInt8:
- if (tfLiteTensor.params.zero_point == 0)
+ {
+ auto quantizationInfo = tfLiteTensor.quantization;
+ if (quantizationInfo.type == kTfLiteAffineQuantization)
{
- return armnn::DataType::QSymmS8;
+ auto* quantization =
+ reinterpret_cast<TfLiteAffineQuantization*>(tfLiteTensor.quantization.params);
+ if (quantization->zero_point != nullptr && quantization->zero_point->size == 1)
+ {
+ return armnn::DataType::QAsymmS8;
+ }
+ else
+ {
+ return armnn::DataType::QSymmS8;
+ }
}
else
{
return armnn::DataType::QAsymmS8;
}
+ }
case kTfLiteInt16:
return armnn::DataType::QSymmS16;
case kTfLiteInt32:
diff --git a/delegate/src/ElementwiseBinary.hpp b/delegate/src/ElementwiseBinary.hpp
index e527005..49a5dfb 100644
--- a/delegate/src/ElementwiseBinary.hpp
+++ b/delegate/src/ElementwiseBinary.hpp
@@ -228,13 +228,13 @@
inputTensorInfo1,
outputTensorInfo);
case kTfLiteBuiltinMul:
- return ValidateDivOperator(delegateData,
+ return ValidateMulOperator(delegateData,
tfLiteContext,
inputTensorInfo0,
inputTensorInfo1,
outputTensorInfo);
case kTfLiteBuiltinSub:
- return ValidateDivOperator(delegateData,
+ return ValidateSubOperator(delegateData,
tfLiteContext,
inputTensorInfo0,
inputTensorInfo1,