IVGCVSW-2022 : fix for backend cmake files to respect BUILD_UNIT_TESTS variable
Change-Id: I8d34419742152edd50f1ec438e32d3ccc4f38351
diff --git a/src/backends/aclCommon/CMakeLists.txt b/src/backends/aclCommon/CMakeLists.txt
index 2bfd024..9282e10 100644
--- a/src/backends/aclCommon/CMakeLists.txt
+++ b/src/backends/aclCommon/CMakeLists.txt
@@ -23,7 +23,9 @@
memory/PoolManager.hpp
)
-add_subdirectory(test)
+if(BUILD_UNIT_TESTS)
+ add_subdirectory(test)
+endif()
add_library(armnnAclCommon OBJECT ${armnnAclCommon_sources})
target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src)
diff --git a/src/backends/aclCommon/test/CMakeLists.txt b/src/backends/aclCommon/test/CMakeLists.txt
index 98008ed..4378276 100644
--- a/src/backends/aclCommon/test/CMakeLists.txt
+++ b/src/backends/aclCommon/test/CMakeLists.txt
@@ -6,9 +6,10 @@
list(APPEND armnnAclCommonUnitTests_sources
CreateWorkloadClNeon.hpp
MemCopyTests.cpp
+ MemCopyTestImpl.hpp
)
add_library(armnnAclCommonUnitTests OBJECT ${armnnAclCommonUnitTests_sources})
target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src)
target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn)
-target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
\ No newline at end of file
+target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
diff --git a/src/backends/test/MemCopyTestImpl.hpp b/src/backends/aclCommon/test/MemCopyTestImpl.hpp
similarity index 95%
rename from src/backends/test/MemCopyTestImpl.hpp
rename to src/backends/aclCommon/test/MemCopyTestImpl.hpp
index dab7f47..322cb07 100644
--- a/src/backends/test/MemCopyTestImpl.hpp
+++ b/src/backends/aclCommon/test/MemCopyTestImpl.hpp
@@ -4,9 +4,9 @@
//
#pragma once
-#include "LayerTests.hpp"
-#include "TensorCopyUtils.hpp"
-#include "WorkloadTestUtils.hpp"
+#include <backends/test/LayerTests.hpp>
+#include <backends/test/TensorCopyUtils.hpp>
+#include <backends/test/WorkloadTestUtils.hpp>
#include <armnn/test/TensorHelpers.hpp>
diff --git a/src/backends/aclCommon/test/MemCopyTests.cpp b/src/backends/aclCommon/test/MemCopyTests.cpp
index 8ecdb10..7e503b1 100644
--- a/src/backends/aclCommon/test/MemCopyTests.cpp
+++ b/src/backends/aclCommon/test/MemCopyTests.cpp
@@ -6,7 +6,10 @@
#include <backends/aclCommon/ArmComputeTensorUtils.hpp>
#include <backends/cl/ClWorkloadFactory.hpp>
#include <backends/neon/NeonWorkloadFactory.hpp>
-#include <backends/test/MemCopyTestImpl.hpp>
+
+#if ARMCOMPUTECL_ENABLED && ARMCOMPUTENEON_ENABLED
+#include <backends/aclCommon/test/MemCopyTestImpl.hpp>
+#endif
#include <boost/test/unit_test.hpp>
diff --git a/src/backends/cl/CMakeLists.txt b/src/backends/cl/CMakeLists.txt
index 5704e0e..d38fb68 100644
--- a/src/backends/cl/CMakeLists.txt
+++ b/src/backends/cl/CMakeLists.txt
@@ -21,7 +21,10 @@
)
add_subdirectory(workloads)
- add_subdirectory(test)
+
+ if(BUILD_UNIT_TESTS)
+ add_subdirectory(test)
+ endif()
endif()
add_library(armnnClBackend OBJECT ${armnnClBackend_sources})
diff --git a/src/backends/cl/backend.cmake b/src/backends/cl/backend.cmake
index f8a1c1c..eb62147 100644
--- a/src/backends/cl/backend.cmake
+++ b/src/backends/cl/backend.cmake
@@ -3,12 +3,12 @@
# SPDX-License-Identifier: MIT
#
+add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/cl)
+list(APPEND armnnLibraries armnnClBackend)
+
if(ARMCOMPUTECL)
- add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/cl)
- list(APPEND armnnLibraries armnnClBackend armnnClBackendWorkloads)
+ list(APPEND armnnLibraries armnnClBackendWorkloads)
list(APPEND armnnUnitTestLibraries armnnClBackendUnitTests)
else()
message("CL backend is disabled")
- add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/cl)
- list(APPEND armnnLibraries armnnClBackend)
endif()
diff --git a/src/backends/cl/test/ClMemCopyTests.cpp b/src/backends/cl/test/ClMemCopyTests.cpp
index af8a36d..2635495 100644
--- a/src/backends/cl/test/ClMemCopyTests.cpp
+++ b/src/backends/cl/test/ClMemCopyTests.cpp
@@ -5,8 +5,7 @@
#include <backends/cl/ClWorkloadFactory.hpp>
#include <backends/reference/RefWorkloadFactory.hpp>
-
-#include <backends/test/MemCopyTestImpl.hpp>
+#include <backends/aclCommon/test/MemCopyTestImpl.hpp>
#include <boost/test/unit_test.hpp>
diff --git a/src/backends/neon/CMakeLists.txt b/src/backends/neon/CMakeLists.txt
index c44dcc1..e294ff7 100644
--- a/src/backends/neon/CMakeLists.txt
+++ b/src/backends/neon/CMakeLists.txt
@@ -19,7 +19,11 @@
)
add_subdirectory(workloads)
- add_subdirectory(test)
+
+ if(BUILD_UNIT_TESTS)
+ add_subdirectory(test)
+ endif()
+
else()
list(APPEND armnnNeonBackend_sources
NeonLayerSupport.cpp
diff --git a/src/backends/neon/backend.cmake b/src/backends/neon/backend.cmake
index 0240d52..c8ff488 100644
--- a/src/backends/neon/backend.cmake
+++ b/src/backends/neon/backend.cmake
@@ -3,12 +3,12 @@
# SPDX-License-Identifier: MIT
#
+add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/neon)
+list(APPEND armnnLibraries armnnNeonBackend)
+
if(ARMCOMPUTENEON)
- add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/neon)
- list(APPEND armnnLibraries armnnNeonBackend armnnNeonBackendWorkloads)
+ list(APPEND armnnLibraries armnnNeonBackendWorkloads)
list(APPEND armnnUnitTestLibraries armnnNeonBackendUnitTests)
else()
message("NEON backend is disabled")
- add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/neon)
- list(APPEND armnnLibraries armnnNeonBackend)
endif()
diff --git a/src/backends/neon/test/NeonMemCopyTests.cpp b/src/backends/neon/test/NeonMemCopyTests.cpp
index ddb4734..2b96d7c 100644
--- a/src/backends/neon/test/NeonMemCopyTests.cpp
+++ b/src/backends/neon/test/NeonMemCopyTests.cpp
@@ -5,8 +5,7 @@
#include <backends/neon/NeonWorkloadFactory.hpp>
#include <backends/reference/RefWorkloadFactory.hpp>
-
-#include <backends/test/MemCopyTestImpl.hpp>
+#include <backends/aclCommon/test/MemCopyTestImpl.hpp>
#include <boost/test/unit_test.hpp>
diff --git a/src/backends/reference/CMakeLists.txt b/src/backends/reference/CMakeLists.txt
index 05ef7d5..a0d27cc 100644
--- a/src/backends/reference/CMakeLists.txt
+++ b/src/backends/reference/CMakeLists.txt
@@ -18,4 +18,7 @@
target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
add_subdirectory(workloads)
-add_subdirectory(test)
+
+if(BUILD_UNIT_TESTS)
+ add_subdirectory(test)
+endif()