From 5900c7841a9807d3b769e136930fd078c127efe6 Mon Sep 17 00:00:00 2001 From: Xiaoyang LI Date: Mon, 16 Sep 2019 10:38:56 +0800 Subject: [PATCH] fix math dependencies error (#2023) --- lite/CMakeLists.txt | 2 +- lite/backends/CMakeLists.txt | 2 +- lite/backends/arm/math/CMakeLists.txt | 6 +++--- lite/core/arena/CMakeLists.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lite/CMakeLists.txt b/lite/CMakeLists.txt index 937781293a..bc05fe7d42 100644 --- a/lite/CMakeLists.txt +++ b/lite/CMakeLists.txt @@ -12,6 +12,7 @@ message(STATUS "LITE_WITH_PROFILE:\t${LITE_WITH_PROFILE}") set(LITE_MODEL_DIR "${THIRD_PARTY_PATH}/install") set(LITE_ON_MOBILE ${LITE_WITH_LIGHT_WEIGHT_FRAMEWORK}) +add_subdirectory(backends) add_subdirectory(utils) add_subdirectory(operators) add_subdirectory(kernels) @@ -19,7 +20,6 @@ add_subdirectory(core) add_subdirectory(model_parser) add_subdirectory(api) add_subdirectory(fluid) -add_subdirectory(backends) if (NOT LITE_ON_TINY_PUBLISH) add_subdirectory(tests) diff --git a/lite/backends/CMakeLists.txt b/lite/backends/CMakeLists.txt index 80dc574de8..70b4f0bbf7 100644 --- a/lite/backends/CMakeLists.txt +++ b/lite/backends/CMakeLists.txt @@ -1,7 +1,7 @@ +add_subdirectory(opencl) add_subdirectory(arm) add_subdirectory(x86) add_subdirectory(cuda) add_subdirectory(fpga) add_subdirectory(host) -add_subdirectory(opencl) add_subdirectory(npu) diff --git a/lite/backends/arm/math/CMakeLists.txt b/lite/backends/arm/math/CMakeLists.txt index f17928cc29..4f59a0541c 100644 --- a/lite/backends/arm/math/CMakeLists.txt +++ b/lite/backends/arm/math/CMakeLists.txt @@ -104,8 +104,8 @@ if (NOT HAS_ARM_MATH_LIB_DIR) slice.cc reduce_mean.cc stack.cc - affine_channel.cc - anchor_generator.cc - DEPS ${lite_kernel_deps}) + affine_channel.cc + anchor_generator.cc + DEPS ${lite_kernel_deps} context tensor) endif() diff --git a/lite/core/arena/CMakeLists.txt b/lite/core/arena/CMakeLists.txt index 854d2f4172..127e2ea11c 100644 --- a/lite/core/arena/CMakeLists.txt +++ b/lite/core/arena/CMakeLists.txt @@ -3,7 +3,7 @@ if(NOT WITH_TESTING) return() endif() -lite_cc_library(arena_framework SRCS framework.cc DEPS program) +lite_cc_library(arena_framework SRCS framework.cc DEPS program gtest) if(NOT LITE_WITH_OPENCL AND (LITE_WITH_X86 OR LITE_WITH_ARM)) lite_cc_test(test_arena_framework SRCS framework_test.cc DEPS arena_framework ${x86_kernels} ${fpga_kernels} ${arm_kernels} ${lite_ops} ${host_kernels}) -- GitLab