提交 908fa796 编写于 作者: X Xiaoyang LI 提交者: Yan Chunwei

cherry-pick: fix math dependencies error (#2023) (#2041)

上级 7b2aa3fa
...@@ -12,6 +12,7 @@ message(STATUS "LITE_WITH_PROFILE:\t${LITE_WITH_PROFILE}") ...@@ -12,6 +12,7 @@ message(STATUS "LITE_WITH_PROFILE:\t${LITE_WITH_PROFILE}")
set(LITE_MODEL_DIR "${THIRD_PARTY_PATH}/install") set(LITE_MODEL_DIR "${THIRD_PARTY_PATH}/install")
set(LITE_ON_MOBILE ${LITE_WITH_LIGHT_WEIGHT_FRAMEWORK}) set(LITE_ON_MOBILE ${LITE_WITH_LIGHT_WEIGHT_FRAMEWORK})
add_subdirectory(backends)
add_subdirectory(utils) add_subdirectory(utils)
add_subdirectory(operators) add_subdirectory(operators)
add_subdirectory(kernels) add_subdirectory(kernels)
...@@ -19,7 +20,6 @@ add_subdirectory(core) ...@@ -19,7 +20,6 @@ add_subdirectory(core)
add_subdirectory(model_parser) add_subdirectory(model_parser)
add_subdirectory(api) add_subdirectory(api)
add_subdirectory(fluid) add_subdirectory(fluid)
add_subdirectory(backends)
if (NOT LITE_ON_TINY_PUBLISH) if (NOT LITE_ON_TINY_PUBLISH)
add_subdirectory(tests) add_subdirectory(tests)
......
add_subdirectory(opencl)
add_subdirectory(arm) add_subdirectory(arm)
add_subdirectory(x86) add_subdirectory(x86)
add_subdirectory(cuda) add_subdirectory(cuda)
add_subdirectory(fpga) add_subdirectory(fpga)
add_subdirectory(host) add_subdirectory(host)
add_subdirectory(opencl)
add_subdirectory(npu) add_subdirectory(npu)
...@@ -104,8 +104,8 @@ if (NOT HAS_ARM_MATH_LIB_DIR) ...@@ -104,8 +104,8 @@ if (NOT HAS_ARM_MATH_LIB_DIR)
slice.cc slice.cc
reduce_mean.cc reduce_mean.cc
stack.cc stack.cc
affine_channel.cc affine_channel.cc
anchor_generator.cc anchor_generator.cc
DEPS ${lite_kernel_deps}) DEPS ${lite_kernel_deps} context tensor)
endif() endif()
...@@ -1924,6 +1924,7 @@ void gemm_prepack_oth_int8(const int8_t* A_packed, ...@@ -1924,6 +1924,7 @@ void gemm_prepack_oth_int8(const int8_t* A_packed,
auto* zerobuf = static_cast<int8_t *>(malloc(x_block * \ auto* zerobuf = static_cast<int8_t *>(malloc(x_block * \
(sizeof(int8_t) + sizeof(Dtype)))); (sizeof(int8_t) + sizeof(Dtype))));
memset(zerobuf, 0, x_block * sizeof(int8_t)); memset(zerobuf, 0, x_block * sizeof(int8_t));
auto* trash_ptr = reinterpret_cast<Dtype*>(zerobuf + \ auto* trash_ptr = reinterpret_cast<Dtype*>(zerobuf + \
x_block * sizeof(int8_t)); x_block * sizeof(int8_t));
......
...@@ -3,7 +3,7 @@ if(NOT WITH_TESTING) ...@@ -3,7 +3,7 @@ if(NOT WITH_TESTING)
return() return()
endif() 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)) 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}) lite_cc_test(test_arena_framework SRCS framework_test.cc DEPS arena_framework ${x86_kernels} ${fpga_kernels} ${arm_kernels} ${lite_ops} ${host_kernels})
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册