From d57e4a7bfc445a1a1bb4a146930130897f181768 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: Mon, 9 Jul 2018 10:35:38 +0900 Subject: [PATCH] link runtime_run_android_nn_test to nnapi_puer_arm_compute (#1901) this commit adds link runtime_run_android_nn_test to nnapi_puer_arm_compute, which is missing now. Signed-off-by: Chunseok Lee --- runtimes/CMakeLists.txt | 7 ++++++- runtimes/tests/neural_networks_test/CMakeLists.txt | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt index e108976..83cd49c 100644 --- a/runtimes/CMakeLists.txt +++ b/runtimes/CMakeLists.txt @@ -12,10 +12,15 @@ if(BUILD_NEW_RUNTIME) set(BUILD_RUNTIME_TESTS ON) endif(BUILD_NEW_RUNTIME) +if(BUILD_PURE_ARM_COMPUTE) + set(LIB_PUREACL_RUNTIME nnapi_pure_arm_compute) + add_subdirectory(pure_arm_compute) + set(BUILD_RUNTIME_TESTS ON) +endif() + if(BUILD_RUNTIME_TESTS) add_subdirectory(tests) endif(BUILD_RUNTIME_TESTS) add_subdirectory(template) add_subdirectory(logging) -add_subdirectory(pure_arm_compute) diff --git a/runtimes/tests/neural_networks_test/CMakeLists.txt b/runtimes/tests/neural_networks_test/CMakeLists.txt index ea9ea6b..d2e64d5 100644 --- a/runtimes/tests/neural_networks_test/CMakeLists.txt +++ b/runtimes/tests/neural_networks_test/CMakeLists.txt @@ -28,7 +28,10 @@ if (BUILD_NN_RUNTIME) target_link_libraries(${RUNTIME_ANDROID_NN_TEST} ${LIB_RUNTIME}) elseif (BUILD_NEW_RUNTIME) target_link_libraries(${RUNTIME_ANDROID_NN_TEST} ${LIB_NEW_RUNTIME}) +elseif (BUILD_PURE_ARM_COMPUTE) + target_link_libraries(${RUNTIME_ANDROID_NN_TEST} ${LIB_PUREACL_RUNTIME}) endif() +target_link_libraries(${RUNTIME_ANDROID_NN_TEST} neuralnetworks) target_link_libraries(${RUNTIME_ANDROID_NN_TEST} gtest) target_link_libraries(${RUNTIME_ANDROID_NN_TEST} ${LIB_PTHREAD}) -- 2.7.4