diff --git a/CMakeLists.txt b/CMakeLists.txt index 02d1eb74eae36493b1d04dcd21fc45493e8e2d1c..1c40f24c1b270371fb72090da7d593f1c6e0e4bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/dnn/src/CMakeLists.txt b/dnn/src/CMakeLists.txt index 029f1bf8ed6040e1d23129fc5d798bd076913dd1..25e4cfe1d60685dcc1b4af87d9737c92557c5c68 100644 --- a/dnn/src/CMakeLists.txt +++ b/dnn/src/CMakeLists.txt @@ -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 $) diff --git a/dnn/test/CMakeLists.txt b/dnn/test/CMakeLists.txt index 8cfeef2139e2ea08d9a48a71bcb0940c59f067ad..a681b2ffd9c3bca5afcc10cb0d72859305367c5b 100644 --- a/dnn/test/CMakeLists.txt +++ b/dnn/test/CMakeLists.txt @@ -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 diff --git a/src/core/include/megbrain/comp_node_env.h b/src/core/include/megbrain/comp_node_env.h index a850b6cf5e60859c8e521d94b8391087444e6d35..2d04a1cc03947bdabac800553938e5dfdb2aa42d 100644 --- a/src/core/include/megbrain/comp_node_env.h +++ b/src/core/include/megbrain/comp_node_env.h @@ -63,7 +63,6 @@ #endif //MGB_ENABLE_LOGGING #endif //MGB_CUDA - #if MGB_ATLAS #include "megcore_atlas.h" #include @@ -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);