IVGCVSW-5328-5329 Fuse Activation Cleanup
* Resolved the review items in the main review.
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I5da34b74ac204569ea2d210fb5a069beb7d0835b
diff --git a/src/backends/aclCommon/ArmComputeUtils.hpp b/src/backends/aclCommon/ArmComputeUtils.hpp
index adcf828..2a07078 100644
--- a/src/backends/aclCommon/ArmComputeUtils.hpp
+++ b/src/backends/aclCommon/ArmComputeUtils.hpp
@@ -7,10 +7,9 @@
#include <armnn/Descriptors.hpp>
#include <armnn/Tensor.hpp>
#include <armnn/utility/Assert.hpp>
+#include <backendsCommon/WorkloadData.hpp>
#include <arm_compute/core/Types.h>
-#include "../../../../clframework/arm_compute/core/Types.h"
-#include "../backendsCommon/WorkloadData.hpp"
namespace armnn
{
diff --git a/src/backends/aclCommon/CMakeLists.txt b/src/backends/aclCommon/CMakeLists.txt
index dac663b..1e3d827 100644
--- a/src/backends/aclCommon/CMakeLists.txt
+++ b/src/backends/aclCommon/CMakeLists.txt
@@ -4,10 +4,10 @@
#
list(APPEND armnnAclCommon_sources
+ ArmComputeSubgraphUtils.hpp
ArmComputeTensorHandle.hpp
ArmComputeTensorUtils.hpp
ArmComputeTensorUtils.cpp
- ArmComputeSubgraphUtils.hpp
ArmComputeUtils.hpp
BaseMemoryManager.cpp
BaseMemoryManager.hpp
diff --git a/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp
index 68942e2..c595e20 100644
--- a/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp
@@ -6,14 +6,11 @@
#include "ClBatchNormalizationFloatWorkload.hpp"
#include "ClWorkloadUtils.hpp"
-#include <cl/ClTensorHandle.hpp>
-
-#include <backendsCommon/CpuTensorHandle.hpp>
-
#include <aclCommon/ArmComputeTensorUtils.hpp>
#include <aclCommon/ArmComputeUtils.hpp>
-
+#include <backendsCommon/CpuTensorHandle.hpp>
#include <cl/ClLayerSupport.hpp>
+#include <cl/ClTensorHandle.hpp>
namespace armnn
{
diff --git a/src/backends/cl/workloads/ClSubtractionWorkload.cpp b/src/backends/cl/workloads/ClSubtractionWorkload.cpp
index c9fb556..865dceb 100644
--- a/src/backends/cl/workloads/ClSubtractionWorkload.cpp
+++ b/src/backends/cl/workloads/ClSubtractionWorkload.cpp
@@ -11,7 +11,6 @@
#include <aclCommon/ArmComputeTensorUtils.hpp>
#include "ClWorkloadUtils.hpp"
-#include "../../../../include/armnn/ArmNN.hpp"
namespace armnn
{