commit c9cc80455ff29fd2c8622c9487ec9c57ade6ea30
author Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Thu Nov 01 16:15:57 2018 +0000
committer Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Fri Nov 02 14:49:21 2018 +0000
tree 41b1491312fe6082b39d5d37ffa0dcf0ab0f2817
parent 207ef9a6b8b3ea0afe9a095639f67b5dedd095d7

IVGCVSW-1946: Remove armnn/src from the include paths

Change-Id: I663a0a0fccb43ee960ec070121a59df9db0bb04e

src/backends/reference/test/CMakeLists.txt

diff --git a/src/backends/reference/test/CMakeLists.txt b/src/backends/reference/test/CMakeLists.txt
index 1eec594..aee6216 100644
--- a/src/backends/reference/test/CMakeLists.txt
+++ b/src/backends/reference/test/CMakeLists.txt
@@ -14,6 +14,6 @@
 )
 
 add_library(armnnRefBackendUnitTests OBJECT ${armnnRefBackendUnitTests_sources})
-target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src)
 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/backends)

src/backends/reference/test/RefCreateWorkloadTests.cpp

diff --git a/src/backends/reference/test/RefCreateWorkloadTests.cpp b/src/backends/reference/test/RefCreateWorkloadTests.cpp
index d932270..d03fe5c 100644
--- a/src/backends/reference/test/RefCreateWorkloadTests.cpp
+++ b/src/backends/reference/test/RefCreateWorkloadTests.cpp
@@ -3,11 +3,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <armnn/test/CreateWorkload.hpp>
+#include <test/CreateWorkload.hpp>
 
-#include <backends/CpuTensorHandle.hpp>
-#include <backends/reference/RefWorkloadFactory.hpp>
-#include <backends/reference/workloads/RefWorkloads.hpp>
+#include <backendsCommon/CpuTensorHandle.hpp>
+#include <reference/RefWorkloadFactory.hpp>
+#include <reference/workloads/RefWorkloads.hpp>
 
 namespace
 {

src/backends/reference/test/RefEndToEndTests.cpp

diff --git a/src/backends/reference/test/RefEndToEndTests.cpp b/src/backends/reference/test/RefEndToEndTests.cpp
index 8938d6f..dc2ffb8 100644
--- a/src/backends/reference/test/RefEndToEndTests.cpp
+++ b/src/backends/reference/test/RefEndToEndTests.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>
 

src/backends/reference/test/RefJsonPrinterTests.cpp

diff --git a/src/backends/reference/test/RefJsonPrinterTests.cpp b/src/backends/reference/test/RefJsonPrinterTests.cpp
index ee668a2..4d48443 100644
--- a/src/backends/reference/test/RefJsonPrinterTests.cpp
+++ b/src/backends/reference/test/RefJsonPrinterTests.cpp
@@ -5,7 +5,7 @@
 
 #include <armnn/BackendId.hpp>
 
-#include <backends/test/JsonPrinterTestImpl.hpp>
+#include <backendsCommon/test/JsonPrinterTestImpl.hpp>
 
 #include <boost/test/unit_test.hpp>
 

src/backends/reference/test/RefLayerSupportTests.cpp

diff --git a/src/backends/reference/test/RefLayerSupportTests.cpp b/src/backends/reference/test/RefLayerSupportTests.cpp
index be3f3f8..b7fbc68 100644
--- a/src/backends/reference/test/RefLayerSupportTests.cpp
+++ b/src/backends/reference/test/RefLayerSupportTests.cpp
@@ -3,14 +3,14 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <armnn/layers/ConvertFp16ToFp32Layer.hpp>
-#include <armnn/layers/ConvertFp32ToFp16Layer.hpp>
-#include <armnn/test/TensorHelpers.hpp>
+#include <layers/ConvertFp16ToFp32Layer.hpp>
+#include <layers/ConvertFp32ToFp16Layer.hpp>
+#include <test/TensorHelpers.hpp>
 
-#include <backends/CpuTensorHandle.hpp>
-#include <backends/reference/RefWorkloadFactory.hpp>
-#include <backends/test/LayerTests.hpp>
-#include <backends/test/IsLayerSupportedTestImpl.hpp>
+#include <backendsCommon/CpuTensorHandle.hpp>
+#include <reference/RefWorkloadFactory.hpp>
+#include <backendsCommon/test/LayerTests.hpp>
+#include <backendsCommon/test/IsLayerSupportedTestImpl.hpp>
 
 #include <boost/test/unit_test.hpp>
 

src/backends/reference/test/RefLayerTests.cpp

diff --git a/src/backends/reference/test/RefLayerTests.cpp b/src/backends/reference/test/RefLayerTests.cpp
index d481b82..e79953f 100644
--- a/src/backends/reference/test/RefLayerTests.cpp
+++ b/src/backends/reference/test/RefLayerTests.cpp
@@ -3,11 +3,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include "test/TensorHelpers.hpp"
-#include "test/UnitTests.hpp"
+#include <test/TensorHelpers.hpp>
+#include <test/UnitTests.hpp>
 
-#include <backends/reference/RefWorkloadFactory.hpp>
-#include <backends/test/LayerTests.hpp>
+#include <reference/RefWorkloadFactory.hpp>
+#include <backendsCommon/test/LayerTests.hpp>
 
 #include <boost/test/unit_test.hpp>
 

src/backends/reference/test/RefOptimizedNetworkTests.cpp

diff --git a/src/backends/reference/test/RefOptimizedNetworkTests.cpp b/src/backends/reference/test/RefOptimizedNetworkTests.cpp
index 63615e6..907e795 100644
--- a/src/backends/reference/test/RefOptimizedNetworkTests.cpp
+++ b/src/backends/reference/test/RefOptimizedNetworkTests.cpp
@@ -4,10 +4,10 @@
 //
 
 #include <armnn/ArmNN.hpp>
-#include <armnn/Graph.hpp>
-#include <armnn/Network.hpp>
+#include <Graph.hpp>
+#include <Network.hpp>
 
-#include <backends/reference/RefWorkloadFactory.hpp>
+#include <reference/RefWorkloadFactory.hpp>
 
 #include <boost/test/unit_test.hpp>
 

src/backends/reference/test/RefRuntimeTests.cpp

diff --git a/src/backends/reference/test/RefRuntimeTests.cpp b/src/backends/reference/test/RefRuntimeTests.cpp
index 2536627..ae49366 100644
--- a/src/backends/reference/test/RefRuntimeTests.cpp
+++ b/src/backends/reference/test/RefRuntimeTests.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/test/unit_test.hpp>