From a097d2a0ed8e30d5aaf6d29ec18d0c39201b7b67 Mon Sep 17 00:00:00 2001
From: Sadik Armagan <sadik.armagan@arm.com>
Date: Wed, 24 Nov 2021 15:47:28 +0000
Subject: IVGCVSW-6453 'Move the ArmNN Test Utils code to a physically separate
 directory'

* Created include/armnnTestUtils directory
* Moved Arm NN test utils files into armnnTestUtils directory

Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I03ac54c645c41c52650c4c03b6a58fb1481fef5d
---
 src/backends/reference/test/CMakeLists.txt                     | 1 +
 src/backends/reference/test/RefCreateWorkloadTests.cpp         | 2 +-
 src/backends/reference/test/RefLayerSupportTests.cpp           | 3 ++-
 src/backends/reference/test/RefLayerTests.cpp                  | 2 +-
 src/backends/reference/test/RefOptimizedNetworkTests.cpp       | 2 +-
 src/backends/reference/workloads/RefChannelShuffleWorkload.cpp | 1 -
 6 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/backends/reference')

diff --git a/src/backends/reference/test/CMakeLists.txt b/src/backends/reference/test/CMakeLists.txt
index d7c5da896a..d5ce3553f1 100644
--- a/src/backends/reference/test/CMakeLists.txt
+++ b/src/backends/reference/test/CMakeLists.txt
@@ -23,6 +23,7 @@ list(APPEND armnnRefBackendUnitTests_sources
 add_library(armnnRefBackendUnitTests OBJECT ${armnnRefBackendUnitTests_sources})
 target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn)
 target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
+target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnTestUtils)
 target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends)
 target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling)
 target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include)
diff --git a/src/backends/reference/test/RefCreateWorkloadTests.cpp b/src/backends/reference/test/RefCreateWorkloadTests.cpp
index fae8d0cdd4..e865f25f49 100644
--- a/src/backends/reference/test/RefCreateWorkloadTests.cpp
+++ b/src/backends/reference/test/RefCreateWorkloadTests.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <test/CreateWorkload.hpp>
+#include <CreateWorkload.hpp>
 
 #include <armnn/utility/PolymorphicDowncast.hpp>
 #include <reference/RefTensorHandle.hpp>
diff --git a/src/backends/reference/test/RefLayerSupportTests.cpp b/src/backends/reference/test/RefLayerSupportTests.cpp
index 1adc54e990..f0eb62f12c 100644
--- a/src/backends/reference/test/RefLayerSupportTests.cpp
+++ b/src/backends/reference/test/RefLayerSupportTests.cpp
@@ -5,7 +5,8 @@
 
 #include <layers/ConvertFp16ToFp32Layer.hpp>
 #include <layers/ConvertFp32ToFp16Layer.hpp>
-#include <test/TensorHelpers.hpp>
+
+#include <TensorHelpers.hpp>
 
 #include <backendsCommon/TensorHandle.hpp>
 #include <reference/RefWorkloadFactory.hpp>
diff --git a/src/backends/reference/test/RefLayerTests.cpp b/src/backends/reference/test/RefLayerTests.cpp
index 13487dd53f..9f5814b395 100644
--- a/src/backends/reference/test/RefLayerTests.cpp
+++ b/src/backends/reference/test/RefLayerTests.cpp
@@ -9,7 +9,7 @@
 
 #include <reference/RefWorkloadFactory.hpp>
 
-#include <test/UnitTests.hpp>
+#include <UnitTests.hpp>
 
 TEST_SUITE("Compute_Reference")
 {
diff --git a/src/backends/reference/test/RefOptimizedNetworkTests.cpp b/src/backends/reference/test/RefOptimizedNetworkTests.cpp
index 578d667983..5b128a1f6c 100644
--- a/src/backends/reference/test/RefOptimizedNetworkTests.cpp
+++ b/src/backends/reference/test/RefOptimizedNetworkTests.cpp
@@ -7,7 +7,7 @@
 #include <Network.hpp>
 
 #include <reference/RefWorkloadFactory.hpp>
-#include <test/GraphUtils.hpp>
+#include <GraphUtils.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/src/backends/reference/workloads/RefChannelShuffleWorkload.cpp b/src/backends/reference/workloads/RefChannelShuffleWorkload.cpp
index 6571715c63..9f8514d009 100644
--- a/src/backends/reference/workloads/RefChannelShuffleWorkload.cpp
+++ b/src/backends/reference/workloads/RefChannelShuffleWorkload.cpp
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <backendsCommon/test/DataTypeUtils.hpp>
 #include <armnn/backends/ITensorHandleFactory.hpp>
 #include <armnnUtils/Transpose.hpp>
 #include "RefChannelShuffleWorkload.hpp"
-- 
cgit v1.2.1