From 634bfeab09c86458ce377720aa1d46d532865284 Mon Sep 17 00:00:00 2001 From: Hu Date: Sun, 5 May 2019 14:41:16 +0800 Subject: [PATCH 01/18] fix cmake for win and mkl --- ci/build_windows.py | 30 ++++++++++++++++++ ci/jenkins/Jenkins_steps.groovy | 42 ++++++++++++++++++++++++ ci/jenkins/Jenkinsfile_windows_cpu | 5 ++- cmake/ChooseBlas.cmake | 16 +++++----- cmake/Modules/FindMKL.cmake | 51 +----------------------------- 5 files changed, 85 insertions(+), 59 deletions(-) diff --git a/ci/build_windows.py b/ci/build_windows.py index e8658995b68e..0e9df272767a 100755 --- a/ci/build_windows.py +++ b/ci/build_windows.py @@ -44,6 +44,8 @@ class BuildFlavour(Enum): WIN_CPU = 'WIN_CPU' WIN_CPU_MKLDNN = 'WIN_CPU_MKLDNN' + WIN_CPU_MKLDNN_MKL = 'WIN_CPU_MKLDNN_MKL' + WIN_CPU_MKL = 'WIN_CPU_MKL' WIN_GPU = 'WIN_GPU' WIN_GPU_MKLDNN = 'WIN_GPU_MKLDNN' @@ -72,8 +74,34 @@ class BuildFlavour(Enum): '-DUSE_LAPACK=1 ' '-DUSE_DIST_KVSTORE=0 ' '-DUSE_MKL_IF_AVAILABLE=1 ' + '-DUSE_MKLDNN=1 ' '-DCMAKE_BUILD_TYPE=Release') + , 'WIN_CPU_MKLDNN_MKL': ('-DUSE_CUDA=0 ' + '-DUSE_CUDNN=0 ' + '-DUSE_NVRTC=0 ' + '-DUSE_OPENCV=1 ' + '-DUSE_OPENMP=1 ' + '-DUSE_PROFILER=1 ' + '-DUSE_BLAS=mkl ' + '-DUSE_LAPACK=1 ' + '-DUSE_DIST_KVSTORE=0 ' + '-DUSE_MKL_IF_AVAILABLE=1 ' + '-DUSE_MKLDNN=1 ' + '-DCMAKE_BUILD_TYPE=Release') + + , 'WIN_CPU_MKL': ('-DUSE_CUDA=0 ' + '-DUSE_CUDNN=0 ' + '-DUSE_NVRTC=0 ' + '-DUSE_OPENCV=1 ' + '-DUSE_OPENMP=1 ' + '-DUSE_PROFILER=1 ' + '-DUSE_BLAS=mkl ' + '-DUSE_LAPACK=1 ' + '-DUSE_DIST_KVSTORE=0 ' + '-DUSE_MKL_IF_AVAILABLE=1 ' + '-DUSE_MKLDNN=0 ' + '-DCMAKE_BUILD_TYPE=Release') , 'WIN_GPU': ('-DUSE_CUDA=1 ' '-DUSE_CUDNN=1 ' '-DUSE_NVRTC=1 ' @@ -218,6 +246,8 @@ def main(): os.environ["OpenCV_DIR"] = "C:\\Program Files\\OpenCV-v3.4.1\\build" if 'CUDA_PATH' not in os.environ: os.environ["CUDA_PATH"] = "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v9.2" + if 'MKL_ROOT' not in os.environ: + os.environ["MKL_ROOT"] = "C:\\Program Files \(x86\)\\IntelSWTools\\compilers_and_libraries\\windows\\mkl" windows_build(args) elif system == 'Linux' or system == 'Darwin': diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index 1352e92c785f..b92ffe93c17b 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -515,6 +515,48 @@ def compile_windows_cpu() { }] } +def compile_windows_cpu_mkldnn() { + return ['Build CPU MKLDNN windows':{ + node(NODE_WINDOWS_CPU) { + ws('workspace/build-cpu-mkldnn') { + timeout(time: max_time, unit: 'MINUTES') { + utils.init_git_win() + powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKLDNN' + stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkldnn' + } + } + } + }] +} + +def compile_windows_cpu_mkldnn_mkl() { + return ['Build CPU MKLDNN MKL windows':{ + node(NODE_WINDOWS_CPU) { + ws('workspace/build-cpu-mkldnn-mkl') { + timeout(time: max_time, unit: 'MINUTES') { + utils.init_git_win() + powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKLDNN_MKL' + stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkldnn_mkl' + } + } + } + }] +} + +def compile_windows_cpu_mkl() { + return ['Build CPU NOMKLDNN MKL windows':{ + node(NODE_WINDOWS_CPU) { + ws('workspace/build-cpu-nomkldnn-mkl') { + timeout(time: max_time, unit: 'MINUTES') { + utils.init_git_win() + powershell 'py -3 ci/build_windows.py -f WIN_CPU_NOMKLDNN_MKL' + stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkl' + } + } + } + }] +} + def compile_windows_gpu() { return ['Build GPU windows':{ node(NODE_WINDOWS_CPU) { diff --git a/ci/jenkins/Jenkinsfile_windows_cpu b/ci/jenkins/Jenkinsfile_windows_cpu index 5bc40d625930..4475796771d1 100644 --- a/ci/jenkins/Jenkinsfile_windows_cpu +++ b/ci/jenkins/Jenkinsfile_windows_cpu @@ -34,7 +34,10 @@ utils.assign_node_labels(utility: 'utility', windows_cpu: 'mxnetwindows-cpu') utils.main_wrapper( core_logic: { utils.parallel_stage('Build', [ - custom_steps.compile_windows_cpu() + custom_steps.compile_windows_cpu(), + custom_steps.compile_windows_cpu_mkldnn(), + custom_steps.compile_windows_cpu_mkldnn_mkl(), + custom_steps.compile_windows_cpu_mkl() ]) utils.parallel_stage('Tests', [ diff --git a/cmake/ChooseBlas.cmake b/cmake/ChooseBlas.cmake index 5f4af2d89c91..e16594794ae8 100644 --- a/cmake/ChooseBlas.cmake +++ b/cmake/ChooseBlas.cmake @@ -18,14 +18,14 @@ set(BLAS "Open" CACHE STRING "Selected BLAS library") set_property(CACHE BLAS PROPERTY STRINGS "Atlas;Open;MKL") -if(USE_MKL_IF_AVAILABLE) - if(NOT MKL_FOUND) - find_package(MKL) - endif() - if(MKL_FOUND) - if(USE_MKLDNN) - set(BLAS "open") - else() +if(DEFINED USE_BLAS) + set(BLAS "${USE_BLAS}") +else() + if(USE_MKL_IF_AVAILABLE) + if(NOT MKL_FOUND) + find_package(MKL) + endif() + if(MKL_FOUND) set(BLAS "MKL") endif() endif() diff --git a/cmake/Modules/FindMKL.cmake b/cmake/Modules/FindMKL.cmake index 70405566d8ae..51fca23c1161 100644 --- a/cmake/Modules/FindMKL.cmake +++ b/cmake/Modules/FindMKL.cmake @@ -43,55 +43,6 @@ endif() # ---[ Root folders set(INTEL_ROOT "/opt/intel" CACHE PATH "Folder contains intel libs") -if(USE_MKLDNN) - - find_path(MKL_ROOT include/mkl_blas.h - PATHS $ENV{MKL_ROOT} - ${INTEL_ROOT}/mklml - ${DIRECT_DEPENDENCY_ROOTS} - DOC "Folder contains MKL" - ) - - # ---[ Find include dir - find_path(MKL_INCLUDE_DIR mkl_blas.h PATHS ${MKL_ROOT} PATH_SUFFIXES include) - set(__looked_for MKL_INCLUDE_DIR) - - # ---[ Find libraries - if(CMAKE_SIZEOF_VOID_P EQUAL 4) - set(__path_suffixes lib lib/ia32) - else() - set(__path_suffixes lib lib/intel64) - endif() - - set(__mkl_libs "") - - if(WIN32) - list(APPEND __mkl_libs mklml_intel) - else() - list(APPEND __mkl_libs mklml_gnu) - endif() - list(APPEND __mkl_libs mkldnn) - - foreach (__lib ${__mkl_libs}) - set(__mkl_lib "${__lib}") - string(TOUPPER ${__mkl_lib} __mkl_lib_upper) - - if(MKL_USE_STATIC_LIBS) - set(__mkl_lib "lib${__mkl_lib}.a") - endif() - - find_library(${__mkl_lib_upper}_LIBRARY - NAMES ${__mkl_lib} - PATHS ${MKL_ROOT} "${MKL_INCLUDE_DIR}/.." - PATH_SUFFIXES ${__path_suffixes} - DOC "The path to Intel(R) MKL ${__mkl_lib} library") - mark_as_advanced(${__mkl_lib_upper}_LIBRARY) - - list(APPEND __looked_for ${__mkl_lib_upper}_LIBRARY) - list(APPEND MKL_LIBRARIES ${${__mkl_lib_upper}_LIBRARY}) - endforeach() - -else(USE_MKLDNN) # ---[ Options mxnet_option(MKL_USE_SINGLE_DYNAMIC_LIBRARY "Use single dynamic library interface" ON) @@ -193,7 +144,7 @@ else(USE_MKLDNN) list(APPEND MKL_LIBRARIES ${MKL_RTL_LIBRARY}) endif() -endif(USE_MKLDNN) + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(MKL DEFAULT_MSG ${__looked_for}) From 2f8adc01da3fc4aad99c8d89a803dbe4f0e45e9c Mon Sep 17 00:00:00 2001 From: yinghu5 Date: Sun, 5 May 2019 21:36:51 +0800 Subject: [PATCH 02/18] Update build_windows.py update MKL_ROOT --- ci/build_windows.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build_windows.py b/ci/build_windows.py index 0e9df272767a..143d2cea42b6 100755 --- a/ci/build_windows.py +++ b/ci/build_windows.py @@ -247,7 +247,7 @@ def main(): if 'CUDA_PATH' not in os.environ: os.environ["CUDA_PATH"] = "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v9.2" if 'MKL_ROOT' not in os.environ: - os.environ["MKL_ROOT"] = "C:\\Program Files \(x86\)\\IntelSWTools\\compilers_and_libraries\\windows\\mkl" + os.environ["MKL_ROOT"] = "C:\Program Files (x86)\IntelSWTools\compilers_and_libraries\windows\mkl" windows_build(args) elif system == 'Linux' or system == 'Darwin': From 90eb7236976da96e9b288a0d6bb75ea493636894 Mon Sep 17 00:00:00 2001 From: yinghu5 Date: Wed, 8 May 2019 16:12:32 +0800 Subject: [PATCH 03/18] Update Jenkins_steps.groovy fix nomkldnn issue. --- ci/jenkins/Jenkins_steps.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index b92ffe93c17b..067ecc8659df 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -544,12 +544,12 @@ def compile_windows_cpu_mkldnn_mkl() { } def compile_windows_cpu_mkl() { - return ['Build CPU NOMKLDNN MKL windows':{ + return ['Build CPU MKL windows':{ node(NODE_WINDOWS_CPU) { - ws('workspace/build-cpu-nomkldnn-mkl') { + ws('workspace/build-cpu-mkl') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git_win() - powershell 'py -3 ci/build_windows.py -f WIN_CPU_NOMKLDNN_MKL' + powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKL' stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkl' } } From 44ef104880dc652d3871c177ea199ee917a7938a Mon Sep 17 00:00:00 2001 From: yinghu5 Date: Wed, 8 May 2019 16:15:06 +0800 Subject: [PATCH 04/18] Update build_windows.py change MKL_ROOT --- ci/build_windows.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build_windows.py b/ci/build_windows.py index 143d2cea42b6..7ec24395e22e 100755 --- a/ci/build_windows.py +++ b/ci/build_windows.py @@ -247,7 +247,7 @@ def main(): if 'CUDA_PATH' not in os.environ: os.environ["CUDA_PATH"] = "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v9.2" if 'MKL_ROOT' not in os.environ: - os.environ["MKL_ROOT"] = "C:\Program Files (x86)\IntelSWTools\compilers_and_libraries\windows\mkl" + os.environ["MKL_ROOT"] = "C:\\Program Files (x86)\\IntelSWTools\\compilers_and_libraries\\windows\\mkl" windows_build(args) elif system == 'Linux' or system == 'Darwin': From b4c8ddd3804a60be1ef51a47578a4c8275187301 Mon Sep 17 00:00:00 2001 From: Hu Date: Fri, 10 May 2019 15:51:25 +0800 Subject: [PATCH 05/18] msshadow_blas --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index e0ffec11bfd0..6a22aeafe752 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "3rdparty/mshadow"] path = 3rdparty/mshadow - url = https://github.com/dmlc/mshadow.git + url = https://github.com/yinghu5/mshadow.git [submodule "3rdparty/dmlc-core"] path = 3rdparty/dmlc-core url = https://github.com/dmlc/dmlc-core.git From b22ce7d588d23ae30ae75a89512599c26234cb9a Mon Sep 17 00:00:00 2001 From: Hu Date: Fri, 10 May 2019 16:09:36 +0800 Subject: [PATCH 06/18] update mshasow --- 3rdparty/mshadow | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/mshadow b/3rdparty/mshadow index 6e94643bdf1d..66279663326b 160000 --- a/3rdparty/mshadow +++ b/3rdparty/mshadow @@ -1 +1 @@ -Subproject commit 6e94643bdf1d51a505b147f28c358fb71070b8fd +Subproject commit 66279663326be19b162e7f797cc58c43dae54f90 From 5b2a7cbfefb9f97178c4d50c95a2776c46da6a5b Mon Sep 17 00:00:00 2001 From: yinghu5 Date: Sun, 12 May 2019 21:48:04 +0800 Subject: [PATCH 07/18] Update DownloadMKLML.cmake windows md5 --- cmake/DownloadMKLML.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/DownloadMKLML.cmake b/cmake/DownloadMKLML.cmake index 7b0e5ecf7c9c..8de85300e2fc 100644 --- a/cmake/DownloadMKLML.cmake +++ b/cmake/DownloadMKLML.cmake @@ -21,7 +21,7 @@ message(STATUS "Downloading MKLML...") set(MKLDNN_RELEASE v0.18) set(MKLML_RELEASE_FILE_SUFFIX 2019.0.3.20190220) - +#windows MD5 have issue set(MKLML_LNX_MD5 76354b74325cd293aba593d7cbe36b3f) set(MKLML_WIN_MD5 02286cb980f12af610c05e99dbd78755) set(MKLML_MAC_MD5 3b28da686a25a4cf995ca4fc5e30e514) From d9bd487a88f52d8cb1af7953e54e75ad0747c0d3 Mon Sep 17 00:00:00 2001 From: yinghu5 Date: Sun, 12 May 2019 21:48:16 +0800 Subject: [PATCH 08/18] Update DownloadMKLML.cmake windows md5 From 8e6b4ad9b2a68b6f81a045513958250e84faad49 Mon Sep 17 00:00:00 2001 From: yinghu5 Date: Mon, 13 May 2019 11:09:27 +0800 Subject: [PATCH 09/18] Update Jenkins_steps.groovy export MKLROOT --- ci/jenkins/Jenkins_steps.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index 067ecc8659df..3694aa0ac834 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -549,6 +549,7 @@ def compile_windows_cpu_mkl() { ws('workspace/build-cpu-mkl') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git_win() + powershell 'cd %MKL_ROOT%' powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKL' stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkl' } From 4e54ca8e26738468da60a7852d6a02a6335fb438 Mon Sep 17 00:00:00 2001 From: yinghu5 Date: Mon, 13 May 2019 11:16:04 +0800 Subject: [PATCH 10/18] Update Jenkins_steps.groovy powershell 'cd $Env:MKL_ROOT' --- ci/jenkins/Jenkins_steps.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index 3694aa0ac834..b460eb35a519 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -549,7 +549,7 @@ def compile_windows_cpu_mkl() { ws('workspace/build-cpu-mkl') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git_win() - powershell 'cd %MKL_ROOT%' + powershell 'cd $Env:MKL_ROOT' powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKL' stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkl' } From 4247d588981cc7f99b6f87d1d8c86ea2bd8bdb9f Mon Sep 17 00:00:00 2001 From: yinghu5 Date: Wed, 15 May 2019 10:32:32 +0800 Subject: [PATCH 11/18] Update Jenkins_steps.groovy trigger MKL_ROOT test --- ci/jenkins/Jenkins_steps.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index b460eb35a519..4cd2814eb135 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -18,7 +18,7 @@ // under the License. // // This file contains the steps that will be used in the -// Jenkins pipelines +// Jenkins pipelines utils = load('ci/Jenkinsfile_utils.groovy') From c343e69a4f8ea67d421d2eb8f0d7960717deeb84 Mon Sep 17 00:00:00 2001 From: yinghu5 Date: Wed, 15 May 2019 11:39:44 +0800 Subject: [PATCH 12/18] Update Jenkins_steps.groovy test MKL_ROOT line 552 --- ci/jenkins/Jenkins_steps.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index 4cd2814eb135..13ba9f2073a8 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -549,6 +549,7 @@ def compile_windows_cpu_mkl() { ws('workspace/build-cpu-mkl') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git_win() + powershell '$Env:MKL_ROOT="C:\Program Files (x86)\IntelSWTools\compilers_and_libraries\windows\mkl"' powershell 'cd $Env:MKL_ROOT' powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKL' stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkl' From 6cc35d6469321a8ab4c0486d642c2e3ad79b844b Mon Sep 17 00:00:00 2001 From: yinghu5 Date: Wed, 15 May 2019 13:17:51 +0800 Subject: [PATCH 13/18] Update Jenkins_steps.groovy update 538 $Env:MKL_ROOT --- ci/jenkins/Jenkins_steps.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index 13ba9f2073a8..a5af49358a4b 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -535,7 +535,7 @@ def compile_windows_cpu_mkldnn_mkl() { ws('workspace/build-cpu-mkldnn-mkl') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git_win() - powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKLDNN_MKL' + powershell '($Env:MKL_ROOT="C:\Program Files (x86)\IntelSWTools\compilers_and_libraries\windows\mkl") -and (py -3 ci/build_windows.py -f WIN_CPU_MKLDNN_MKL)' stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkldnn_mkl' } } From af5edc313dce324aa32a7fa55e261911d769440d Mon Sep 17 00:00:00 2001 From: Hu Date: Wed, 15 May 2019 15:22:48 +0800 Subject: [PATCH 14/18] update mshadow --- 3rdparty/mshadow | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/mshadow b/3rdparty/mshadow index 66279663326b..1d79ecfdb4c9 160000 --- a/3rdparty/mshadow +++ b/3rdparty/mshadow @@ -1 +1 @@ -Subproject commit 66279663326be19b162e7f797cc58c43dae54f90 +Subproject commit 1d79ecfdb4c9234537e1bf5148f44a1af54501ec From dc414d2d68fe1d988b337c96add4e7cc4750abd1 Mon Sep 17 00:00:00 2001 From: Hu Date: Wed, 15 May 2019 15:26:26 +0800 Subject: [PATCH 15/18] revert gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 6a22aeafe752..e0ffec11bfd0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "3rdparty/mshadow"] path = 3rdparty/mshadow - url = https://github.com/yinghu5/mshadow.git + url = https://github.com/dmlc/mshadow.git [submodule "3rdparty/dmlc-core"] path = 3rdparty/dmlc-core url = https://github.com/dmlc/dmlc-core.git From 33561d90ccd166bb64e9cab495cf907d71dca4a4 Mon Sep 17 00:00:00 2001 From: Hu Date: Wed, 15 May 2019 15:29:47 +0800 Subject: [PATCH 16/18] remove comments --- ci/jenkins/Jenkins_steps.groovy | 2 +- cmake/DownloadMKLML.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index dfe9054248b3..6f0cfeefa634 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -18,7 +18,7 @@ // under the License. // // This file contains the steps that will be used in the -// Jenkins pipelines +// Jenkins pipelines utils = load('ci/Jenkinsfile_utils.groovy') diff --git a/cmake/DownloadMKLML.cmake b/cmake/DownloadMKLML.cmake index 8de85300e2fc..7b0e5ecf7c9c 100644 --- a/cmake/DownloadMKLML.cmake +++ b/cmake/DownloadMKLML.cmake @@ -21,7 +21,7 @@ message(STATUS "Downloading MKLML...") set(MKLDNN_RELEASE v0.18) set(MKLML_RELEASE_FILE_SUFFIX 2019.0.3.20190220) -#windows MD5 have issue + set(MKLML_LNX_MD5 76354b74325cd293aba593d7cbe36b3f) set(MKLML_WIN_MD5 02286cb980f12af610c05e99dbd78755) set(MKLML_MAC_MD5 3b28da686a25a4cf995ca4fc5e30e514) From 29d0bb964774c9d69e469e177293b73c8ea810b9 Mon Sep 17 00:00:00 2001 From: Hu Date: Wed, 15 May 2019 15:41:55 +0800 Subject: [PATCH 17/18] remove test code --- ci/jenkins/Jenkins_steps.groovy | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index 6f0cfeefa634..2ba0057b059c 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -535,8 +535,9 @@ def compile_windows_cpu_mkldnn_mkl() { ws('workspace/build-cpu-mkldnn-mkl') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git_win() - powershell '($Env:MKL_ROOT="C:\Program Files (x86)\IntelSWTools\compilers_and_libraries\windows\mkl") -and (py -3 ci/build_windows.py -f WIN_CPU_MKLDNN_MKL)' - stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkldnn_mkl' + //powershell '($Env:MKL_ROOT="C:\Program Files (x86)\IntelSWTools\compilers_and_libraries\windows\mkl") -and (py -3 ci/build_windows.py -f WIN_CPU_MKLDNN_MKL)' + powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKLDNN_MKL' + stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkldnn_mkl' } } } @@ -550,7 +551,7 @@ def compile_windows_cpu_mkl() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git_win() powershell '$Env:MKL_ROOT="C:\Program Files (x86)\IntelSWTools\compilers_and_libraries\windows\mkl"' - powershell 'cd $Env:MKL_ROOT' + //powershell 'cd $Env:MKL_ROOT' powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKL' stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkl' } From 6bd886d64a1223311e58f96df38ef96d67423f06 Mon Sep 17 00:00:00 2001 From: Hu Date: Thu, 16 May 2019 08:53:40 +0800 Subject: [PATCH 18/18] remove test powershell --- ci/jenkins/Jenkins_steps.groovy | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index 2ba0057b059c..34784610a7bc 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -535,9 +535,8 @@ def compile_windows_cpu_mkldnn_mkl() { ws('workspace/build-cpu-mkldnn-mkl') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git_win() - //powershell '($Env:MKL_ROOT="C:\Program Files (x86)\IntelSWTools\compilers_and_libraries\windows\mkl") -and (py -3 ci/build_windows.py -f WIN_CPU_MKLDNN_MKL)' powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKLDNN_MKL' - stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkldnn_mkl' + stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkldnn_mkl' } } } @@ -550,8 +549,6 @@ def compile_windows_cpu_mkl() { ws('workspace/build-cpu-mkl') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git_win() - powershell '$Env:MKL_ROOT="C:\Program Files (x86)\IntelSWTools\compilers_and_libraries\windows\mkl"' - //powershell 'cd $Env:MKL_ROOT' powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKL' stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkl' }