From 4980e21193f0a14fef084a7f4b4197392f3c0845 Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Fri, 4 Aug 2023 13:35:41 +0100 Subject: MLCE-1093 Reshape and concat invalid results !android-nn-driver:10089 * Disabled SubTensors on CL and Neon Backends. * Added Axis to ViewsDescriptor to store the value where ever possible. * Updated Splitter tests to provide all the information needed in the Descriptor. * Updated Serializer and Deserializer to handle axis. Signed-off-by: Mike Kelly Change-Id: I6a22d4750e04003689495b5e9e3c33deb37162bd --- delegate/opaque/src/Split.hpp | 4 ++++ delegate/opaque/src/Unpack.hpp | 2 ++ 2 files changed, 6 insertions(+) (limited to 'delegate/opaque') diff --git a/delegate/opaque/src/Split.hpp b/delegate/opaque/src/Split.hpp index 2dbfa602fb..199f46b126 100644 --- a/delegate/opaque/src/Split.hpp +++ b/delegate/opaque/src/Split.hpp @@ -134,6 +134,8 @@ TfLiteStatus VisitSplitOperator(DelegateData& delegateData, splitterDimSizes[splitDim] /= numSplits; armnn::SplitterDescriptor splitDescriptor(numSplits, inputDimSize); + splitDescriptor.SetAxis(axis); + for (int j = 0; j < numSplits; ++j) { // Set the size of the views. @@ -367,7 +369,9 @@ TfLiteStatus VisitSplitVOperator(DelegateData& delegateData, } armnn::SplitterDescriptor splitDescriptor(numSplits, inputDimSize); + splitDescriptor.SetAxis(axis); unsigned int accumSplit = 0; + for (int j = 0; j < numSplits; ++j) { unsigned int splitSize = armnn::numeric_cast(splitsTensorData[j]); diff --git a/delegate/opaque/src/Unpack.hpp b/delegate/opaque/src/Unpack.hpp index 0956d1688e..525529ff7b 100644 --- a/delegate/opaque/src/Unpack.hpp +++ b/delegate/opaque/src/Unpack.hpp @@ -96,6 +96,8 @@ TfLiteStatus VisitUnpackOperator(DelegateData& delegateData, unpackDimSizes[unpackAxis] /= unpackNum; armnn::SplitterDescriptor splitDesc(unpackNum, static_cast(unpackDimSizes.size())); + splitDesc.SetAxis(unpackAxis); + for (unsigned int j = 0; j < unpackNum; ++j) { // Set the size of the views. -- cgit v1.2.1