From 1ea1c239b5918ca7277e90d9adf7f1c28923e246 Mon Sep 17 00:00:00 2001 From: chengyuanwang Date: Wed, 10 Mar 2021 17:36:25 +0800 Subject: [PATCH] fix arm64/arm32 packet for mindspore/codegen --- mindspore/lite/micro/CMakeLists.txt | 50 +++++++++++++---------- mindspore/lite/micro/coder/CMakeLists.txt | 4 +- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/mindspore/lite/micro/CMakeLists.txt b/mindspore/lite/micro/CMakeLists.txt index 25b9be4c91..a84a331107 100644 --- a/mindspore/lite/micro/CMakeLists.txt +++ b/mindspore/lite/micro/CMakeLists.txt @@ -2,31 +2,42 @@ cmake_minimum_required(VERSION 3.14) project(micro) option(BUILD_TESTCASES "if build testcase" on) +option(PLATFORM_ARM32 "build operator for android arm 32" off) +option(PLATFORM_ARM64 "build operator for android arm 64" off) option(ENABLE_CONVERTER "turn it on to compile codegen" on) string(REPLACE "/mindspore/lite/micro" "" TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -set(CMAKE_CXX_STANDARD 17) + include_directories(${CMAKE_BINARY_DIR}) include(${TOP_DIR}/cmake/utils.cmake) include(${TOP_DIR}/cmake/dependency_utils.cmake) include(${TOP_DIR}/cmake/dependency_securec.cmake) -include(${TOP_DIR}/cmake/external_libs/glog.cmake) -include(${TOP_DIR}/cmake/external_libs/flatbuffers.cmake) +if(NOT PLATFORM_ARM64 AND NOT PLATFORM_ARM32) + include(${TOP_DIR}/cmake/external_libs/glog.cmake) + + include(${TOP_DIR}/cmake/external_libs/flatbuffers.cmake) + set(FBS_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/../schema/model.fbs + ${CMAKE_CURRENT_SOURCE_DIR}/../schema/ops.fbs + ${CMAKE_CURRENT_SOURCE_DIR}/../schema/model_v0.fbs + ${CMAKE_CURRENT_SOURCE_DIR}/../schema/ops_v0.fbs + ) + ms_build_flatbuffers_lite(FBS_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/../schema/ + fbs_src + ${CMAKE_BINARY_DIR}/schema + "" + ) + ms_build_flatbuffers_lite(FBS_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/../schema/ + fbs_inner_src + ${CMAKE_BINARY_DIR}/schema/inner + "inner" + ) +endif() -file(GLOB FBS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../schema/*.fbs) -ms_build_flatbuffers_lite(FBS_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/../schema/ - fbs_src - ${CMAKE_BINARY_DIR}/schema - "" - ) -ms_build_flatbuffers_lite(FBS_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/../schema/ - fbs_inner_src - ${CMAKE_BINARY_DIR}/schema/inner - "inner" - ) +set(CMAKE_CXX_STANDARD 17) if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") MESSAGE("******Micro Debug********") set(CMAKE_C_FLAGS "-Wall -Werror -ftrapv -DDebug -g -fvisibility=default ${CMAKE_C_FLAGS}") @@ -39,12 +50,7 @@ else() -fstack-protector-all -Wno-attributes -Wno-deprecated-declarations \ -Wno-missing-braces -Wno-overloaded-virtual ${CMAKE_CXX_FLAGS}") endif() -if(ENABLE_ASAN) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize-recover=address -lasan") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fsanitize-recover=address -lasan") -endif() - add_subdirectory(coder) -if(BUILD_TESTCASES) +if(BUILD_TESTCASES AND NOT PLATFORM_ARM64 AND NOT PLATFORM_ARM32) add_subdirectory(test) endif() diff --git a/mindspore/lite/micro/coder/CMakeLists.txt b/mindspore/lite/micro/coder/CMakeLists.txt index 75ff29ae51..9941db3803 100644 --- a/mindspore/lite/micro/coder/CMakeLists.txt +++ b/mindspore/lite/micro/coder/CMakeLists.txt @@ -1,4 +1,6 @@ -add_definitions(-DUSE_GLOG) +if(NOT PLATFORM_ARM64 AND NOT PLATFORM_ARM32) + add_definitions(-DUSE_GLOG) +endif() set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections ") set(3RD_DIR ${TOP_DIR}/third_party)