From 7a1c03d45d82c0cc694c600f83c714bb89ffe8cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=9D=B4=EC=B6=98=EC=84=9D/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Tue, 10 Jul 2018 18:53:33 +0900 Subject: [PATCH] Set pureacl runtime to be the main runtime (#1908) 0. do not build legacy(nn) runtime into out/lib - install legacy(nn) runtime into out/lib/legacy 1. Trigger puracl runtime build on default 2. install pureacl runtime into out/lib Signed-off-by: Chunseok Lee --- CMakeLists.txt | 4 ++-- runtimes/nn/CMakeLists.txt | 2 +- runtimes/pure_arm_compute/CMakeLists.txt | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f3d863b..014500f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,10 +92,10 @@ endforeach() # Configuration flags # option(BUILD_ACL "Build ARM Compute Library" OFF) -option(BUILD_PURE_ARM_COMPUTE "Build pure_arm_compute runtime" OFF) +option(BUILD_PURE_ARM_COMPUTE "Build pure_arm_compute runtime" ON) option(BUILD_ACL_STATIC_LIB "Build ARM Comput Static Library" OFF) option(BUILD_BENCHMARK_ACL "Build ARM Compute Library Benchmarks" OFF) -option(BUILD_NN_RUNTIME "Build NN Runtime" ON) +option(BUILD_NN_RUNTIME "Build NN Runtime" OFF) option(BUILD_NEW_RUNTIME "Build New Runtime" OFF) #if implementation is done, it would replace nn runtime. option(BUILD_LABS "Build lab projects" ON) option(BUILD_ANDROID_NN_RUNTIME_TEST "Build Android NN Runtime Test" ON) diff --git a/runtimes/nn/CMakeLists.txt b/runtimes/nn/CMakeLists.txt index e82a840..2b17ad1 100644 --- a/runtimes/nn/CMakeLists.txt +++ b/runtimes/nn/CMakeLists.txt @@ -20,4 +20,4 @@ endif(TARGET kernelacl) set_target_properties(${LIB_RUNTIME} PROPERTIES OUTPUT_NAME neuralnetworks) set_target_properties(${LIB_RUNTIME} PROPERTIES CXX_STANDARD 14) -install(TARGETS ${LIB_RUNTIME} DESTINATION lib) +install(TARGETS ${LIB_RUNTIME} DESTINATION lib/legacy) diff --git a/runtimes/pure_arm_compute/CMakeLists.txt b/runtimes/pure_arm_compute/CMakeLists.txt index 2b0b6bf..96433ca 100644 --- a/runtimes/pure_arm_compute/CMakeLists.txt +++ b/runtimes/pure_arm_compute/CMakeLists.txt @@ -20,6 +20,7 @@ endif() set_target_properties(nnapi_pure_arm_compute PROPERTIES OUTPUT_NAME neuralnetworks) install(TARGETS nnapi_pure_arm_compute DESTINATION lib/pureacl RENAME neuralnetworks) +install(TARGETS nnapi_pure_arm_compute DESTINATION lib RENAME neuralnetworks) # To prevent undefined references add_executable(pure_arm_compute_symbolcheck symbolcheck.cpp) -- 2.7.4