IVGCVSW-1900 : CL backend folder structure

* moving backends/ClWorkloads to backends/cl
* and moving pure Cl workload related code to
  backends/cl/workloads

Change-Id: I019a3c6b4da5e7a23074bf03fb057e63199ad129

20 files changed, 80 insertions, 78 deletions

diff --git a/src/armnn/Layer.cpp b/src/armnn/Layer.cpp
index b0a3ac543b..d9229203ea 100644
--- a/src/armnn/Layer.cpp
+++ b/src/armnn/Layer.cpp
@@ -5,12 +5,12 @@
 #include "Layer.hpp"
 
 #include "Graph.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/WorkloadData.hpp>
+#include <backends/CpuTensorHandle.hpp>
 
 #include <boost/cast.hpp>
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
-#include "backends/CpuTensorHandle.hpp"
 
 #include <numeric>
 
diff --git a/src/armnn/Layer.hpp b/src/armnn/Layer.hpp
index fd523cee9e..d897b255a6 100644
--- a/src/armnn/Layer.hpp
+++ b/src/armnn/Layer.hpp
@@ -6,9 +6,9 @@
 
 #include "LayerFwd.hpp"
 
-#include "backends/OutputHandler.hpp"
-#include "backends/WorkloadDataCollector.hpp"
-#include "backends/WorkloadInfo.hpp"
+#include <backends/OutputHandler.hpp>
+#include <backends/WorkloadDataCollector.hpp>
+#include <backends/WorkloadInfo.hpp>
 #include "InternalTypes.hpp"
 #include "SerializeLayerParameters.hpp"
 
diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp
index 74243df7ba..538f8e8cda 100644
--- a/src/armnn/LayerSupport.cpp
+++ b/src/armnn/LayerSupport.cpp
@@ -6,7 +6,7 @@
 
 #include <backends/reference/RefLayerSupport.hpp>
 #include <backends/neon/NeonLayerSupport.hpp>
-#include <backends/ClLayerSupport.hpp>
+#include <backends/cl/ClLayerSupport.hpp>
 
 #include <boost/assert.hpp>
 
diff --git a/src/armnn/LoadedNetwork.hpp b/src/armnn/LoadedNetwork.hpp
index 51551b395b..7808cc19e3 100644
--- a/src/armnn/LoadedNetwork.hpp
+++ b/src/armnn/LoadedNetwork.hpp
@@ -13,7 +13,7 @@
 
 #include <backends/reference/RefWorkloadFactory.hpp>
 #include <backends/neon/NeonWorkloadFactory.hpp>
-#include <backends/ClWorkloadFactory.hpp>
+#include <backends/cl/ClWorkloadFactory.hpp>
 #include <backends/Workload.hpp>
 #include <backends/WorkloadFactory.hpp>
 
diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index 49e60e1ad4..76c33ba2e6 100644
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -6,11 +6,13 @@
 #include "Graph.hpp"
 #include "Layer.hpp"
 #include "DeviceSpec.hpp"
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/WorkloadFactory.hpp"
 #include "Optimizer.hpp"
-#include "armnn/Exceptions.hpp"
+#include "optimizations/All.hpp"
+
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/WorkloadFactory.hpp>
 
+#include <armnn/Exceptions.hpp>
 #include <armnn/Utils.hpp>
 #include <armnn/TypesUtils.hpp>
 
@@ -27,8 +29,6 @@
 #include <boost/numeric/conversion/converter_policies.hpp>
 #include <boost/cast.hpp>
 
