From: 이춘석/동작제어Lab(SR)/Staff Engineer/삼성전자 <chunseok.lee@samsung.com>
Date: Tue, 10 Jul 2018 09:53:33 +0000 (+0900)
Subject: Set pureacl runtime to be the main runtime (#1908)
X-Git-Tag: 0.2~474
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a1c03d45d82c0cc694c600f83c714bb89ffe8cc;p=platform%2Fcore%2Fml%2Fnnfw.git

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 <chunseok.lee@samsung.com>
---

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)