diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2020-11-13 15:26:41 +0000 |
|---|---|---|
| committer | mike.kelly <mike.kelly@arm.com> | 2020-11-13 15:49:08 +0000 |
| commit | 0d4ed395856d1e55bfe1a252efea4c0aa7ede4a9 (patch) | |
| tree | c29b011586c205662e779202c66b042c20640700 | |
| parent | e688d611acf8efec5e2c79db0654d28d44d82a77 (diff) | |
| download | armnn-0d4ed395856d1e55bfe1a252efea4c0aa7ede4a9.tar.gz | |
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
4 files changed, 4 insertions, 9 deletions
diff --git a/src/backends/aclCommon/ArmComputeUtils.hpp b/src/backends/aclCommon/ArmComputeUtils.hpp index adcf8281d2..2a0707872e 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 dac663b20c..1e3d827ce0 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 68942e2a01..c595e20a1f 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 c9fb556383..865dceb869 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 { |