diff options
| author | Keith Davis <keith.davis@arm.com> | 2022-04-07 11:32:00 +0100 |
|---|---|---|
| committer | Keith Davis <keith.davis@arm.com> | 2022-05-16 16:08:54 +0100 |
| commit | b4dd5cc86d4eb841de670f0f102ede599e0d9c40 (patch) | |
| tree | 77857cf739baecaf63701b66c1a2646b7930a834 /src/armnn/Descriptors.cpp | |
| parent | b86ec6641b4b06ccddad5eebbc21010d6184fe79 (diff) | |
| download | armnn-b4dd5cc86d4eb841de670f0f102ede599e0d9c40.tar.gz | |
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 <keith.davis@arm.com>
Change-Id: I5fb18877f7ee32643e15a9818945356274bb401b
Diffstat (limited to 'src/armnn/Descriptors.cpp')
| -rw-r--r-- | src/armnn/Descriptors.cpp | 41 |
1 files changed, 19 insertions, 22 deletions
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); } } |