diff --git a/cmake/external_libs/mkl_dnn.cmake b/cmake/external_libs/mkl_dnn.cmake index 072569485743a9ab3b789a0e7258a97048d12a22..302caa848e6274f2b2a6aac19f812f8288082460 100644 --- a/cmake/external_libs/mkl_dnn.cmake +++ b/cmake/external_libs/mkl_dnn.cmake @@ -1,44 +1,44 @@ -set(onednn_CXXFLAGS "-D_FORTIFY_SOURCE=2 -O2") -set(onednn_CFLAGS "-D_FORTIFY_SOURCE=2 -O2") -set(onednn_LDFLAGS "-s") - -if(NOT MINDSPORE_PROJECT_DIR) -set(MINDSPORE_PROJECT_DIR ${CMAKE_SOURCE_DIR}) -endif() - -if(USE_MS_THREADPOOL_FOR_DNNL) - set(USE_MS_THREADPOOL "-DDNNL_CPU_RUNTIME=THREADPOOL") -else() - set(USE_MS_THREADPOOL "") -endif() -if(ENABLE_GITEE_EULER) - set(GIT_REPOSITORY "git@gitee.com:src-openeuler/onednn.git") - set(GIT_TAG "0d726f1") - set(SHA256 "4d655c0751ee6439584ef5e3d465953fe0c2f4ee2700bc02699bdc1d1572af0d") - __download_pkg_with_git(ONEDNN ${GIT_REPOSITORY} ${GIT_TAG} ${SHA256}) - set(ONE_DNN_SRC "${CMAKE_BINARY_DIR}/_deps/onednn-src") - execute_process(COMMAND tar -xf ${ONE_DNN_SRC}/v2.2.tar.gz --strip-components 1 -C ${ONE_DNN_SRC}) -endif() - -if(ENABLE_GITEE) - set(REQ_URL "https://gitee.com/mirrors/MKL-DNN/repository/archive/v2.2.tar.gz") - set(SHA256 "2e809b11727af9d10784a5481b445a14387297161b5cc7f9c969c57fe40752bc") -else() - set(REQ_URL "https://github.com/oneapi-src/oneDNN/archive/v2.2.tar.gz") - set(SHA256 "4d655c0751ee6439584ef5e3d465953fe0c2f4ee2700bc02699bdc1d1572af0d") -endif() -mindspore_add_pkg(onednn - VER 2.2 - LIBS dnnl mkldnn - URL ${REQ_URL} - SHA256 ${SHA256} - PATCHES ${MINDSPORE_PROJECT_DIR}/third_party/patch/onednn/0001-fix-user-threadpool-bug.patch - PATCHES ${MINDSPORE_PROJECT_DIR}/third_party/patch/onednn/0002-fix-pool-nthr-bug.patch - PATCHES ${MINDSPORE_PROJECT_DIR}/third_party/patch/onednn/0003-fix-zero-threads-identified-on-AMD.patch - PATCHES ${MINDSPORE_PROJECT_DIR}/third_party/patch/onednn/0004-fix-dnnl-limits.patch - CMAKE_OPTION -DDNNL_ARCH_OPT_FLAGS='' -DDNNL_BUILD_EXAMPLES=OFF -DDNNL_BUILD_TESTS=OFF - ${USE_MS_THREADPOOL} -DDNNL_ENABLE_CONCURRENT_EXEC=ON) - -include_directories(${onednn_INC}) -add_library(mindspore::dnnl ALIAS onednn::dnnl) -add_library(mindspore::mkldnn ALIAS onednn::mkldnn) +#set(onednn_CXXFLAGS "-D_FORTIFY_SOURCE=2 -O2") +#set(onednn_CFLAGS "-D_FORTIFY_SOURCE=2 -O2") +#set(onednn_LDFLAGS "-s") +# +#if(NOT MINDSPORE_PROJECT_DIR) +#set(MINDSPORE_PROJECT_DIR ${CMAKE_SOURCE_DIR}) +#endif() +# +#if(USE_MS_THREADPOOL_FOR_DNNL) +# set(USE_MS_THREADPOOL "-DDNNL_CPU_RUNTIME=THREADPOOL") +#else() +# set(USE_MS_THREADPOOL "") +#endif() +#if(ENABLE_GITEE_EULER) +# set(GIT_REPOSITORY "git@gitee.com:src-openeuler/onednn.git") +# set(GIT_TAG "0d726f1") +# set(SHA256 "4d655c0751ee6439584ef5e3d465953fe0c2f4ee2700bc02699bdc1d1572af0d") +# __download_pkg_with_git(ONEDNN ${GIT_REPOSITORY} ${GIT_TAG} ${SHA256}) +# set(ONE_DNN_SRC "${CMAKE_BINARY_DIR}/_deps/onednn-src") +# execute_process(COMMAND tar -xf ${ONE_DNN_SRC}/v2.2.tar.gz --strip-components 1 -C ${ONE_DNN_SRC}) +#endif() +# +#if(ENABLE_GITEE) +# set(REQ_URL "https://gitee.com/mirrors/MKL-DNN/repository/archive/v2.2.tar.gz") +# set(SHA256 "2e809b11727af9d10784a5481b445a14387297161b5cc7f9c969c57fe40752bc") +#else() +# set(REQ_URL "https://github.com/oneapi-src/oneDNN/archive/v2.2.tar.gz") +# set(SHA256 "4d655c0751ee6439584ef5e3d465953fe0c2f4ee2700bc02699bdc1d1572af0d") +#endif() +#mindspore_add_pkg(onednn +# VER 2.2 +# LIBS dnnl mkldnn +# URL ${REQ_URL} +# SHA256 ${SHA256} +# PATCHES ${MINDSPORE_PROJECT_DIR}/third_party/patch/onednn/0001-fix-user-threadpool-bug.patch +# PATCHES ${MINDSPORE_PROJECT_DIR}/third_party/patch/onednn/0002-fix-pool-nthr-bug.patch +# PATCHES ${MINDSPORE_PROJECT_DIR}/third_party/patch/onednn/0003-fix-zero-threads-identified-on-AMD.patch +# PATCHES ${MINDSPORE_PROJECT_DIR}/third_party/patch/onednn/0004-fix-dnnl-limits.patch +# CMAKE_OPTION -DDNNL_ARCH_OPT_FLAGS='' -DDNNL_BUILD_EXAMPLES=OFF -DDNNL_BUILD_TESTS=OFF +# ${USE_MS_THREADPOOL} -DDNNL_ENABLE_CONCURRENT_EXEC=ON) +# +#include_directories(${onednn_INC}) +#add_library(mindspore::dnnl ALIAS onednn::dnnl) +#add_library(mindspore::mkldnn ALIAS onednn::mkldnn) diff --git a/cmake/package_lite.cmake b/cmake/package_lite.cmake index ea62255a13325da379465ea216d6dcdf574fbe8e..93f95ac0a78cbecd1163965e2a0e3e40d5df4d47 100644 --- a/cmake/package_lite.cmake +++ b/cmake/package_lite.cmake @@ -867,10 +867,10 @@ else() endif() install(FILES ${glog_LIBPATH}/${glog_name} DESTINATION ${RUNTIME_LIB_DIR} RENAME libmindspore_glog.so.0 COMPONENT ${RUNTIME_COMPONENT_NAME}) - if(MSLITE_DEPS_MKLDNN) - install(FILES ${onednn_LIBPATH}/libdnnl.so.2.2 DESTINATION ${DNNL_DIR} - RENAME libdnnl.so.2 COMPONENT ${RUNTIME_COMPONENT_NAME}) - endif() +# if(MSLITE_DEPS_MKLDNN) +# install(FILES ${onednn_LIBPATH}/libdnnl.so.2.2 DESTINATION ${DNNL_DIR} +# RENAME libdnnl.so.2 COMPONENT ${RUNTIME_COMPONENT_NAME}) +# endif() install(TARGETS mindspore_core mindspore_ops DESTINATION ${RUNTIME_LIB_DIR} COMPONENT ${RUNTIME_COMPONENT_NAME}) install(FILES ${BUILD_DIR}/src/extendrt/convert/libruntime_convert_plugin.so DESTINATION ${RUNTIME_LIB_DIR} COMPONENT ${RUNTIME_COMPONENT_NAME}) diff --git a/mindspore-lite/CMakeLists.txt b/mindspore-lite/CMakeLists.txt index c497ee12a09a0839cfdf1cdab3d2a72e29f94e52..cdc113bd43a1200db9b42c3fa048cc97dad66cd6 100644 --- a/mindspore-lite/CMakeLists.txt +++ b/mindspore-lite/CMakeLists.txt @@ -947,7 +947,7 @@ endif() if(MSLITE_ENABLE_CLOUD_FUSION_INFERENCE OR MSLITE_ENABLE_CLOUD_INFERENCE) if(NOT MSLITE_TARGET_SITEAI) - set(MSLITE_DEPS_MKLDNN on) +# set(MSLITE_DEPS_MKLDNN on) set(MSLITE_DEPS_LIBEVENT on) set(MSLITE_DEPS_PYBIND11 on) endif() diff --git a/mindspore-lite/cmake/ccsrc_module.cmake b/mindspore-lite/cmake/ccsrc_module.cmake index 6283cf57f36c320dbef8169df72d2d7645403025..84522d697c7899afc7147ac9c9055ac9ce30b0a2 100644 --- a/mindspore-lite/cmake/ccsrc_module.cmake +++ b/mindspore-lite/cmake/ccsrc_module.cmake @@ -18,7 +18,7 @@ list(APPEND MINDSPORE_PROTO_LIST ${COMM_PROTO_SRCS}) include(${TOP_DIR}/cmake/external_libs/robin.cmake) include(${TOP_DIR}/cmake/external_libs/eigen.cmake) -include(${TOP_DIR}/cmake/external_libs/mkl_dnn.cmake) +#include(${TOP_DIR}/cmake/external_libs/mkl_dnn.cmake) find_package(Python3 COMPONENTS Interpreter Development) if(Python3_FOUND) diff --git a/mindspore-lite/cmake/lite_dependences.cmake b/mindspore-lite/cmake/lite_dependences.cmake index 295a51cd781fd3234c2722e2f967b45e80cc3cb8..4b03137246e8f8c495925194c3b09c1dff8f339d 100644 --- a/mindspore-lite/cmake/lite_dependences.cmake +++ b/mindspore-lite/cmake/lite_dependences.cmake @@ -39,15 +39,15 @@ if(MSLITE_DEPS_FAST_TRANSFORMERS) include(${TOP_DIR}/cmake/external_libs/fast_transformers.cmake) endif() -if(MSLITE_DEPS_MKLDNN) - if(CMAKE_SYSTEM_NAME MATCHES "Linux") - set(USE_MS_THREADPOOL_FOR_DNNL ON) - endif() - if(USE_MS_THREADPOOL_FOR_DNNL) - add_compile_definitions(USE_MS_THREADPOOL_FOR_DNNL) - endif() - include(${TOP_DIR}/cmake/external_libs/mkl_dnn.cmake) -endif() +#if(MSLITE_DEPS_MKLDNN) +# if(CMAKE_SYSTEM_NAME MATCHES "Linux") +# set(USE_MS_THREADPOOL_FOR_DNNL ON) +# endif() +# if(USE_MS_THREADPOOL_FOR_DNNL) +# add_compile_definitions(USE_MS_THREADPOOL_FOR_DNNL) +# endif() +# include(${TOP_DIR}/cmake/external_libs/mkl_dnn.cmake) +#endif() if(MSLITE_DEPS_LIBEVENT) include(${TOP_DIR}/cmake/external_libs/libevent.cmake) diff --git a/mindspore-lite/providers/siteai/CMakeLists.txt b/mindspore-lite/providers/siteai/CMakeLists.txt index dccb9942a6eaa4f05c78935da7b2f6d1fb55a301..d1bf71fe4d2ef78d3046f58164c10ebb07a2d794 100644 --- a/mindspore-lite/providers/siteai/CMakeLists.txt +++ b/mindspore-lite/providers/siteai/CMakeLists.txt @@ -4,7 +4,7 @@ project(SiteAi) ##disable external libs set(MSLITE_DEPS_PYBIND11 on CACHE INTERNAL "setting MSLITE_DEPS_PYBIND11 value") set(MSLITE_DEPS_ROBIN_HOOD_HASHING off CACHE INTERNAL "setting MSLITE_DEPS_ROBIN_HOOD_HASHING value") -set(MSLITE_DEPS_MKLDNN off CACHE INTERNAL "setting MSLITE_DEPS_MKLDNN value") +#set(MSLITE_DEPS_MKLDNN off CACHE INTERNAL "setting MSLITE_DEPS_MKLDNN value") set(MSLITE_DEPS_LIBEVENT off CACHE INTERNAL "setting MSLITE_DEPS_LIBEVENT value") set(MSLITE_DEPS_OPENSSL off CACHE INTERNAL "setting MSLITE_DEPS_OPENSSL value") set(MSLITE_DEPS_CMSIS off CACHE INTERNAL "setting MSLITE_DEPS_CMSIS value") diff --git a/mindspore-lite/src/extendrt/CMakeLists.txt b/mindspore-lite/src/extendrt/CMakeLists.txt index 72c54233b1d2d810f99850b8b64bc4daabc43aec..612673f6de03362d80c43bdb87dea7bc26ee7fb6 100644 --- a/mindspore-lite/src/extendrt/CMakeLists.txt +++ b/mindspore-lite/src/extendrt/CMakeLists.txt @@ -177,21 +177,21 @@ if(MSLITE_ENABLE_CLOUD_FUSION_INFERENCE OR MSLITE_ENABLE_CLOUD_INFERENCE) mindspore-lite-proto) target_link_libraries(mindspore-extendrt_static _mindspore_cpu_kernel_mod_depend_obj mindspore-lite-proto) - if(MSLITE_DEPS_MKLDNN) - add_dependencies(mindspore-extendrt mindspore::dnnl) - target_link_libraries(mindspore-extendrt mindspore::dnnl) - add_dependencies(mindspore-extendrt_static mindspore::dnnl) - target_link_libraries(mindspore-extendrt_static mindspore::dnnl) - endif() - - if(MSLITE_DEPS_MKLDNN) - set(CPU_KERNEL_OBJECT_COUNT 0) - add_subdirectory(${OPS_DIR}/kernel/cpu lite_kernel_mod) - foreach(number RANGE 1 ${CPU_KERNEL_OBJECT_COUNT}) - target_link_libraries(mindspore-extendrt _mindspore_ops_cpu_kernel_obj) - target_link_libraries(mindspore-extendrt_static _mindspore_ops_cpu_kernel_obj) - endforeach() - endif() +# if(MSLITE_DEPS_MKLDNN) +# add_dependencies(mindspore-extendrt mindspore::dnnl) +# target_link_libraries(mindspore-extendrt mindspore::dnnl) +# add_dependencies(mindspore-extendrt_static mindspore::dnnl) +# target_link_libraries(mindspore-extendrt_static mindspore::dnnl) +# endif() + +# if(MSLITE_DEPS_MKLDNN) +# set(CPU_KERNEL_OBJECT_COUNT 0) +# add_subdirectory(${OPS_DIR}/kernel/cpu lite_kernel_mod) +# foreach(number RANGE 1 ${CPU_KERNEL_OBJECT_COUNT}) +# target_link_libraries(mindspore-extendrt _mindspore_ops_cpu_kernel_obj) +# target_link_libraries(mindspore-extendrt_static _mindspore_ops_cpu_kernel_obj) +# endforeach() +# endif() endif()