From 9b3e738929b2fc15a1a79b36b21267790ee34cb5 Mon Sep 17 00:00:00 2001
From: Matthew Bentham <Matthew.Bentham@arm.com>
Date: Wed, 5 Feb 2020 21:39:55 +0000
Subject: Clean up header inclusion in CL workloads.

Remove usage of CLFunctions.h and replace with specific header
for each function.

Signed-off-by: Matthew Bentham <Matthew.Bentham@arm.com>
Change-Id: I255a843b36a5dd8cf90a52786282192b8fe04f83
---
 src/backends/cl/workloads/ClConcatWorkload.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/backends/cl/workloads/ClConcatWorkload.cpp')

diff --git a/src/backends/cl/workloads/ClConcatWorkload.cpp b/src/backends/cl/workloads/ClConcatWorkload.cpp
index fb28946549..5370466163 100644
--- a/src/backends/cl/workloads/ClConcatWorkload.cpp
+++ b/src/backends/cl/workloads/ClConcatWorkload.cpp
@@ -10,6 +10,7 @@
 #include <cl/ClLayerSupport.hpp>
 
 #include <arm_compute/core/Types.h>
+#include <arm_compute/runtime/CL/functions/CLConcatenateLayer.h>
 
 #include <boost/polymorphic_pointer_cast.hpp>
 
@@ -78,14 +79,15 @@ ClConcatWorkload::ClConcatWorkload(const ConcatQueueDescriptor& descriptor, cons
                                                                          m_Data.m_Outputs[0])->GetTensor();
 
     // Create the layer function
-    m_Layer.reset(new arm_compute::CLConcatenateLayer());
+    auto layer = std::make_unique<arm_compute::CLConcatenateLayer>();
 
     // Configure input and output tensors
     size_t aclAxis = CalcAxis(descriptor.m_Parameters);
-    m_Layer->configure(aclInputs, &output, aclAxis);
+    layer->configure(aclInputs, &output, aclAxis);
 
     // Prepare
-    m_Layer->prepare();
+    layer->prepare();
+    m_Layer = std::move(layer);
 }
 
 void ClConcatWorkload::Execute() const
@@ -97,4 +99,4 @@ void ClConcatWorkload::Execute() const
     }
 }
 
-} //namespace armnn
\ No newline at end of file
+} //namespace armnn
-- 
cgit v1.2.1