commit 188675fd7e7239f56212d72f8ac10598de87e76a
author Sadik Armagan <sadik.armagan@arm.com> Fri Feb 12 17:16:42 2021 +0000
committer Kevin May <kevin.may@arm.com> Mon Feb 15 16:50:24 2021 +0000
tree 611876f7c43f81c88b8dec19ae86afcb6d6a1a64
parent cd639c98c347c1addae8c65eb1f4d8e75b468fdb

IVGCVSW-5665 Basic NN Driver support for next OS Version


Signed-off-by: Kevin May <kevin.may@arm.com>
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I1e1db52322092c6b1b7ac6183c3adc90aabcec24

ConversionUtils.hpp

diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index c484f33..3432d9f 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -39,6 +39,11 @@
 using OperandType = android::nn::hal::OperandType;
 #endif
 
+#ifdef ARMNN_ANDROID_S
+#include <nnapi/Types.h>
+#endif
+
+
 struct ConversionData
 {
     ConversionData(const std::vector<armnn::BackendId>& backends)
@@ -965,8 +970,8 @@
         return Fail("%s: unexpected operand type: %s (should be %s or %s)",
                     __func__,
                     toString(type).c_str(),
-                    toString(OperandType::INT32).c_str(),
-                    toString(OperandType::TENSOR_INT32).c_str());
+                    toString(HalOperandType::INT32).c_str(),
+                    toString(HalOperandType::TENSOR_INT32).c_str());
     }
 
     int32_t activationFunctionAsInt;
@@ -3441,9 +3446,6 @@
 
     armnn::IConnectableLayer* const startLayer = data.m_Network->AddMultiplicationLayer();
 
-    const armnn::TensorInfo& inputTensorInfo0 = input0.GetTensorInfo();
-    const armnn::TensorInfo& inputTensorInfo1 = input1.GetTensorInfo();
-
     bool isReshapeSupported = BroadcastTensor(input0, input1, startLayer, data);
     if (!isReshapeSupported)
     {
@@ -3671,9 +3673,6 @@
 
     armnn::IConnectableLayer* const startLayer = data.m_Network->AddSubtractionLayer();
 
-    const armnn::TensorInfo& inputTensorInfo0 = input0.GetTensorInfo();
-    const armnn::TensorInfo& inputTensorInfo1 = input1.GetTensorInfo();
-
     bool isReshapeSupported = BroadcastTensor(input0, input1, startLayer, data);
     if (!isReshapeSupported)
     {
@@ -3881,8 +3880,6 @@
     for (unsigned int i = 0; i < inputShape.GetNumDimensions(); i++)
     {
         int stride = descriptor.m_Stride[i];
-        int start  = descriptor.GetStartForAxis(inputShape, i);
-        int stop   = descriptor.GetStopForAxis(inputShape, i, start);
 
         if (descriptor.m_ShrinkAxisMask & (1 << i))
         {