diff options
| author | Nikhil Raj <nikhil.raj@arm.com> | 2018-11-19 14:51:07 +0000 |
|---|---|---|
| committer | Nikhil Raj <nikhil.raj@arm.com> | 2018-11-19 14:51:07 +0000 |
| commit | 8599a415c159aa867db12853b3195f0f0a51ee6b (patch) | |
| tree | f85987c71dc745d7da7c672466723c26e39290b6 /src/armnn/Descriptors.cpp | |
| parent | 1d67a6905daed13354e66f00549e12fea62170ed (diff) | |
| download | armnn-8599a415c159aa867db12853b3195f0f0a51ee6b.tar.gz | |
IVGCVSW-2043 - Merger using ACL for innermost concat axis
* Add ClMergerWorkload and NeonMergerWorkload to call ACL for innermost concat axis
* Modify layer support to call ClMergerWorkloadValidate and NeonMergerWorkloadValidate when concat axis is inner most
* Add m_ConcatAxis to MergerDescriptor
* Modify MergerQueueDescriptor::Validate to check sub tensor only when using subtensor
!android-nn-driver:166
Change-Id: I56676b43964c8d6d726387b41b3cc34a512c0f0a
Diffstat (limited to 'src/armnn/Descriptors.cpp')
| -rw-r--r-- | src/armnn/Descriptors.cpp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/armnn/Descriptors.cpp b/src/armnn/Descriptors.cpp index a017806782..a200c6462c 100644 --- a/src/armnn/Descriptors.cpp +++ b/src/armnn/Descriptors.cpp @@ -72,13 +72,15 @@ PermutationVector::PermutationVector(std::initializer_list<ValueType> dimMapping } OriginsDescriptor::OriginsDescriptor() -: m_NumViews(0) +: m_ConcatAxis(1) +, m_NumViews(0) , m_NumDimensions(0) , m_ViewOrigins(nullptr) {} OriginsDescriptor::OriginsDescriptor(uint32_t numViews, uint32_t numDimensions /*= 4*/) -: m_NumViews(numViews) +: m_ConcatAxis(1) +, m_NumViews(numViews) , m_NumDimensions(numDimensions) , m_ViewOrigins(numViews && numDimensions > 0 ? new uint32_t *[numViews]() : nullptr) { @@ -89,7 +91,8 @@ OriginsDescriptor::OriginsDescriptor(uint32_t numViews, uint32_t numDimensions / } OriginsDescriptor::OriginsDescriptor(const OriginsDescriptor& other) -: m_NumViews(other.m_NumViews) +: m_ConcatAxis(other.m_ConcatAxis) +, m_NumViews(other.m_NumViews) , m_NumDimensions(other.m_NumDimensions) , m_ViewOrigins(other.m_NumViews && other.m_NumDimensions > 0 ? new uint32_t *[other.m_NumViews]() : nullptr) { @@ -121,6 +124,15 @@ OriginsDescriptor& OriginsDescriptor::operator=(OriginsDescriptor rhs) return *this; } +void OriginsDescriptor::SetConcatAxis(unsigned int concatAxis) +{ + m_ConcatAxis = concatAxis; +} +unsigned int OriginsDescriptor::GetConcatAxis() const +{ + return m_ConcatAxis; +} + Status OriginsDescriptor::SetViewOriginCoord(uint32_t view, uint32_t coord, uint32_t value) { if (view >= m_NumViews) @@ -284,6 +296,7 @@ void swap(OriginsDescriptor& first, OriginsDescriptor& second) swap(first.m_NumViews, second.m_NumViews); swap(first.m_NumDimensions, second.m_NumDimensions); swap(first.m_ViewOrigins, second.m_ViewOrigins); + swap(first.m_ConcatAxis, second.m_ConcatAxis); } void swap(ViewsDescriptor& first, ViewsDescriptor& second) |