aboutsummaryrefslogtreecommitdiff
path: root/ConversionUtils_1_2.hpp
diff options
context:
space:
mode:
authorTeresa Charlin <teresa.charlinreyes@arm.com>2020-04-10 16:46:53 +0100
committerTeresaARM <teresa.charlinreyes@arm.com>2020-05-29 13:55:02 +0000
commitf931af987c63466c95426742d7297d49438f8170 (patch)
tree8382aac349083d0322229de98ab37ea21dca6d71 /ConversionUtils_1_2.hpp
parente75d09ed83d15bd46f92068c2ba8e293bf02a010 (diff)
downloadandroid-nn-driver-f931af987c63466c95426742d7297d49438f8170.tar.gz
IVGCVSW-3847 Add Support for GATHER
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com> Change-Id: I69dd78d47628355c207a450119b054b04581c729
Diffstat (limited to 'ConversionUtils_1_2.hpp')
-rw-r--r--ConversionUtils_1_2.hpp81
1 files changed, 81 insertions, 0 deletions
diff --git a/ConversionUtils_1_2.hpp b/ConversionUtils_1_2.hpp
index 29367f2f..4f142040 100644
--- a/ConversionUtils_1_2.hpp
+++ b/ConversionUtils_1_2.hpp
@@ -661,6 +661,87 @@ bool ConvertExpandDims(const HalOperation& operation, const HalModel& model, Con
}
template<typename HalPolicy,
+ typename HalOperation = typename HalPolicy::Operation,
+ typename HalModel = typename HalPolicy::Model>
+bool ConvertGather(const HalOperation& operation, const HalModel& model, ConversionData& data)
+{
+ using HalOperand = typename HalPolicy::Operand;
+ using HalOperandType = typename HalPolicy::OperandType;
+
+ ALOGV("HalPolicy::ConvertGather()");
+
+ LayerInputHandle input = ConvertToLayerInputHandle<HalPolicy>(operation, 0, model, data);
+ if (!input.IsValid())
+ {
+ return Fail("%s: Operation has invalid input", __func__);
+ }
+ auto inputDimensions = input.GetTensorInfo().GetNumDimensions();
+
+ LayerInputHandle indices = ConvertToLayerInputHandle<HalPolicy>(operation, 2, model, data);
+ if (!indices.IsValid())
+ {
+ return Fail("%s: Operation has invalid indices", __func__);
+ }
+ auto indicesDimensions = indices.GetTensorInfo().GetNumDimensions();
+
+ const HalOperand* output = GetOutputOperand<HalPolicy>(operation, 0, model);
+ if (!output)
+ {
+ return Fail("%s: Operation has invalid output", __func__);
+ }
+ const TensorInfo& outputInfo = GetTensorInfoForOperand(*output);
+ auto outputDimensions = outputInfo.GetNumDimensions();
+ if (IsDynamicTensor(outputInfo))
+ {
+ return Fail("%s: Dynamic output tensors are not supported", __func__);
+ }
+ if (outputDimensions != inputDimensions + indicesDimensions - 1)
+ {
+ return Fail("%s: Operation has invalid output dimensions: %d. Output must be an (%d + %d - 1)-D tensor",
+ __func__, outputDimensions, inputDimensions,indicesDimensions);
+ }
+
+ int32_t axis;
+ if (!GetInputScalar<HalPolicy>(operation, 1, HalOperandType::INT32, axis, model, data))
+ {
+ return Fail("%s: Operation has invalid or unsupported axis operand", __func__);
+ }
+ if (-inputDimensions <= axis || axis > inputDimensions)
+ {
+ return Fail("%s: Operation has invalid axis: %d. It is out of bounds [-&d, %d))", __func__, axis,
+ inputDimensions,inputDimensions);
+ }
+ if (axis < 0)
+ {
+ axis += inputDimensions;
+ }
+ if (axis != 0)
+ {
+ return Fail("%s: Only axis 0 is currently supported. Axis: %d", __func__, axis);
+ }
+
+ bool isSupported = false;
+ FORWARD_LAYER_SUPPORT_FUNC(__func__,
+ IsGatherSupported,
+ data.m_Backends,
+ isSupported,
+ input.GetTensorInfo(),
+ indices.GetTensorInfo(),
+ outputInfo);
+ if (!isSupported)
+ {
+ return false;
+ }
+
+ IConnectableLayer* layer = data.m_Network->AddGatherLayer();
+ assert(layer != nullptr);
+ input.Connect(layer->GetInputSlot(0));
+ indices.Connect(layer->GetInputSlot(1));
+
+ return SetupAndTrackLayerOutputSlot<HalPolicy>(operation, 0, *layer, model, data);
+}
+
+template<typename HalPolicy,
typename HalOperation = typename HalPolicy::Operation,
typename HalModel = typename HalPolicy::Model>
bool ConvertGroupedConv2d(const HalOperation& operation, const HalModel& model, ConversionData& data)