aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarumol Prangnawarat <narumol.prangnawarat@arm.com>2020-01-28 16:50:13 +0000
committerNarumol Prangnawarat <narumol.prangnawarat@arm.com>2020-01-29 23:11:00 +0000
commit9308f6033547836007bd597fbe35b4c8d15105d7 (patch)
tree95b434543249c206e1f1ef2da59dfed2dcb73180
parent412424c7f3553d7469c17deb2a68d07d15a5602b (diff)
downloadarmnn-9308f6033547836007bd597fbe35b4c8d15105d7.tar.gz
IVGCVSW-4322 Remove deprecated AbsLayer and RsqrtLayer and add source
for all environment to dynamic reference backend CMakeLists Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com> Change-Id: I2db1f48597b2af08c9d6d8d052ca08e885e51563
-rw-r--r--src/dynamic/reference/CMakeLists.txt41
1 files changed, 19 insertions, 22 deletions
diff --git a/src/dynamic/reference/CMakeLists.txt b/src/dynamic/reference/CMakeLists.txt
index 4eeebea3af..eff64d980c 100644
--- a/src/dynamic/reference/CMakeLists.txt
+++ b/src/dynamic/reference/CMakeLists.txt
@@ -32,34 +32,31 @@ set(RefBackendFiles ${RefBackendBaseFiles} ${RefBackendWorloadFiles})
# Remove the file that contains the static backend registration
list(REMOVE_ITEM RefBackendFiles ${RefBackendPath}/RefRegistryInitializer.cpp)
-if("${CMAKE_SYSTEM_NAME}" STREQUAL Android)
- # Set the common backend source path
- set(CommonBackendPath ${PROJECT_SOURCE_DIR}/../../../src/backends/backendsCommon)
- # Source files of the common backend
- file(GLOB CommonBackendFiles ${CommonBackendPath}/*.cpp)
+# Set the common backend source path
+set(CommonBackendPath ${PROJECT_SOURCE_DIR}/../../../src/backends/backendsCommon)
+# Source files of the common backend
+file(GLOB CommonBackendFiles ${CommonBackendPath}/*.cpp)
- set(ArmnnPath ${PROJECT_SOURCE_DIR}/../../../src/armnn)
- file(GLOB ArmnnFiles ${ArmnnPath}/*.cpp)
+set(ArmnnPath ${PROJECT_SOURCE_DIR}/../../../src/armnn)
+file(GLOB ArmnnFiles ${ArmnnPath}/*.cpp)
- file(GLOB LayerFiles ${ArmnnPath}/layers/*cpp)
- file(GLOB OptimizationFIles ${ArmnnPath}/optimizations/*.cpp)
- file(GLOB ArmnnBaseFiles ${ArmnnPath}/*cpp)
+file(GLOB LayerFiles ${ArmnnPath}/layers/*cpp)
+file(GLOB OptimizationFIles ${ArmnnPath}/optimizations/*.cpp)
+file(GLOB ArmnnBaseFiles ${ArmnnPath}/*cpp)
+list(REMOVE_ITEM LayerFiles ${ArmnnPath}/layers/AbsLayer.cpp)
+list(REMOVE_ITEM LayerFiles ${ArmnnPath}/layers/RsqrtLayer.cpp)
- set(ArmnnFiles ${ArmnnBaseFiles} ${LayerFiles} ${OptimizationFIles})
+set(ArmnnFiles ${ArmnnBaseFiles} ${LayerFiles} ${OptimizationFIles})
- set(ArmnnUtilsPath ${PROJECT_SOURCE_DIR}/../../../src/armnnUtils)
- file(GLOB ArmnnUtilsFiles ${ArmnnUtilsPath}/*cpp)
+set(ArmnnUtilsPath ${PROJECT_SOURCE_DIR}/../../../src/armnnUtils)
+file(GLOB ArmnnUtilsFiles ${ArmnnUtilsPath}/*cpp)
- set(ProfilingPath ${PROJECT_SOURCE_DIR}/../../../src/profiling)
- file(GLOB ProfilingFiles ${ProfilingPath}/*cpp)
+set(ProfilingPath ${PROJECT_SOURCE_DIR}/../../../src/profiling)
+file(GLOB ProfilingFiles ${ProfilingPath}/*cpp)
- add_library(Arm_CpuRef_backend MODULE
- ${armnnRefDynamicBackend_sources} ${RefBackendFiles} ${CommonBackendFiles}
- ${ArmnnFiles} ${ArmnnUtilsFiles} ${ProfilingFiles})
-else()
- # Create the shared object
- add_library(Arm_CpuRef_backend MODULE ${armnnRefDynamicBackend_sources} ${RefBackendFiles})
-endif()
+add_library(Arm_CpuRef_backend MODULE
+ ${armnnRefDynamicBackend_sources} ${RefBackendFiles} ${CommonBackendFiles}
+ ${ArmnnFiles} ${ArmnnUtilsFiles} ${ProfilingFiles})
target_include_directories(Arm_CpuRef_backend PRIVATE ${PROJECT_SOURCE_DIR}/../../../include)
target_include_directories(Arm_CpuRef_backend PRIVATE ${PROJECT_SOURCE_DIR}/../../../third-party) # for half