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/backends/reference | |
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/backends/reference')
-rw-r--r-- | src/backends/reference/RefLayerSupport.cpp | 2 | ||||
-rw-r--r-- | src/backends/reference/RefLayerSupport.hpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/backends/reference/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp index 167cba54e8..43a2fa2d07 100644 --- a/src/backends/reference/RefLayerSupport.cpp +++ b/src/backends/reference/RefLayerSupport.cpp @@ -322,10 +322,12 @@ bool RefLayerSupport::IsMeanSupported(const TensorInfo& input, } bool RefLayerSupport::IsMergerSupported(const std::vector<const TensorInfo*> inputs, + const TensorInfo& output, const OriginsDescriptor& descriptor, Optional<std::string&> reasonIfUnsupported) const { ignore_unused(descriptor); + ignore_unused(output); return IsSupportedForDataTypeRef(reasonIfUnsupported, inputs[0]->GetDataType(), &TrueFunc<>, diff --git a/src/backends/reference/RefLayerSupport.hpp b/src/backends/reference/RefLayerSupport.hpp index 2e86ecee29..a03c89c48c 100644 --- a/src/backends/reference/RefLayerSupport.hpp +++ b/src/backends/reference/RefLayerSupport.hpp @@ -122,6 +122,7 @@ public: Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override; bool IsMergerSupported(const std::vector<const TensorInfo*> inputs, + const TensorInfo& output, const OriginsDescriptor& descriptor, Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override; |