[MNN:Sync] Sync internal git

alibaba · Jan 6, 2021 · 2d1b129 · 2d1b129
1 parent 8dfb7bd
commit 2d1b129
Show file tree

Hide file tree

Showing 160 changed files with 10,096 additions and 2,395 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -71,6 +71,7 @@ option(MNN_AAPL_FMWK "Build MNN.framework instead of traditional .a/.dylib" OFF)
 option(MNN_WITH_PLUGIN "Build with plugin op support." OFF)
 option(MNN_BUILD_MINI "Build MNN-MINI that just supports fixed shape models." OFF)
 option(MNN_USE_SSE "Use SSE optimization for x86 if possiable" ON)
+option(MNN_BUILD_CODEGEN "Build with codegen" OFF)
 
 IF(NOT MNN_BUILD_SHARED_LIBS)
   message(WARNING "Close MNN_SEP_BUILD for static library")
@@ -109,10 +110,6 @@ IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT MNN_BUILD_SHARED_LIBS AND NOT (M
   ENDIF()
 ENDIF()
 
-if (MNN_USE_THREAD_POOL)
-    set(MNN_OPENMP OFF)
-    add_definitions(-DMNN_USE_THREAD_POOL)
-endif()
 
 if(MNN_FORBID_MULTI_THREAD)
     add_definitions(-DMNN_FORBIT_MULTI_THREADS)
@@ -141,9 +138,17 @@ option(MNN_OPENCL "Enable OpenCL" OFF)
 option(MNN_OPENGL "Enable OpenGL" OFF)
 option(MNN_VULKAN "Enable Vulkan" OFF)
 option(MNN_ARM82 "Enable ARM82" OFF)
+option(MNN_ONEDNN "Enable oneDNN" OFF)
+option(MNN_AVX512 "Enable AVX512" OFF)
 option(MNN_CUDA "Enable CUDA" OFF)
 option(MNN_TENSORRT "Enable TensorRT" OFF)
 
+if (MNN_USE_THREAD_POOL)
+    message(STATUS "Use Threadpool, forbid openmp")
+    set(MNN_OPENMP OFF)
+    add_definitions(-DMNN_USE_THREAD_POOL)
+endif()
+
 # target options
 option(MNN_BUILD_BENCHMARK "Build benchmark or not" OFF)
 option(MNN_BUILD_TEST "Build tests or not" OFF)
@@ -165,9 +170,11 @@ message(STATUS "\tOpenCL: ${MNN_OPENCL}")
 message(STATUS "\tOpenGL: ${MNN_OPENGL}")
 message(STATUS "\tVulkan: ${MNN_VULKAN}")
 message(STATUS "\tARM82: ${MNN_ARM82}")
+message(STATUS "\toneDNN: ${MNN_ONEDNN}")
 message(STATUS "\tTensorRT: ${MNN_TENSORRT}")
 message(STATUS "\tCUDA: ${MNN_CUDA}")
 message(STATUS "\tOpenMP: ${MNN_OPENMP}")
+message(STATUS "\tThreadPool: ${MNN_USE_THREAD_POOL}")
 message(STATUS "\tHidden: ${MNN_HIDDEN}")
 message(STATUS "\tBuild Path: ${CMAKE_CURRENT_BINARY_DIR}")
 
@@ -274,6 +281,7 @@ include_directories(${CMAKE_CURRENT_LIST_DIR}/include/
                     ${CMAKE_CURRENT_LIST_DIR}/source/
                     ${CMAKE_CURRENT_LIST_DIR}/express/
                     ${CMAKE_CURRENT_LIST_DIR}/tools/
+                    ${CMAKE_CURRENT_LIST_DIR}/codegen/
                     ${CMAKE_CURRENT_LIST_DIR}/schema/current/
                     ${CMAKE_CURRENT_LIST_DIR}/3rd_party/
                     ${CMAKE_CURRENT_LIST_DIR}/3rd_party/flatbuffers/include
@@ -441,6 +449,30 @@ IF(MNN_VULKAN)
   ENDIF()
 ENDIF()
 
+# oneDNN
+IF(MNN_ONEDNN)
+    target_compile_definitions(MNNCPU PRIVATE "-DMNN_USE_ONEDNN")
+    add_dependencies(MNNCPU oneDNN)
+    include(cmake/oneDNN.cmake)
+    set(ONEDNN_DIR ${CMAKE_CURRENT_LIST_DIR}/3rd_party/oneDNN)
+    add_library(ONEDNN_COMMON OBJECT IMPORTED)
+    file(GLOB_RECURSE OBJECT_FILES ${ONEDNN_DIR}/src/common/CMakeFiles/dnnl_common.dir/*.o)
+    set_property(TARGET ONEDNN_COMMON PROPERTY IMPORTED_OBJECTS ${OBJECT_FILES})
+    add_library(ONEDNN_CPU OBJECT IMPORTED)
+    file(GLOB_RECURSE OBJECT_FILES ${ONEDNN_DIR}/src/cpu/CMakeFiles/dnnl_cpu.dir/*.o)
+    set_property(TARGET ONEDNN_CPU PROPERTY IMPORTED_OBJECTS ${OBJECT_FILES})
+    add_library(ONEDNN_CPU_X64 OBJECT IMPORTED)
+    file(GLOB_RECURSE OBJECT_FILES ${ONEDNN_DIR}/src/cpu/x64/CMakeFiles/dnnl_cpu_x64.dir/*.o)
+    set_property(TARGET ONEDNN_CPU_X64 PROPERTY IMPORTED_OBJECTS ${OBJECT_FILES})
+    include_directories(${ONEDNN_DIR}/include)
+    list(APPEND MNN_TARGETS ${ONEDNN_COMMON})
+    list(APPEND MNN_TARGETS ${ONEDNN_CPU})
+    list(APPEND MNN_TARGETS ${ONEDNN_CPU_X64})
+    list(APPEND MNN_OBJECTS_TO_LINK $<TARGET_OBJECTS:ONEDNN_COMMON>)
+    list(APPEND MNN_OBJECTS_TO_LINK $<TARGET_OBJECTS:ONEDNN_CPU>)
+    list(APPEND MNN_OBJECTS_TO_LINK $<TARGET_OBJECTS:ONEDNN_CPU_X64>)
+ENDIF()
+
 # OpenCL
 IF(MNN_OPENCL)
   add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/source/backend/opencl/)
@@ -483,8 +515,32 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64" OR IOS_ARCH STREQUAL "arm64" OR CMA
     list(APPEND MNN_OBJECTS_TO_LINK $<TARGET_OBJECTS:MNN_Arm82>)
   ENDIF()
 ENDIF()
+
 # Express
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/express/)
+IF(MNN_SEP_BUILD)
+  list(APPEND MNN_DEPS MNN_Express)
+ELSE()
+   list(APPEND MNN_TARGETS MNN_Express)
+   list(APPEND MNN_OBJECTS_TO_LINK $<TARGET_OBJECTS:MNN_Express>)
+ENDIF()
+
+# Train
+IF(MNN_BUILD_TRAIN)
+  add_subdirectory(tools/train)
+  IF(MNN_SEP_BUILD)
+    list(APPEND MNN_DEPS MNNTrain)
+  ELSE()
+    list(APPEND MNN_TARGETS MNNTrain)
+    list(APPEND MNN_OBJECTS_TO_LINK $<TARGET_OBJECTS:MNNTrain>)
+  ENDIF()
+ENDIF()
+
+#CodeGen
+IF(MNN_BUILD_CODEGEN)
+    add_definitions(-DMNN_BUILD_CODEGEN)
+    include(${CMAKE_CURRENT_LIST_DIR}/codegen/CMakeLists.txt)
+ENDIF()
 
 # TensorRT
 IF(MNN_TENSORRT)
@@ -497,10 +553,7 @@ ENDIF()
 IF(MNN_SEP_BUILD)
   add_library(MNN SHARED ${CMAKE_CURRENT_LIST_DIR}/cmake/dummy.cpp ${MNN_OBJECTS_TO_LINK} ${MNN_PUB_HDRS} ${MNN_EXPR_PUB_HDRS})
   target_link_libraries(MNN PUBLIC ${MNN_EXTRA_DEPENDS})
-  list(APPEND MNN_DEPS MNN_Express)
 ELSE()
-  list(APPEND MNN_OBJECTS_TO_LINK $<TARGET_OBJECTS:MNNExpress>)
-  list(APPEND MNN_TARGETS MNNExpress)
   IF(MNN_BUILD_SHARED_LIBS)
     add_library(MNN SHARED ${CMAKE_CURRENT_LIST_DIR}/cmake/dummy.cpp ${MNN_OBJECTS_TO_LINK} ${MNN_PUB_HDRS} ${MNN_EXPR_PUB_HDRS})
     if (WIN32)
@@ -519,6 +572,9 @@ ENDIF()
 if (MSVC)
   target_link_options(MNN PRIVATE "/IGNORE:4049,4217")
 endif()
+if (MNN_ONEDNN)
+    add_dependencies(MNN ONEDNN_COMMON ONEDNN_CPU ONEDNN_CPU_X64)
+endif()
 
 if(APPLE)
     IF(MNN_AAPL_FMWK)
@@ -573,9 +629,6 @@ ENDIF()
 IF(MNN_BUILD_TOOLS)
 include(${CMAKE_CURRENT_LIST_DIR}/tools/cpp/CMakeLists.txt)
 ENDIF()
-IF (MNN_BUILD_TRAIN)
-  add_subdirectory(tools/train)
-ENDIF()
 IF(MNN_BUILD_TEST)
 include(${CMAKE_CURRENT_LIST_DIR}/test/CMakeLists.txt)
 ENDIF()

diff --git a/cmake/oneDNN.cmake b/cmake/oneDNN.cmake
@@ -0,0 +1,21 @@
+include(ExternalProject)
+
+set(DOWNLOAD_URL https://github.com/oneapi-src/oneDNN/archive/v1.7.zip)
+set(ROOT ${CMAKE_CURRENT_LIST_DIR}/../3rd_party/)
+set(ONEDNN_DIR ${ROOT}/oneDNN/)
+set(MNN_BUILD_DIR ${CMAKE_CURRENT_LIST_DIR}/../build/)
+
+set(CONFIGURE_CMD cd ${ONEDNN_DIR} && cmake -DCMAKE_INSTALL_PREFIX=${MNN_BUILD_DIR} -DDNNL_BUILD_EXAMPLES=OFF -DDNNL_BUILD_TESTS=OFF -DDNNL_CPU_RUNTIME=SEQ)
+set(BUILD_CMD cd ${ONEDNN_DIR} && make -j8)
+set(INSTALL_CMD cd ${ONEDNN_DIR} && make install)
+
+ExternalProject_Add(oneDNN
+    PREFIX              oneDNN
+    URL                 ${DOWNLOAD_URL}
+    DOWNLOAD_DIR        ${ROOT}
+    SOURCE_DIR          ${ONEDNN_DIR}
+    CONFIGURE_COMMAND   ${CONFIGURE_CMD}
+    BUILD_COMMAND       ${BUILD_CMD}
+    INSTALL_COMMAND     ${INSTALL_CMD}
+)
+
diff --git a/codegen/CMakeLists.txt b/codegen/CMakeLists.txt
@@ -0,0 +1,43 @@
+option(MNN_CODEGEN_LLVM "Build llvm backend for codegen." OFF)
+option(MNN_CODEGEN_C "Build C source backend for codegen." OFF)
+option(MNN_CODEGEN_OPENCL "Build OpenCL source backend for codegen." OFF)
+option(MNN_CODEGEN_JIT "Build jit for codegen." OFF)
+
+
+file(GLOB CODEGEN_HEADER "${CMAKE_CURRENT_LIST_DIR}/*.*")
+file(GLOB CPU_SRCS "${CMAKE_CURRENT_LIST_DIR}/cpu/*.*")
+list(APPEND MNN_CODEGEN_SRCS ${CODEGEN_HEADER})
+
+if(MNN_CODEGEN_OPENCL)
+    add_definitions(-DMNN_CODEGEN_OPENCL)
+    file(GLOB OPENCL_SRCS "${CMAKE_CURRENT_LIST_DIR}/opencl/*.*")
+    list(APPEND MNN_CODEGEN_SRCS ${OPENCL_SRCS})
+endif()
+
+if(MNN_CODEGEN_C)
+    add_definitions(-DMNN_CODEGEN_CPU)
+    add_definitions(-DMNN_CODEGEN_C)
+    file(GLOB C_SRCS "${CMAKE_CURRENT_LIST_DIR}/cpu/c/*.*")
+    list(APPEND MNN_CODEGEN_SRCS ${CPU_SRCS})
+    list(APPEND MNN_CODEGEN_SRCS ${C_SRCS})
+endif()
+
+if(MNN_CODEGEN_LLVM)
+    add_definitions(-DMNN_CODEGEN_CPU)
+    add_definitions(-DMNN_CODEGEN_LLVM)
+    file(GLOB LLVM_SRCS "${CMAKE_CURRENT_LIST_DIR}/cpu/llvm/*.*")
+    list(APPEND MNN_CODEGEN_SRCS ${CPU_SRCS})
+    list(APPEND MNN_CODEGEN_SRCS ${LLVM_SRCS})
+    # add llvm libs
+    find_package(LLVM REQUIRED CONFIG)
+    message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
+    message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
+    include_directories(${LLVM_INCLUDE_DIRS})
+    add_definitions(${LLVM_DEFINITIONS})
+    llvm_map_components_to_libnames(llvm_libs core bitwriter)
+    list(APPEND MNN_EXTRA_DEPENDS ${llvm_libs})
+endif()
+
+add_library(MNNCodegen OBJECT ${MNN_CODEGEN_SRCS})
+set_property(TARGET MNNCodegen PROPERTY CXX_STANDARD 14)
+list(APPEND MNN_OBJECTS_TO_LINK $<TARGET_OBJECTS:MNNCodegen>)