From b4dd5cc86d4eb841de670f0f102ede599e0d9c40 Mon Sep 17 00:00:00 2001 From: Keith Davis Date: Thu, 7 Apr 2022 11:32:00 +0100 Subject: IVGCVSW-6124 ConstTensorsAsInput: Conv2d - FrontEnd * Update Front-end and Tools. * Updated Serializer, Deserializer and unit tests to reflect this. * Updated TfLiteDelegate, TfLiteParser and OnnxParser. * Updated Ref. * Fixed resulting Neon / CL tests * Unified optimizers for conv2d ops * Optimizer Fix - Fp32ToBf16 * Partial implementation for ACL backends to fix VTS failures !android-nn-driver:7477 Signed-off-by: Keith Davis Change-Id: I5fb18877f7ee32643e15a9818945356274bb401b --- src/armnn/Descriptors.cpp | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) (limited to 'src/armnn/Descriptors.cpp') diff --git a/src/armnn/Descriptors.cpp b/src/armnn/Descriptors.cpp index d67d4404e0..4eb875e03d 100644 --- a/src/armnn/Descriptors.cpp +++ b/src/armnn/Descriptors.cpp @@ -425,16 +425,10 @@ int StridedSliceDescriptor::GetStopForAxis(const TensorShape& inputShape, } -uint32_t FullyConnectedDescriptor::GetNumViews() const +uint32_t GetNumInputs(bool biasEnabled) { - return GetNumInputs(); -} - -uint32_t FullyConnectedDescriptor::GetNumInputs() const -{ - // Return 2 otherwise check if bias is enabled unsigned int numInputs = 2; - if (m_BiasEnabled) + if (biasEnabled) { numInputs = 3; } @@ -443,24 +437,27 @@ uint32_t FullyConnectedDescriptor::GetNumInputs() const uint32_t Convolution3dDescriptor::GetNumInputs() const { - // Return 2 otherwise check if bias is enabled - unsigned int numInputs = 2; - if (m_BiasEnabled) - { - numInputs = 3; - } - return numInputs; + return armnn::GetNumInputs(m_BiasEnabled); +} + +uint32_t Convolution2dDescriptor::GetNumInputs() const +{ + return armnn::GetNumInputs(m_BiasEnabled); +} + +uint32_t FullyConnectedDescriptor::GetNumInputs() const +{ + return armnn::GetNumInputs(m_BiasEnabled); +} + +uint32_t FullyConnectedDescriptor::GetNumViews() const +{ + return armnn::GetNumInputs(m_BiasEnabled); } uint32_t DepthwiseConvolution2dDescriptor::GetNumInputs() const { - // Return 2 otherwise check if bias is enabled - unsigned int numInputs = 2; - if (m_BiasEnabled) - { - numInputs = 3; - } - return numInputs; + return armnn::GetNumInputs(m_BiasEnabled); } } -- cgit v1.2.1