Browse Source

feat(cmake): update for enflame cmake compile

GitOrigin-RevId: 3c3c6b3462
tags/v1.3.1
Megvii Engine Team 4 years ago
parent
commit
2fd3fa8834
4 changed files with 9 additions and 2 deletions
  1. +4
    -0
      CMakeLists.txt
  2. +2
    -0
      dnn/src/CMakeLists.txt
  3. +3
    -0
      dnn/test/CMakeLists.txt
  4. +0
    -2
      src/core/include/megbrain/comp_node_env.h

+ 4
- 0
CMakeLists.txt View File

@@ -236,6 +236,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MGE_COMMON_LINKER_
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${MGE_COMMON_LINKER_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MGE_COMMON_LINKER_FLAGS}")


if(NOT MGE_WITH_JIT)
if(MGE_WITH_HALIDE)
message(WARNING "MGE_WITH_HALIDE is set to OFF with MGE_WITH_JIT disabled")
@@ -711,6 +712,9 @@ set(MEGDNN_WITH_ROCM ${MGE_WITH_ROCM})
set(MGB_CAMBRICON ${MGE_WITH_CAMBRICON})
set(MEGDNN_WITH_CAMBRICON ${MGE_WITH_CAMBRICON})

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

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


+ 2
- 0
dnn/src/CMakeLists.txt View File

@@ -108,6 +108,7 @@ if(MGE_WITH_CUDA)
list(APPEND SOURCES ${CUSOURCES})
endif()


if(MGE_WITH_CAMBRICON)
file(GLOB_RECURSE SOURCES_ cambricon/*.cpp)
list(APPEND SOURCES ${SOURCES_})
@@ -150,6 +151,7 @@ if(MGE_WITH_ROCM)
${ROCRAND_LIBRARY_DIR})
endif()


if(${MGE_ARCH} STREQUAL "x86_64" OR ${MGE_ARCH} STREQUAL "i386" OR ${MGE_ARCH} STREQUAL "armv7" OR ${MGE_ARCH} STREQUAL "aarch64")
if(MGE_ENABLE_CPUINFO)
target_link_libraries(megdnn PRIVATE $<BUILD_INTERFACE:cpuinfo>)


+ 3
- 0
dnn/test/CMakeLists.txt View File

@@ -34,6 +34,7 @@ if(MGE_WITH_CAMBRICON)
list(APPEND SOURCES ${SOURCES_})
endif()


if(MGE_WITH_ATLAS)
file(GLOB_RECURSE SOURCES_ atlas/*.cpp)
list(APPEND SOURCES ${SOURCES_})
@@ -45,6 +46,7 @@ if (MGE_WITH_ROCM)
endif()



add_executable(megdnn_test ${SOURCES})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-narrowing")
target_link_libraries(megdnn_test gtest)
@@ -55,6 +57,7 @@ if (MGE_WITH_CUDA)
target_include_directories(megdnn_test PRIVATE ${CUDNN_INCLUDE_DIR})
endif()


target_include_directories(megdnn_test
PRIVATE
${PROJECT_SOURCE_DIR}/third_party/midout/src


+ 0
- 2
src/core/include/megbrain/comp_node_env.h View File

@@ -63,7 +63,6 @@
#endif //MGB_ENABLE_LOGGING
#endif //MGB_CUDA


#if MGB_ATLAS
#include "megcore_atlas.h"
#include <atomic>
@@ -206,7 +205,6 @@ namespace mgb {
#endif



#if MGB_ROCM
[[noreturn]] void _on_hip_error(const char* expr, hipError_t err,
const char* file, const char* func, int line);


Loading…
Cancel
Save