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

1 files changed, 12 insertions, 5 deletions

diff --git a/src/backends/cl/workloads/ClMergerWorkload.hpp b/src/backends/cl/workloads/ClMergerWorkload.hpp
index 948fb58bd1..8189a1b24a 100644
--- a/src/backends/cl/workloads/ClMergerWorkload.hpp
+++ b/src/backends/cl/workloads/ClMergerWorkload.hpp
@@ -7,18 +7,25 @@
 
 #include <backendsCommon/Workload.hpp>
 
+#include <arm_compute/runtime/CL/CLFunctions.h>
+
 namespace armnn
 {
 
+arm_compute::Status ClMergerWorkloadValidate(const std::vector<const TensorInfo*>& inputs,
+                                             const TensorInfo& output,
+                                             const MergerDescriptor& descriptor);
+
 class ClMergerWorkload : public BaseWorkload<MergerQueueDescriptor>
 {
 public:
-    using BaseWorkload<MergerQueueDescriptor>::BaseWorkload;
+    ClMergerWorkload(const MergerQueueDescriptor& descriptor, const WorkloadInfo& info);
+
+    void Execute() const override;
 
-    void Execute() const override
-    {
-        // With subtensors, merger is a no-op.
-    }
+private:
+    mutable arm_compute::CLConcatenateLayer m_Layer;
+    bool m_Execute;
 };
 
 } //namespace armnn