aboutsummaryrefslogtreecommitdiff
path: root/src/backends/cl/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/backends/cl/test')
-rw-r--r--src/backends/cl/test/CMakeLists.txt2
-rw-r--r--src/backends/cl/test/ClContextControlFixture.hpp2
-rw-r--r--src/backends/cl/test/ClCreateWorkloadTests.cpp12
-rw-r--r--src/backends/cl/test/ClEndToEndTests.cpp2
-rw-r--r--src/backends/cl/test/ClJsonPrinterTests.cpp4
-rw-r--r--src/backends/cl/test/ClLayerSupportTests.cpp18
-rwxr-xr-xsrc/backends/cl/test/ClLayerTests.cpp14
-rw-r--r--src/backends/cl/test/ClMemCopyTests.cpp6
-rw-r--r--src/backends/cl/test/ClOptimizedNetworkTests.cpp6
-rw-r--r--src/backends/cl/test/ClRuntimeTests.cpp6
-rw-r--r--src/backends/cl/test/Fp16SupportTest.cpp6
-rw-r--r--src/backends/cl/test/OpenClTimerTest.cpp16
12 files changed, 47 insertions, 47 deletions
diff --git a/src/backends/cl/test/CMakeLists.txt b/src/backends/cl/test/CMakeLists.txt
index c017377768..574edf4f58 100644
--- a/src/backends/cl/test/CMakeLists.txt
+++ b/src/backends/cl/test/CMakeLists.txt
@@ -17,6 +17,6 @@ list(APPEND armnnClBackendUnitTests_sources
)
add_library(armnnClBackendUnitTests OBJECT ${armnnClBackendUnitTests_sources})
-target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src)
target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn)
target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
+target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends)
diff --git a/src/backends/cl/test/ClContextControlFixture.hpp b/src/backends/cl/test/ClContextControlFixture.hpp
index fd53e3fcf3..52e34147bb 100644
--- a/src/backends/cl/test/ClContextControlFixture.hpp
+++ b/src/backends/cl/test/ClContextControlFixture.hpp
@@ -5,7 +5,7 @@
#pragma once
-#include <backends/cl/ClContextControl.hpp>
+#include <cl/ClContextControl.hpp>
template<bool ProfilingEnabled>
struct ClContextControlFixtureBase
diff --git a/src/backends/cl/test/ClCreateWorkloadTests.cpp b/src/backends/cl/test/ClCreateWorkloadTests.cpp
index 2a705de99b..72a2eb27e1 100644
--- a/src/backends/cl/test/ClCreateWorkloadTests.cpp
+++ b/src/backends/cl/test/ClCreateWorkloadTests.cpp
@@ -5,14 +5,14 @@
#include "ClContextControlFixture.hpp"
-#include <backends/MemCopyWorkload.hpp>
+#include <backendsCommon/MemCopyWorkload.hpp>
-#include <backends/aclCommon/test/CreateWorkloadClNeon.hpp>
+#include <aclCommon/test/CreateWorkloadClNeon.hpp>
-#include <backends/cl/ClTensorHandle.hpp>
-#include <backends/cl/ClWorkloadFactory.hpp>
-#include <backends/cl/workloads/ClWorkloads.hpp>
-#include <backends/cl/workloads/ClWorkloadUtils.hpp>
+#include <cl/ClTensorHandle.hpp>
+#include <cl/ClWorkloadFactory.hpp>
+#include <cl/workloads/ClWorkloads.hpp>
+#include <cl/workloads/ClWorkloadUtils.hpp>
boost::test_tools::predicate_result CompareIClTensorHandleShape(IClTensorHandle* tensorHandle,
std::initializer_list<unsigned int> expectedDimensions)
diff --git a/src/backends/cl/test/ClEndToEndTests.cpp b/src/backends/cl/test/ClEndToEndTests.cpp
index d6fd8875c4..b374079e78 100644
--- a/src/backends/cl/test/ClEndToEndTests.cpp
+++ b/src/backends/cl/test/ClEndToEndTests.cpp
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: MIT
//
-#include <backends/test/EndToEndTestImpl.hpp>
+#include <backendsCommon/test/EndToEndTestImpl.hpp>
#include <boost/test/unit_test.hpp>
diff --git a/src/backends/cl/test/ClJsonPrinterTests.cpp b/src/backends/cl/test/ClJsonPrinterTests.cpp
index f0b4b7acae..6a27e8c6c7 100644
--- a/src/backends/cl/test/ClJsonPrinterTests.cpp
+++ b/src/backends/cl/test/ClJsonPrinterTests.cpp
@@ -5,8 +5,8 @@
#include <armnn/BackendId.hpp>
-#include <backends/cl/test/ClContextControlFixture.hpp>
-#include <backends/test/JsonPrinterTestImpl.hpp>
+#include <cl/test/ClContextControlFixture.hpp>
+#include <backendsCommon/test/JsonPrinterTestImpl.hpp>
#include <boost/test/unit_test.hpp>
diff --git a/src/backends/cl/test/ClLayerSupportTests.cpp b/src/backends/cl/test/ClLayerSupportTests.cpp
index 513366e8dc..0019afed6b 100644
--- a/src/backends/cl/test/ClLayerSupportTests.cpp
+++ b/src/backends/cl/test/ClLayerSupportTests.cpp
@@ -3,15 +3,15 @@
// SPDX-License-Identifier: MIT
//
-#include <armnn/layers/ConvertFp16ToFp32Layer.hpp>
-#include <armnn/layers/ConvertFp32ToFp16Layer.hpp>
-#include <armnn/test/TensorHelpers.hpp>
-
-#include <backends/CpuTensorHandle.hpp>
-#include <backends/cl/ClWorkloadFactory.hpp>
-#include <backends/cl/test/ClContextControlFixture.hpp>
-#include <backends/test/IsLayerSupportedTestImpl.hpp>
-#include <backends/test/LayerTests.hpp>
+#include <layers/ConvertFp16ToFp32Layer.hpp>
+#include <layers/ConvertFp32ToFp16Layer.hpp>
+#include <test/TensorHelpers.hpp>
+
+#include <backendsCommon/CpuTensorHandle.hpp>
+#include <cl/ClWorkloadFactory.hpp>
+#include <cl/test/ClContextControlFixture.hpp>
+#include <backendsCommon/test/IsLayerSupportedTestImpl.hpp>
+#include <backendsCommon/test/LayerTests.hpp>
#include <boost/test/unit_test.hpp>
diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp
index 3ff3c093be..102ebbdf6f 100755
--- a/src/backends/cl/test/ClLayerTests.cpp
+++ b/src/backends/cl/test/ClLayerTests.cpp
@@ -8,13 +8,13 @@
#include "test/TensorHelpers.hpp"
#include "test/UnitTests.hpp"
-#include <backends/CpuTensorHandle.hpp>
-#include <backends/cl/ClLayerSupport.hpp>
-#include <backends/cl/ClWorkloadFactory.hpp>
-#include <backends/cl/workloads/ClWorkloadUtils.hpp>
-#include <backends/reference/RefWorkloadFactory.hpp>
-#include <backends/test/ActivationFixture.hpp>
-#include <backends/test/LayerTests.hpp>
+#include <backendsCommon/CpuTensorHandle.hpp>
+#include <cl/ClLayerSupport.hpp>
+#include <cl/ClWorkloadFactory.hpp>
+#include <cl/workloads/ClWorkloadUtils.hpp>
+#include <reference/RefWorkloadFactory.hpp>
+#include <backendsCommon/test/ActivationFixture.hpp>
+#include <backendsCommon/test/LayerTests.hpp>
#include <arm_compute/core/CL/CLKernelLibrary.h>
#include <arm_compute/runtime/CL/CLScheduler.h>
diff --git a/src/backends/cl/test/ClMemCopyTests.cpp b/src/backends/cl/test/ClMemCopyTests.cpp
index 2635495e46..93b8df17bf 100644
--- a/src/backends/cl/test/ClMemCopyTests.cpp
+++ b/src/backends/cl/test/ClMemCopyTests.cpp
@@ -3,9 +3,9 @@
// SPDX-License-Identifier: MIT
//
-#include <backends/cl/ClWorkloadFactory.hpp>
-#include <backends/reference/RefWorkloadFactory.hpp>
-#include <backends/aclCommon/test/MemCopyTestImpl.hpp>
+#include <cl/ClWorkloadFactory.hpp>
+#include <reference/RefWorkloadFactory.hpp>
+#include <aclCommon/test/MemCopyTestImpl.hpp>
#include <boost/test/unit_test.hpp>
diff --git a/src/backends/cl/test/ClOptimizedNetworkTests.cpp b/src/backends/cl/test/ClOptimizedNetworkTests.cpp
index b39a4b1304..cd8a770812 100644
--- a/src/backends/cl/test/ClOptimizedNetworkTests.cpp
+++ b/src/backends/cl/test/ClOptimizedNetworkTests.cpp
@@ -4,11 +4,11 @@
//
#include <armnn/ArmNN.hpp>
-#include <armnn/Network.hpp>
+#include <Network.hpp>
-#include <armnn/test/GraphUtils.hpp>
+#include <test/GraphUtils.hpp>
-#include <backends/cl/ClWorkloadFactory.hpp>
+#include <cl/ClWorkloadFactory.hpp>
#include <boost/test/unit_test.hpp>
diff --git a/src/backends/cl/test/ClRuntimeTests.cpp b/src/backends/cl/test/ClRuntimeTests.cpp
index d29cd5b1c2..c6da261c15 100644
--- a/src/backends/cl/test/ClRuntimeTests.cpp
+++ b/src/backends/cl/test/ClRuntimeTests.cpp
@@ -3,11 +3,11 @@
// SPDX-License-Identifier: MIT
//
-#include <armnn/test/RuntimeTests.hpp>
+#include <test/RuntimeTests.hpp>
-#include <armnnUtils/LeakChecking.hpp>
+#include <LeakChecking.hpp>
-#include <backends/test/RuntimeTestImpl.hpp>
+#include <backendsCommon/test/RuntimeTestImpl.hpp>
#include <boost/core/ignore_unused.hpp>
#include <boost/test/unit_test.hpp>
diff --git a/src/backends/cl/test/Fp16SupportTest.cpp b/src/backends/cl/test/Fp16SupportTest.cpp
index e8d459170e..dac1ebcd02 100644
--- a/src/backends/cl/test/Fp16SupportTest.cpp
+++ b/src/backends/cl/test/Fp16SupportTest.cpp
@@ -7,12 +7,12 @@
#include <armnn/Descriptors.hpp>
#include <armnn/IRuntime.hpp>
#include <armnn/INetwork.hpp>
-#include <armnnUtils/Half.hpp>
+#include <Half.hpp>
#include <Graph.hpp>
#include <Optimizer.hpp>
-#include <backends/CpuTensorHandle.hpp>
-#include <backends/test/QuantizeHelper.hpp>
+#include <backendsCommon/CpuTensorHandle.hpp>
+#include <backendsCommon/test/QuantizeHelper.hpp>
#include <boost/core/ignore_unused.hpp>
#include <boost/test/unit_test.hpp>
diff --git a/src/backends/cl/test/OpenClTimerTest.cpp b/src/backends/cl/test/OpenClTimerTest.cpp
index 70ceac2a3f..0c40a868eb 100644
--- a/src/backends/cl/test/OpenClTimerTest.cpp
+++ b/src/backends/cl/test/OpenClTimerTest.cpp
@@ -5,17 +5,17 @@
#if (defined(__aarch64__)) || (defined(__x86_64__)) // disable test failing on FireFly/Armv7
-#include <armnn/test/TensorHelpers.hpp>
+#include <test/TensorHelpers.hpp>
-#include <backends/CpuTensorHandle.hpp>
-#include <backends/WorkloadFactory.hpp>
+#include <backendsCommon/CpuTensorHandle.hpp>
+#include <backendsCommon/WorkloadFactory.hpp>
-#include <backends/cl/ClContextControl.hpp>
-#include <backends/cl/ClWorkloadFactory.hpp>
-#include <backends/cl/OpenClTimer.hpp>
+#include <cl/ClContextControl.hpp>
+#include <cl/ClWorkloadFactory.hpp>
+#include <cl/OpenClTimer.hpp>
-#include <backends/test/TensorCopyUtils.hpp>
-#include <backends/test/WorkloadTestUtils.hpp>
+#include <backendsCommon/test/TensorCopyUtils.hpp>
+#include <backendsCommon/test/WorkloadTestUtils.hpp>
#include <arm_compute/runtime/CL/CLScheduler.h>