diff options
| author | Sadik Armagan <sadik.armagan@arm.com> | 2021-02-12 17:16:42 +0000 |
|---|---|---|
| committer | Kevin May <kevin.may@arm.com> | 2021-02-15 16:50:24 +0000 |
| commit | 188675fd7e7239f56212d72f8ac10598de87e76a (patch) | |
| tree | 611876f7c43f81c88b8dec19ae86afcb6d6a1a64 /ConversionUtils.hpp | |
| parent | cd639c98c347c1addae8c65eb1f4d8e75b468fdb (diff) | |
| download | android-nn-driver-188675fd7e7239f56212d72f8ac10598de87e76a.tar.gz | |
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
Diffstat (limited to 'ConversionUtils.hpp')
| -rw-r--r-- | ConversionUtils.hpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp index c484f331..3432d9f8 100644 --- a/ConversionUtils.hpp +++ b/ConversionUtils.hpp @@ -39,6 +39,11 @@ namespace armnn_driver 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 @@ bool GetInputActivationFunctionImpl(const HalOperation& operation, 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 @@ bool ConvertMul(const HalOperation& operation, const HalModel& model, Conversion 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 @@ bool ConvertSub(const HalOperation& operation, const HalModel& model, Conversion 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 @@ bool ConvertStridedSlice(const HalOperation& operation, const HalModel& model, C 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)) { |