Browse Source

fix(mgb/src): fix megbrain cmake unsupport android_nn

GitOrigin-RevId: 037c197912
tags/v1.9.0
Megvii Engine Team 3 years ago
parent
commit
28d48f2f7a
3 changed files with 2 additions and 7 deletions
  1. +1
    -5
      CMakeLists.txt
  2. +0
    -1
      src/CMakeLists.txt
  3. +1
    -1
      src/megbrain_build_config.h.in

+ 1
- 5
CMakeLists.txt View File

@@ -95,6 +95,7 @@ option(MGE_WITH_ROCM "Enable ROCM support" OFF)
option(MGE_WITH_LARGE_ARCHIVE "Enable big archive link support" OFF) option(MGE_WITH_LARGE_ARCHIVE "Enable big archive link support" OFF)
option(MGE_BUILD_WITH_ASAN "Enable build with ASAN, need compiler support" OFF) option(MGE_BUILD_WITH_ASAN "Enable build with ASAN, need compiler support" OFF)
option(MGE_WITH_CUSTOM_OP "Build with Custom op" OFF) option(MGE_WITH_CUSTOM_OP "Build with Custom op" OFF)

if(MSVC OR WIN32) if(MSVC OR WIN32)
# FIXME: static link Windows vc runtime with some version from Visual Studio have some # FIXME: static link Windows vc runtime with some version from Visual Studio have some
# runtime issue at some call PATH, for example: _imperative_rt.pyd --> # runtime issue at some call PATH, for example: _imperative_rt.pyd -->
@@ -1088,11 +1089,6 @@ set(MEGDNN_WITH_ROCM ${MGE_WITH_ROCM})


# CAMBRICON # CAMBRICON
set(MGB_CAMBRICON ${MGE_WITH_CAMBRICON}) set(MGB_CAMBRICON ${MGE_WITH_CAMBRICON})

# ENFLAME
set(MGB_ENFLAME ${MGE_WITH_ENFLAME})
set(MEGDNN_WITH_ENFLAME ${MGE_WITH_ENFLAME})

# Debug info # Debug info
if(${CMAKE_BUILD_TYPE} STREQUAL "Debug" OR ${CMAKE_BUILD_TYPE} STREQUAL if(${CMAKE_BUILD_TYPE} STREQUAL "Debug" OR ${CMAKE_BUILD_TYPE} STREQUAL
"RelWithDebInfo") "RelWithDebInfo")


+ 0
- 1
src/CMakeLists.txt View File

@@ -71,7 +71,6 @@ if(MGE_WITH_CUDA AND MGE_WITH_TRT)
file(GLOB_RECURSE SOURCES_ tensorrt/impl/*.cpp tensorrt/impl/*.inl) file(GLOB_RECURSE SOURCES_ tensorrt/impl/*.cpp tensorrt/impl/*.inl)
list(APPEND SOURCES ${SOURCES_}) list(APPEND SOURCES ${SOURCES_})
endif() endif()

if(MGE_WITH_CAMBRICON) if(MGE_WITH_CAMBRICON)
list(APPEND MGB_INC ${CMAKE_CURRENT_LIST_DIR}/cambricon/include) list(APPEND MGB_INC ${CMAKE_CURRENT_LIST_DIR}/cambricon/include)
file(GLOB_RECURSE SOURCES_ cambricon/impl/*.cpp cambricon/impl/*.inl) file(GLOB_RECURSE SOURCES_ cambricon/impl/*.cpp cambricon/impl/*.inl)


+ 1
- 1
src/megbrain_build_config.h.in View File

@@ -252,7 +252,7 @@


#ifdef WIN32 #ifdef WIN32
#ifdef MGE_DLL_EXPORT #ifdef MGE_DLL_EXPORT
#define MGE_WIN_DECLSPEC_FUC __declspec(dllexport)
#define MGE_WIN_DECLSPEC_FUC __declspec(dllexport)
#define MGE_WIN_DECLSPEC_DATA __declspec(dllexport) #define MGE_WIN_DECLSPEC_DATA __declspec(dllexport)
#elif defined(MGE_WINDOWS_STATIC_LINK) #elif defined(MGE_WINDOWS_STATIC_LINK)
#define MGE_WIN_DECLSPEC_FUC #define MGE_WIN_DECLSPEC_FUC


Loading…
Cancel
Save