Merge pull request !151 from dengwentao/mkldnn_cmaketags/v0.2.0-alpha
| @@ -368,7 +368,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | |||||
| THE SOFTWARE. | THE SOFTWARE. | ||||
| Software: MKL-DNN 1.1.2 | |||||
| Software: oneDNN 1.1.2 | |||||
| Copyright (c) 2009-2018 The MathJax Consortium | Copyright (c) 2009-2018 The MathJax Consortium | ||||
| Copyright 2018 Intel Corporation | Copyright 2018 Intel Corporation | ||||
| Copyright 2019 Intel Corporation | Copyright 2019 Intel Corporation | ||||
| @@ -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 | 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) | 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) | |||||
| @@ -40,6 +40,8 @@ else() | |||||
| set(JOBS 8) | set(JOBS 8) | ||||
| if (${JOBS} GREATER ${N}) | if (${JOBS} GREATER ${N}) | ||||
| set(THNUM ${N}) | set(THNUM ${N}) | ||||
| else() | |||||
| set(THNUM ${JOBS}) | |||||
| endif() | endif() | ||||
| endif () | endif () | ||||
| message("set make thread num: ${THNUM}") | message("set make thread num: ${THNUM}") | ||||
| @@ -542,7 +542,7 @@ endif() | |||||
| if (ENABLE_CPU) | if (ENABLE_CPU) | ||||
| add_custom_target(add_cpu_lib ALL | 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) | add_dependencies(add_cpu_lib add_ms_lib) | ||||
| endif() | endif() | ||||