commit 8599a415c159aa867db12853b3195f0f0a51ee6b
author Nikhil Raj <nikhil.raj@arm.com> Mon Nov 19 14:51:07 2018 +0000
committer Nikhil Raj <nikhil.raj@arm.com> Mon Nov 19 14:51:07 2018 +0000
tree f85987c71dc745d7da7c672466723c26e39290b6
parent 1d67a6905daed13354e66f00549e12fea62170ed

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

src/backends/backendsCommon/ILayerSupport.cpp

diff --git a/src/backends/backendsCommon/ILayerSupport.cpp b/src/backends/backendsCommon/ILayerSupport.cpp
index dc106e3..55dd447 100644
--- a/src/backends/backendsCommon/ILayerSupport.cpp
+++ b/src/backends/backendsCommon/ILayerSupport.cpp
@@ -192,6 +192,7 @@
 }
 
 bool ILayerSupport::IsMergerSupported(const std::vector<const TensorInfo*> inputs,
+                                      const TensorInfo& output,
                                       const OriginsDescriptor& descriptor,
                                       Optional<std::string&> reasonIfUnsupported) const
 {