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/LayerSupport.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/LayerSupport.cpp')
| -rw-r--r-- | src/armnn/LayerSupport.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp index 91aca4ea41..6489fe4f66 100644 --- a/src/armnn/LayerSupport.cpp +++ b/src/armnn/LayerSupport.cpp @@ -257,12 +257,13 @@ bool IsLstmSupported(const BackendId& backend, const TensorInfo& input, const Te } bool IsMergerSupported(const BackendId& backend, std::vector<const TensorInfo*> inputs, + const TensorInfo& output, const OriginsDescriptor& descriptor, char* reasonIfUnsupported, size_t reasonIfUnsupportedMaxLength) { BOOST_ASSERT(inputs.size() > 0); - FORWARD_LAYER_SUPPORT_FUNC(backend, IsMergerSupported, inputs, descriptor); + FORWARD_LAYER_SUPPORT_FUNC(backend, IsMergerSupported, inputs, output, descriptor); } bool IsMultiplicationSupported(const BackendId& backend, |