Browse Source

!151 updata mkl-dnn link and md5

Merge pull request !151 from dengwentao/mkldnn_cmake
tags/v0.2.0-alpha
mindspore-ci-bot Gitee 5 years ago
parent
commit
fe4c815d1c
4 changed files with 13 additions and 11 deletions
  1. +1
    -1
      Third_Party_Open_Source_Software_Notice
  2. +9
    -9
      cmake/external_libs/mkl_dnn.cmake
  3. +2
    -0
      cmake/utils.cmake
  4. +1
    -1
      mindspore/ccsrc/CMakeLists.txt

+ 1
- 1
Third_Party_Open_Source_Software_Notice View File

@@ -368,7 +368,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.


Software: MKL-DNN 1.1.2
Software: oneDNN 1.1.2
Copyright (c) 2009-2018 The MathJax Consortium
Copyright 2018 Intel Corporation
Copyright 2019 Intel Corporation


+ 9
- 9
cmake/external_libs/mkl_dnn.cmake View File

@@ -1,11 +1,11 @@
set(mkl_dnn_CXXFLAGS "-D_FORTIFY_SOURCE=2 -O2")
set(mkl_dnn_CFLAGS "-D_FORTIFY_SOURCE=2 -O2")
mindspore_add_pkg(mkl_dnn
VER 1.1.1
set(onednn_CXXFLAGS "-D_FORTIFY_SOURCE=2 -O2")
set(onednn_CFLAGS "-D_FORTIFY_SOURCE=2 -O2")
mindspore_add_pkg(onednn
VER 1.1.2
LIBS dnnl mkldnn
URL https://github.com/intel/mkl-dnn/archive/v1.1.1.tar.gz
MD5 d6a422b00459600bdc22242590953f38
URL https://github.com/oneapi-src/oneDNN/archive/v1.1.2.tar.gz
MD5 ab40d52230f3ad1d7a6f06ce0f6bc17a
CMAKE_OPTION -DDNNL_ARCH_OPT_FLAGS='' -DDNNL_CPU_RUNTIME='SEQ' -DDNNL_BUILD_EXAMPLES=OFF -DDNNL_BUILD_TESTS=OFF)
include_directories(${mkl_dnn_INC})
add_library(mindspore::dnnl ALIAS mkl_dnn::dnnl)
add_library(mindspore::mkldnn ALIAS mkl_dnn::mkldnn)
include_directories(${onednn_INC})
add_library(mindspore::dnnl ALIAS onednn::dnnl)
add_library(mindspore::mkldnn ALIAS onednn::mkldnn)

+ 2
- 0
cmake/utils.cmake View File

@@ -40,6 +40,8 @@ else()
set(JOBS 8)
if (${JOBS} GREATER ${N})
set(THNUM ${N})
else()
set(THNUM ${JOBS})
endif()
endif ()
message("set make thread num: ${THNUM}")


+ 1
- 1
mindspore/ccsrc/CMakeLists.txt View File

@@ -542,7 +542,7 @@ endif()

if (ENABLE_CPU)
add_custom_target(add_cpu_lib ALL
COMMAND cp ${mkl_dnn_LIBPATH}/libdnnl.so.1.1 ${MS_LIB_PATH}/libdnnl.so.1
COMMAND cp ${onednn_LIBPATH}/libdnnl.so.1.1 ${MS_LIB_PATH}/libdnnl.so.1
)
add_dependencies(add_cpu_lib add_ms_lib)
endif()


Loading…
Cancel
Save