-#include "optimizations/All.hpp"
-
 namespace armnn
 {
 
diff --git a/src/armnn/Runtime.hpp b/src/armnn/Runtime.hpp
index b0a393d3f8..12211f4e04 100644
--- a/src/armnn/Runtime.hpp
+++ b/src/armnn/Runtime.hpp
@@ -6,10 +6,10 @@
 
 #include "LoadedNetwork.hpp"
 #include "DeviceSpec.hpp"
-#include "armnn/INetwork.hpp"
-#include "armnn/IRuntime.hpp"
-#include "armnn/Tensor.hpp"
-#include "backends/ClContextControl.hpp"
+#include <armnn/INetwork.hpp>
+#include <armnn/IRuntime.hpp>
+#include <armnn/Tensor.hpp>
+#include <backends/cl/ClContextControl.hpp>
 
 #include <mutex>
 #include <unordered_map>
diff --git a/src/armnn/layers/MeanLayer.cpp b/src/armnn/layers/MeanLayer.cpp
index 01f1133c5c..3259d95afd 100644
--- a/src/armnn/layers/MeanLayer.cpp
+++ b/src/armnn/layers/MeanLayer.cpp
@@ -6,9 +6,9 @@
 #include "MeanLayer.hpp"
 #include "LayerCloneBase.hpp"
 
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/WorkloadData.hpp"
-#include "backends/WorkloadFactory.hpp"
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/WorkloadData.hpp>
+#include <backends/WorkloadFactory.hpp>
 
 #include <cstring>
 
@@ -44,7 +44,7 @@ void MeanLayer::ValidateTensorShapesFromInputs()
     VerifyLayerConnections(1, CHECK_LOCATION());
 
     const TensorInfo& input = GetInputSlot(0).GetConnection()->GetTensorInfo();
-    
+
     BOOST_ASSERT_MSG(input.GetNumDimensions() > 0 && input.GetNumDimensions() <= MaxNumOfTensorDimensions,
                      "MeanLayer: Mean supports up to 4D input.");
 
diff --git a/src/armnn/layers/PadLayer.cpp b/src/armnn/layers/PadLayer.cpp
index 6a1e9150b8..7511e80dae 100644
--- a/src/armnn/layers/PadLayer.cpp
+++ b/src/armnn/layers/PadLayer.cpp
@@ -6,9 +6,9 @@
 #include "PadLayer.hpp"
 #include "LayerCloneBase.hpp"
 
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/WorkloadData.hpp"
-#include "backends/WorkloadFactory.hpp"
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/WorkloadData.hpp>
+#include <backends/WorkloadFactory.hpp>
 
 #include <cstring>
 
diff --git a/src/armnn/memory/BaseMemoryManager.hpp b/src/armnn/memory/BaseMemoryManager.hpp
index 6710a785c7..c82eca6c1d 100644
--- a/src/armnn/memory/BaseMemoryManager.hpp
+++ b/src/armnn/memory/BaseMemoryManager.hpp
@@ -4,20 +4,20 @@
 //
 #pragma once
 
-#include "backends/WorkloadFactory.hpp"
+#include <backends/WorkloadFactory.hpp>
 
 #ifdef ARMCOMPUTENEON_ENABLED
-#include "arm_compute/runtime/MemoryGroup.h"
+#include <arm_compute/runtime/MemoryGroup.h>
 #endif
 
 #ifdef ARMCOMPUTECL_ENABLED
-#include "arm_compute/runtime/CL/CLMemoryGroup.h"
+#include <arm_compute/runtime/CL/CLMemoryGroup.h>
 #endif
 
 #if defined(ARMCOMPUTENEON_ENABLED) || defined(ARMCOMPUTECL_ENABLED)
-#include "arm_compute/runtime/IAllocator.h"
-#include "arm_compute/runtime/IMemoryGroup.h"
-#include "arm_compute/runtime/MemoryManagerOnDemand.h"
+#include <arm_compute/runtime/IAllocator.h>
+#include <arm_compute/runtime/IMemoryGroup.h>
+#include <arm_compute/runtime/MemoryManagerOnDemand.h>
 #endif
 
 namespace armnn
diff --git a/src/armnn/optimizations/ConvertConstants.hpp b/src/armnn/optimizations/ConvertConstants.hpp
index 7168effe0c..9306a53bf4 100644
--- a/src/armnn/optimizations/ConvertConstants.hpp
+++ b/src/armnn/optimizations/ConvertConstants.hpp
@@ -6,9 +6,9 @@
 #pragma once
 
 #include "Optimization.hpp"
-#include "backends/CpuTensorHandle.hpp"
-#include "Half.hpp"
-#include "FloatingPointConverter.hpp"
+#include <backends/CpuTensorHandle.hpp>
+#include <Half.hpp>
+#include <FloatingPointConverter.hpp>
 
 namespace armnn
 {
diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp
index 61f9f1cd83..c111fe6016 100644
--- a/src/armnn/test/CreateWorkload.hpp
+++ b/src/armnn/test/CreateWorkload.hpp
@@ -8,12 +8,13 @@
 
 #include <boost/cast.hpp>
 
-#include "backends/WorkloadData.hpp"
-#include "Graph.hpp"
+#include <backends/WorkloadData.hpp>
+#include <backends/CpuTensorHandle.hpp>
+
+#include <Graph.hpp>
 
 #include <utility>
 
-#include "backends/CpuTensorHandle.hpp"
 
 using namespace armnn;
 
diff --git a/src/armnn/test/CreateWorkloadClNeon.hpp b/src/armnn/test/CreateWorkloadClNeon.hpp
index 6d02c95740..a18e85d5f0 100644
--- a/src/armnn/test/CreateWorkloadClNeon.hpp
+++ b/src/armnn/test/CreateWorkloadClNeon.hpp
@@ -8,7 +8,7 @@
 #include <backends/reference/RefWorkloadFactory.hpp>
 
 #if ARMCOMPUTECL_ENABLED
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #endif
 
 #if ARMCOMPUTENEON_ENABLED
diff --git a/src/armnn/test/EndToEndTest.cpp b/src/armnn/test/EndToEndTest.cpp
index 1d0886ed09..98b18411d4 100644
--- a/src/armnn/test/EndToEndTest.cpp
+++ b/src/armnn/test/EndToEndTest.cpp
@@ -4,11 +4,11 @@
 //
 #include <boost/test/unit_test.hpp>
 
-#include "armnn/Descriptors.hpp"
-#include "armnn/IRuntime.hpp"
-#include "armnn/INetwork.hpp"
+#include <armnn/Descriptors.hpp>
+#include <armnn/IRuntime.hpp>
+#include <armnn/INetwork.hpp>
 
-#include "backends/test/QuantizeHelper.hpp"
+#include <backends/test/QuantizeHelper.hpp>
 #include <boost/core/ignore_unused.hpp>
 
 #include <set>
diff --git a/src/armnn/test/FP16SupportTest.cpp b/src/armnn/test/FP16SupportTest.cpp
index 74ca372b0a..6baadc4c77 100644
--- a/src/armnn/test/FP16SupportTest.cpp
+++ b/src/armnn/test/FP16SupportTest.cpp
@@ -3,14 +3,14 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include "armnn/ArmNN.hpp"
-#include "armnn/Descriptors.hpp"
-#include "Graph.hpp"
-#include "armnn/IRuntime.hpp"
-#include "armnn/INetwork.hpp"
-#include "Optimizer.hpp"
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/test/QuantizeHelper.hpp"
+#include <armnn/ArmNN.hpp>
+#include <armnn/Descriptors.hpp>
+#include <armnn/IRuntime.hpp>
+#include <armnn/INetwork.hpp>
+#include <Graph.hpp>
+#include <Optimizer.hpp>
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/test/QuantizeHelper.hpp>
 
 #include <boost/core/ignore_unused.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/src/armnn/test/GraphTests.cpp b/src/armnn/test/GraphTests.cpp
index e38252917d..b297a74785 100644
--- a/src/armnn/test/GraphTests.cpp
+++ b/src/armnn/test/GraphTests.cpp
@@ -2,18 +2,19 @@
 // Copyright © 2017 Arm Ltd. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
+#include "GraphUtils.hpp"
+
 #include <boost/test/unit_test.hpp>
+#include <boost/cast.hpp>
 
-#include "armnn/ArmNN.hpp"
-#include "Graph.hpp"
-#include "Layer.hpp"
-#include "armnn/TypesUtils.hpp"
-#include "armnn/Exceptions.hpp"
+#include <armnn/ArmNN.hpp>
+#include <armnn/TypesUtils.hpp>
+#include <armnn/Exceptions.hpp>
+#include <Graph.hpp>
+#include <Layer.hpp>
 
-#include "GraphUtils.hpp"
-#include "backends/CpuTensorHandle.hpp"
+#include <backends/CpuTensorHandle.hpp>
 
-#include <boost/cast.hpp>
 
 /// Checks that first comes before second in the order.
 bool CheckOrder(const armnn::Graph& graph, const armnn::Layer* first, const armnn::Layer* second)
diff --git a/src/armnn/test/JsonPrinterTests.cpp b/src/armnn/test/JsonPrinterTests.cpp
index aae7dba0f5..9c24fdaa7b 100644
--- a/src/armnn/test/JsonPrinterTests.cpp
+++ b/src/armnn/test/JsonPrinterTests.cpp
@@ -10,12 +10,12 @@
 #include <vector>
 #include <sstream>
 
-#include "Profiling.hpp"
-#include "armnn/Descriptors.hpp"
-#include "armnn/IRuntime.hpp"
-#include "armnn/INetwork.hpp"
-#include "backends/test/ClContextControlFixture.hpp"
-#include "backends/ClWorkloadFactory.hpp"
+#include <Profiling.hpp>
+#include <armnn/Descriptors.hpp>
+#include <armnn/IRuntime.hpp>
+#include <armnn/INetwork.hpp>
+#include <backends/test/ClContextControlFixture.hpp>
+#include <backends/cl/ClWorkloadFactory.hpp>
 
 BOOST_FIXTURE_TEST_SUITE(JsonPrinterTests, ClProfilingContextControlFixture)
 
diff --git a/src/armnn/test/NetworkTests.cpp b/src/armnn/test/NetworkTests.cpp
index 2f36f4da09..c342f22ced 100644
--- a/src/armnn/test/NetworkTests.cpp
+++ b/src/armnn/test/NetworkTests.cpp
@@ -9,7 +9,7 @@
 #include <Graph.hpp>
 #include <backends/reference/RefWorkloadFactory.hpp>
 #include <backends/neon/NeonWorkloadFactory.hpp>
-#include <backends/ClWorkloadFactory.hpp>
+#include <backends/cl/ClWorkloadFactory.hpp>
 
 #include "GraphUtils.hpp"
 
diff --git a/src/armnn/test/OpenClTimerTest.cpp b/src/armnn/test/OpenClTimerTest.cpp
index 37cb085604..76cffec4f3 100644
--- a/src/armnn/test/OpenClTimerTest.cpp
+++ b/src/armnn/test/OpenClTimerTest.cpp
@@ -5,18 +5,18 @@
 
 #if (defined(__aarch64__)) || (defined(__x86_64__)) // disable test failing on FireFly/Armv7
 
-#include "arm_compute/runtime/CL/CLScheduler.h"
-#include "backends/ClContextControl.hpp"
-#include "backends/ClWorkloadFactory.hpp"
-#include "backends/CpuTensorHandle.hpp"
+#include <arm_compute/runtime/CL/CLScheduler.h>
+#include <backends/cl/ClContextControl.hpp>
+#include <backends/cl/ClWorkloadFactory.hpp>
+#include <backends/CpuTensorHandle.hpp>
 #include <boost/format.hpp>
 #include <iostream>
-#include "OpenClTimer.hpp"
-#include "backends/test/TensorCopyUtils.hpp"
+#include <OpenClTimer.hpp>
+#include <backends/test/TensorCopyUtils.hpp>
 #include "TensorHelpers.hpp"
 #include <boost/test/unit_test.hpp>
-#include "backends/WorkloadFactory.hpp"
-#include "backends/test/WorkloadTestUtils.hpp"
+#include <backends/WorkloadFactory.hpp>
+#include <backends/test/WorkloadTestUtils.hpp>
 
 using namespace armnn;
 
diff --git a/src/armnn/test/OptimizerTests.cpp b/src/armnn/test/OptimizerTests.cpp
index f8dff366da..9d351babd8 100644
--- a/src/armnn/test/OptimizerTests.cpp
+++ b/src/armnn/test/OptimizerTests.cpp
@@ -4,11 +4,11 @@
 //
 #include <boost/test/unit_test.hpp>
 
-#include "armnn/ArmNN.hpp"
-#include "Graph.hpp"
-#include "Optimizer.hpp"
-#include "backends/CpuTensorHandle.hpp"
-#include "FloatingPointConverter.hpp"
+#include <armnn/ArmNN.hpp>
+#include <Graph.hpp>
+#include <Optimizer.hpp>
+#include <backends/CpuTensorHandle.hpp>
+#include <FloatingPointConverter.hpp>
 
 namespace
 {
diff --git a/src/armnn/test/TensorHelpers.hpp b/src/armnn/test/TensorHelpers.hpp
index a4d3cf62c7..7f3ac9ec95 100644
--- a/src/armnn/test/TensorHelpers.hpp
+++ b/src/armnn/test/TensorHelpers.hpp
@@ -16,9 +16,9 @@
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
-#include "armnn/Tensor.hpp"
+#include <armnn/Tensor.hpp>
 
-#include "backends/test/QuantizeHelper.hpp"
+#include <backends/test/QuantizeHelper.hpp>
 
 #include <cmath>