aboutsummaryrefslogtreecommitdiff
path: root/delegate/classic
diff options
context:
space:
mode:
authorTracy Narine <tracy.narine@arm.com>2023-07-17 16:06:26 +0100
committerTracy Narine <tracy.narine@arm.com>2023-07-18 16:15:46 +0100
commit7306bbef8b06cb9689108ff56bd67036d02ca79d (patch)
tree1b3f1a06e7aad3a37d3f3eab5c8afcc3797c0519 /delegate/classic
parent121ccd56155e14bd8c31a1caacf254511222b256 (diff)
downloadarmnn-7306bbef8b06cb9689108ff56bd67036d02ca79d.tar.gz
IVGCVSW-7834 Add REVERSE_V2 to classic and opaque delegates
* Adding support for ReverseV2 in the classic and opaque delegates * CMake files updated * Tests added * Gpu/Cpu Acc tests compiled out until functionality is written Signed-off-by: Tracy Narine <tracy.narine@arm.com> Change-Id: I8b41b7e71f2e28e5ea8dddbd00657900e6d7ab9a
Diffstat (limited to 'delegate/classic')
-rw-r--r--delegate/classic/CMakeLists.txt1
-rw-r--r--delegate/classic/src/ReverseV2.hpp154
-rw-r--r--delegate/classic/src/armnn_delegate.cpp7
3 files changed, 162 insertions, 0 deletions
diff --git a/delegate/classic/CMakeLists.txt b/delegate/classic/CMakeLists.txt
index 54e00e1c9f..8f872d6adc 100644
--- a/delegate/classic/CMakeLists.txt
+++ b/delegate/classic/CMakeLists.txt
@@ -34,6 +34,7 @@ list(APPEND armnnClassicDelegateObject_sources
src/Redefine.hpp
src/Reduce.hpp
src/Resize.hpp
+ src/ReverseV2.hpp
src/Round.hpp
src/Shape.hpp
src/SharedFunctions.hpp
diff --git a/delegate/classic/src/ReverseV2.hpp b/delegate/classic/src/ReverseV2.hpp
new file mode 100644
index 0000000000..d49d20b5c1
--- /dev/null
+++ b/delegate/classic/src/ReverseV2.hpp
@@ -0,0 +1,154 @@
+//
+// Copyright © 2023 Arm Ltd and Contributors. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#pragma once
+
+#include <ClassicDelegateUtils.hpp>
+
+#include <armnn/utility/IgnoreUnused.hpp>
+
+#include <tensorflow/lite/builtin_ops.h>
+#include <tensorflow/lite/c/builtin_op_data.h>
+#include <tensorflow/lite/c/common.h>
+#include <tensorflow/lite/minimal_logging.h>
+#include <tensorflow/lite/kernels/internal/tensor_ctypes.h>
+
+namespace armnnDelegate
+{
+
+
+
+TfLiteStatus ValidateReverseV2Operator(DelegateData& delegateData,
+ TfLiteContext* tfLiteContext,
+ const armnn::TensorInfo& inputInfo0,
+ const armnn::TensorInfo& inputInfo1,
+ const armnn::TensorInfo& outputInfo)
+{
+ bool isSupported = false;
+ FORWARD_LAYER_SUPPORT_FUNC("REVERSEV2",
+ tfLiteContext,
+ IsReverseV2Supported,
+ delegateData.m_Backends,
+ isSupported,
+ armnn::BackendId(),
+ inputInfo0,
+ inputInfo1,
+ outputInfo);
+
+ return isSupported ? kTfLiteOk : kTfLiteError;
+}
+
+TfLiteStatus VisitReverseV2Operator(DelegateData& delegateData,
+ TfLiteContext* tfLiteContext,
+ TfLiteNode* tfLiteNode,
+ int nodeIndex,
+ int32_t reverseV2OperatorCode)
+{
+ TF_LITE_ENSURE_STATUS(ValidateNumInputs(tfLiteContext, tfLiteNode, 2, nodeIndex));
+ TF_LITE_ENSURE_STATUS(ValidateNumOutputs(tfLiteContext, tfLiteNode, 1, nodeIndex));
+
+ const TfLiteTensor* tfLiteTensors = tfLiteContext->tensors;
+
+ // The first input contains the data that should be reversed
+ const TfLiteTensor& tfLiteInputTensor = tfLiteTensors[tfLiteNode->inputs->data[0]];
+ if (IsDynamicTensor(tfLiteInputTensor))
+ {
+ TF_LITE_MAYBE_KERNEL_LOG(
+ tfLiteContext,
+ "TfLiteArmnnDelegate: Dynamic input tensors are not supported in operator #%d node #%d: ",
+ reverseV2OperatorCode, nodeIndex);
+ return kTfLiteError;
+ }
+
+ // The second input contains an axis tensor.
+ const TfLiteTensor& tfLiteAxisTensor = tfLiteTensors[tfLiteNode->inputs->data[1]];
+ if (IsDynamicTensor(tfLiteAxisTensor))
+ {
+ TF_LITE_MAYBE_KERNEL_LOG(
+ tfLiteContext,
+ "TfLiteArmnnDelegate: Dynamic input tensors are not supported in operator #%d node #%d: ",
+ reverseV2OperatorCode, nodeIndex);
+ return kTfLiteError;
+ }
+
+ // Get the output tensor
+ const TfLiteTensor& tfLiteOutputTensor = tfLiteTensors[tfLiteNode->outputs->data[0]];
+ if (IsDynamicTensor(tfLiteOutputTensor))
+ {
+ TF_LITE_MAYBE_KERNEL_LOG(
+ tfLiteContext,
+ "TfLiteArmnnDelegate: Dynamic output tensors are not supported in operator #%d node #%d: ",
+ reverseV2OperatorCode, nodeIndex);
+ return kTfLiteError;
+ }
+
+ const armnn::TensorInfo& inputTensorInfo0 = GetTensorInfoForTfLiteTensor(tfLiteInputTensor);
+ const armnn::TensorInfo& inputTensorInfo1 = GetTensorInfoForTfLiteTensor(tfLiteAxisTensor);
+ const armnn::TensorInfo& outputTensorInfo = GetTensorInfoForTfLiteTensor(tfLiteOutputTensor, true);
+
+ if (inputTensorInfo0.GetNumDimensions() != outputTensorInfo.GetNumDimensions())
+ {
+ TF_LITE_MAYBE_KERNEL_LOG(
+ tfLiteContext,
+ "TfLiteArmnnDelegate: input tensor dimension and output tensor dimension differ #%d node #%d: ",
+ reverseV2OperatorCode, nodeIndex);
+ return kTfLiteError;
+ }
+
+ for (unsigned i=0; i < inputTensorInfo0.GetNumDimensions(); i++)
+ {
+ if (inputTensorInfo0.GetShape()[i] != outputTensorInfo.GetShape()[i])
+ {
+ TF_LITE_MAYBE_KERNEL_LOG(
+ tfLiteContext,
+ "TfLiteArmnnDelegate: input tensor dimension and output tensor differ #%d node #%d: ",
+ reverseV2OperatorCode, nodeIndex);
+ return kTfLiteError;
+ }
+ }
+
+ std::string layerName("ReverseV2");
+
+ const auto maxDimension = 4;
+
+ const auto axisTensorNumValues = static_cast<unsigned int>(tfLiteAxisTensor.dims->size);
+ if (axisTensorNumValues > maxDimension)
+ {
+ TF_LITE_MAYBE_KERNEL_LOG(
+ tfLiteContext,
+ "TfLiteArmnnDelegate: The Axis-Input-Tensor of the ReverseV2 operation requires a "
+ "dimension of <= %d but a tensor with a dimension of %d was given. "
+ "Operator: #%d node #%d: ",
+ maxDimension, axisTensorNumValues, reverseV2OperatorCode, nodeIndex);
+ return kTfLiteError;
+ }
+
+ // No network pointer indicates that only support for this operator should be checked
+ if (!delegateData.m_Network)
+ {
+ return ValidateReverseV2Operator(delegateData,
+ tfLiteContext,
+ inputTensorInfo0,
+ inputTensorInfo1,
+ outputTensorInfo);
+ }
+
+ armnn::IConnectableLayer* reverseV2Layer = delegateData.m_Network->AddReverseV2Layer(layerName.c_str());
+
+ armnn::IOutputSlot& outputSlot = reverseV2Layer->GetOutputSlot(0);
+ outputSlot.SetTensorInfo(outputTensorInfo);
+
+ // Try to connect the Constant Inputs if there are any
+ if(ProcessInputs(reverseV2Layer, delegateData, tfLiteContext, tfLiteNode) != kTfLiteOk )
+ {
+ return kTfLiteError;
+ }
+
+ ARMNN_ASSERT(reverseV2Layer != nullptr);
+
+ return Connect(reverseV2Layer, tfLiteNode, delegateData);
+}
+
+} // namespace armnnDelegate
diff --git a/delegate/classic/src/armnn_delegate.cpp b/delegate/classic/src/armnn_delegate.cpp
index e597d13fb2..0f9e8a624c 100644
--- a/delegate/classic/src/armnn_delegate.cpp
+++ b/delegate/classic/src/armnn_delegate.cpp
@@ -31,6 +31,7 @@
#include "Redefine.hpp"
#include "Reduce.hpp"
#include "Resize.hpp"
+#include "ReverseV2.hpp"
#include "Round.hpp"
#include "Shape.hpp"
#include "Slice.hpp"
@@ -949,6 +950,12 @@ TfLiteStatus ArmnnSubgraph::VisitNode(DelegateData& delegateData,
tfLiteNode,
nodeIndex,
kTfLiteBuiltinResizeNearestNeighbor);
+ case kTfLiteBuiltinReverseV2:
+ return VisitReverseV2Operator(delegateData,
+ tfLiteContext,
+ tfLiteNode,
+ nodeIndex,
+ kTfLiteBuiltinReverseV2);
case kTfLiteBuiltinRsqrt:
return VisitElementwiseUnaryOperator(delegateData,
tfLiteContext,