diff --git a/mindspore/lite/CMakeLists.txt b/mindspore/lite/CMakeLists.txt index bf1176b4ad0..8409e6c7c28 100644 --- a/mindspore/lite/CMakeLists.txt +++ b/mindspore/lite/CMakeLists.txt @@ -78,8 +78,6 @@ if (NOT PLATFORM_ARM64 AND NOT PLATFORM_ARM32) set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,relro,-z,now -Wl,-z,noexecstack ${CMAKE_SHARED_LINKER_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,relro,-z,now -Wl,-z,noexecstack ${CMAKE_EXE_LINKER_FLAGS}") string(REPLACE " -g " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") endif () endif () diff --git a/mindspore/lite/nnacl/CMakeLists.txt b/mindspore/lite/nnacl/CMakeLists.txt index 6b3eb33a246..675393d9a71 100644 --- a/mindspore/lite/nnacl/CMakeLists.txt +++ b/mindspore/lite/nnacl/CMakeLists.txt @@ -2,42 +2,6 @@ project(nnacl) set(NNACL_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) -set(SRC_DIR ${TOP_DIR}/src) -set(LITE_SRC - ${SRC_DIR}/common/graph_util.cc - ${SRC_DIR}/common/ms_tensor_utils.cc - ${SRC_DIR}/runtime/allocator.cc - ${SRC_DIR}/runtime/runtime_api.cc - ${SRC_DIR}/runtime/thread_pool.cc - ${SRC_DIR}/runtime/workspace_pool.cc - ${SRC_DIR}/ir/tensor.cc - ${SRC_DIR}/context.cc - ${SRC_DIR}/executor.cc - ${SRC_DIR}/kernel_registry.cc - ${SRC_DIR}/lite_kernel.cc - ${SRC_DIR}/populate_parameter.cc - ${SRC_DIR}/scheduler.cc - ${SRC_DIR}/lite_session.cc - ${SRC_DIR}/model.cc - ) - -if (SUPPORT_GPU) - set(LITE_SRC - ${LITE_SRC} - ${SRC_DIR}/runtime/kernel/opencl/subgraph_opencl_kernel.cc - ${SRC_DIR}/runtime/kernel/opencl/utils.cc - ${SRC_DIR}/runtime/opencl/opencl_executor.cc - ${SRC_DIR}/runtime/opencl/opencl_allocator.cc - ${SRC_DIR}/runtime/opencl/opencl_runtime.cc - ${SRC_DIR}/runtime/opencl/opencl_wrapper.cc - ) -endif () - -set(ANF_SRC - ${ANF_SRC} - ${SRC_DIR}/ir/meta_tensor_extends.cc - ) -file(GLOB_RECURSE C_OPS_SRC ${SRC_DIR}/ops/*.cc) include_directories(NNACL_DIR) ########################### optimized files ########################### @@ -61,11 +25,11 @@ if (PLATFORM_ARM64) string(REPLACE "-fvisibility=hidden" "-fvisibility=default" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8.2-a+dotprod+fp16") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8.2-a+dotprod+fp16") - add_library(optimize SHARED ${OPTIMIZED_OPS} ${LITE_SRC} ${ANF_SRC} ${C_OPS_SRC}) - add_library(cpu_kernel STATIC $) - target_link_libraries(optimize cpu_kernel) - find_library(log-lib log) - target_link_libraries(optimize ${log-lib}) + add_library(optimize SHARED ${OPTIMIZED_OPS}) + target_link_libraries( + optimize + mindspore-lite + ) set_target_properties(optimize PROPERTIES CLEAN_DIRECT_OUTPUT 1) add_custom_command(TARGET optimize POST_BUILD