提交 2fd3fa88 编写于 作者: M Megvii Engine Team

feat(cmake): update for enflame cmake compile

GitOrigin-RevId: 3c3c6b3462da5bcc1116a3416d3ae6b4f2cfd1f6
上级 9f2af209
...@@ -236,6 +236,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MGE_COMMON_LINKER_ ...@@ -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_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${MGE_COMMON_LINKER_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_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(NOT MGE_WITH_JIT)
if(MGE_WITH_HALIDE) if(MGE_WITH_HALIDE)
message(WARNING "MGE_WITH_HALIDE is set to OFF with MGE_WITH_JIT disabled") 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}) ...@@ -711,6 +712,9 @@ set(MEGDNN_WITH_ROCM ${MGE_WITH_ROCM})
set(MGB_CAMBRICON ${MGE_WITH_CAMBRICON}) set(MGB_CAMBRICON ${MGE_WITH_CAMBRICON})
set(MEGDNN_WITH_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 # Debug info
if(${CMAKE_BUILD_TYPE} STREQUAL "Debug" OR ${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo") if(${CMAKE_BUILD_TYPE} STREQUAL "Debug" OR ${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
......
...@@ -108,6 +108,7 @@ if(MGE_WITH_CUDA) ...@@ -108,6 +108,7 @@ if(MGE_WITH_CUDA)
list(APPEND SOURCES ${CUSOURCES}) list(APPEND SOURCES ${CUSOURCES})
endif() endif()
if(MGE_WITH_CAMBRICON) if(MGE_WITH_CAMBRICON)
file(GLOB_RECURSE SOURCES_ cambricon/*.cpp) file(GLOB_RECURSE SOURCES_ cambricon/*.cpp)
list(APPEND SOURCES ${SOURCES_}) list(APPEND SOURCES ${SOURCES_})
...@@ -150,6 +151,7 @@ if(MGE_WITH_ROCM) ...@@ -150,6 +151,7 @@ if(MGE_WITH_ROCM)
${ROCRAND_LIBRARY_DIR}) ${ROCRAND_LIBRARY_DIR})
endif() endif()
if(${MGE_ARCH} STREQUAL "x86_64" OR ${MGE_ARCH} STREQUAL "i386" OR ${MGE_ARCH} STREQUAL "armv7" OR ${MGE_ARCH} STREQUAL "aarch64") 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) if(MGE_ENABLE_CPUINFO)
target_link_libraries(megdnn PRIVATE $<BUILD_INTERFACE:cpuinfo>) target_link_libraries(megdnn PRIVATE $<BUILD_INTERFACE:cpuinfo>)
......
...@@ -34,6 +34,7 @@ if(MGE_WITH_CAMBRICON) ...@@ -34,6 +34,7 @@ if(MGE_WITH_CAMBRICON)
list(APPEND SOURCES ${SOURCES_}) list(APPEND SOURCES ${SOURCES_})
endif() endif()
if(MGE_WITH_ATLAS) if(MGE_WITH_ATLAS)
file(GLOB_RECURSE SOURCES_ atlas/*.cpp) file(GLOB_RECURSE SOURCES_ atlas/*.cpp)
list(APPEND SOURCES ${SOURCES_}) list(APPEND SOURCES ${SOURCES_})
...@@ -45,6 +46,7 @@ if (MGE_WITH_ROCM) ...@@ -45,6 +46,7 @@ if (MGE_WITH_ROCM)
endif() endif()
add_executable(megdnn_test ${SOURCES}) add_executable(megdnn_test ${SOURCES})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-narrowing") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-narrowing")
target_link_libraries(megdnn_test gtest) target_link_libraries(megdnn_test gtest)
...@@ -55,6 +57,7 @@ if (MGE_WITH_CUDA) ...@@ -55,6 +57,7 @@ if (MGE_WITH_CUDA)
target_include_directories(megdnn_test PRIVATE ${CUDNN_INCLUDE_DIR}) target_include_directories(megdnn_test PRIVATE ${CUDNN_INCLUDE_DIR})
endif() endif()
target_include_directories(megdnn_test target_include_directories(megdnn_test
PRIVATE PRIVATE
${PROJECT_SOURCE_DIR}/third_party/midout/src ${PROJECT_SOURCE_DIR}/third_party/midout/src
......
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
#endif //MGB_ENABLE_LOGGING #endif //MGB_ENABLE_LOGGING
#endif //MGB_CUDA #endif //MGB_CUDA
#if MGB_ATLAS #if MGB_ATLAS
#include "megcore_atlas.h" #include "megcore_atlas.h"
#include <atomic> #include <atomic>
...@@ -206,7 +205,6 @@ namespace mgb { ...@@ -206,7 +205,6 @@ namespace mgb {
#endif #endif
#if MGB_ROCM #if MGB_ROCM
[[noreturn]] void _on_hip_error(const char* expr, hipError_t err, [[noreturn]] void _on_hip_error(const char* expr, hipError_t err,
const char* file, const char* func, int line); const char* file, const char* func, int line);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册