marcoabreu closed pull request #11459: [MXNET-604] Nightly move of R and
URL: https://github.com/apache/incubator-mxnet/pull/11459
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/Jenkinsfile b/Jenkinsfile
index bff78e3ddc7..dd48bdd3265 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -411,47 +411,6 @@ try {
}
}
},
- 'Build GPU MKLDNN windows':{
- node('mxnetwindows-cpu') {
- timeout(time: max_time, unit: 'MINUTES') {
- ws('workspace/build-gpu') {
- withEnv(['OpenBLAS_HOME=C:\\mxnet\\openblas',
'OpenCV_DIR=C:\\mxnet\\opencv_vc14',
'CUDA_PATH=C:\\CUDA\\v8.0','BUILD_NAME=vc14_gpu_mkldnn']) {
- init_git_win()
- bat """mkdir build_%BUILD_NAME%
- call "C:\\Program Files (x86)\\Microsoft Visual Studio
14.0\\VC\\bin\\x86_amd64\\vcvarsx86_amd64.bat"
- cd build_%BUILD_NAME%
- copy
${env.WORKSPACE}\\3rdparty\\mkldnn\\config_template.vcxproj.user
${env.WORKSPACE}\\config_template.vcxproj.user /y
- cmake -G \"NMake Makefiles JOM\" -DUSE_CUDA=1 -DUSE_CUDNN=1
-DUSE_NVRTC=1 -DUSE_OPENCV=1 -DUSE_OPENMP=1 -DUSE_PROFILER=1 -DUSE_BLAS=open
-DUSE_LAPACK=1 -DUSE_DIST_KVSTORE=0 -DCUDA_ARCH_NAME=All -DUSE_MKLDNN=1
-DCMAKE_CXX_FLAGS_RELEASE="/FS /MD /O2 /Ob2 /DNDEBUG"
-DCMAKE_BUILD_TYPE=Release ${env.WORKSPACE}"""
- bat '''
- call "C:\\Program Files (x86)\\Microsoft Visual Studio
14.0\\VC\\bin\\x86_amd64\\vcvarsx86_amd64.bat"
- cd build_%BUILD_NAME%
- set /a cores=%NUMBER_OF_PROCESSORS% * 2
- jom -j %cores%
- '''
- bat '''rmdir /s/q pkg_%BUILD_NAME%
- mkdir pkg_%BUILD_NAME%\\lib
- mkdir pkg_%BUILD_NAME%\\python
- mkdir pkg_%BUILD_NAME%\\include
- mkdir pkg_%BUILD_NAME%\\build
- copy build_%BUILD_NAME%\\libmxnet.lib pkg_%BUILD_NAME%\\lib
- copy build_%BUILD_NAME%\\libmxnet.dll pkg_%BUILD_NAME%\\build
- copy build_%BUILD_NAME%\\3rdparty\\mkldnn\\src\\mkldnn.dll
pkg_%BUILD_NAME%\\build
- copy build_%BUILD_NAME%\\libiomp5md.dll pkg_%BUILD_NAME%\\build
- copy build_%BUILD_NAME%\\mklml.dll pkg_%BUILD_NAME%\\build
- xcopy python pkg_%BUILD_NAME%\\python /E /I /Y
- xcopy include pkg_%BUILD_NAME%\\include /E /I /Y
- xcopy 3rdparty\\dmlc-core\\include pkg_%BUILD_NAME%\\include /E
/I /Y
- xcopy 3rdparty\\mshadow\\mshadow
pkg_%BUILD_NAME%\\include\\mshadow /E /I /Y
- xcopy 3rdparty\\nnvm\\include pkg_%BUILD_NAME%\\nnvm\\include /E
/I /Y
- del /Q *.7z
- 7z.exe a %BUILD_NAME%.7z pkg_%BUILD_NAME%\\
- '''
- stash includes: 'vc14_gpu_mkldnn.7z', name: 'vc14_gpu_mkldnn'
- }
- }
- }
- }
- },
'NVidia Jetson / ARMv8':{
node('mxnetlinux-cpu') {
ws('workspace/build-jetson-armv8') {
@@ -750,31 +709,6 @@ try {
}
}
},
- 'R: CPU': {
- node('mxnetlinux-cpu') {
- ws('workspace/ut-r-cpu') {
- timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- unpack_lib('cpu')
- docker_run('ubuntu_cpu', 'unittest_ubuntu_cpu_R', false)
- publish_test_coverage()
- }
- }
- }
- },
- 'R: GPU': {
- node('mxnetlinux-gpu') {
- ws('workspace/ut-r-gpu') {
- timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- unpack_lib('gpu')
- docker_run('ubuntu_gpu', 'unittest_ubuntu_gpu_R', true)
- publish_test_coverage()
- }
- }
- }
- },
-
'Python 2: CPU Win':{
node('mxnetwindows-cpu') {
timeout(time: max_time, unit: 'MINUTES') {
@@ -865,29 +799,6 @@ try {
}
}
},
- 'Python 3: MKLDNN-GPU Win':{
- node('mxnetwindows-gpu') {
- timeout(time: max_time, unit: 'MINUTES') {
- ws('workspace/ut-python-gpu') {
- try {
- init_git_win()
- unstash 'vc14_gpu_mkldnn'
- bat '''rmdir /s/q pkg_vc14_gpu_mkldnn
- 7z x -y vc14_gpu_mkldnn.7z'''
- bat """xcopy C:\\mxnet\\data data /E /I /Y
- xcopy C:\\mxnet\\model model /E /I /Y
- call activate py3
- set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_gpu_mkldnn\\python
- del /S /Q ${env.WORKSPACE}\\pkg_vc14_gpu_mkldnn\\python\\*.pyc
- C:\\mxnet\\test_gpu.bat"""
- } finally {
- collect_test_results_windows('nosetests_gpu_forward.xml',
'nosetests_gpu_forward_windows_python3_gpu_mkldnn.xml')
- collect_test_results_windows('nosetests_gpu_operator.xml',
'nosetests_gpu_operator_windows_python3_gpu_mkldnn.xml')
- }
- }
- }
- }
- },
'Onnx CPU': {
node('mxnetlinux-cpu') {
ws('workspace/it-onnx-cpu') {
diff --git a/tests/nightly/JenkinsfileForBinaries
b/tests/nightly/JenkinsfileForBinaries
index c0c14b26667..57ff6f0c3a7 100755
--- a/tests/nightly/JenkinsfileForBinaries
+++ b/tests/nightly/JenkinsfileForBinaries
@@ -77,6 +77,47 @@ try {
pack_lib('gpu', mx_lib)
}
}
+ },
+ 'Build GPU MKLDNN windows':{
+ node('mxnetwindows-cpu') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ ws('workspace/build-gpu') {
+ withEnv(['OpenBLAS_HOME=C:\\mxnet\\openblas',
'OpenCV_DIR=C:\\mxnet\\opencv_vc14',
'CUDA_PATH=C:\\CUDA\\v8.0','BUILD_NAME=vc14_gpu_mkldnn']) {
+ init_git_win()
+ bat """mkdir build_%BUILD_NAME%
+ call "C:\\Program Files (x86)\\Microsoft Visual Studio
14.0\\VC\\bin\\x86_amd64\\vcvarsx86_amd64.bat"
+ cd build_%BUILD_NAME%
+ copy
${env.WORKSPACE}\\3rdparty\\mkldnn\\config_template.vcxproj.user
${env.WORKSPACE}\\config_template.vcxproj.user /y
+ cmake -G \"NMake Makefiles JOM\" -DUSE_CUDA=1 -DUSE_CUDNN=1
-DUSE_NVRTC=1 -DUSE_OPENCV=1 -DUSE_OPENMP=1 -DUSE_PROFILER=1 -DUSE_BLAS=open
-DUSE_LAPACK=1 -DUSE_DIST_KVSTORE=0 -DCUDA_ARCH_NAME=All -DUSE_MKLDNN=1
-DCMAKE_CXX_FLAGS_RELEASE="/FS /MD /O2 /Ob2 /DNDEBUG"
-DCMAKE_BUILD_TYPE=Release ${env.WORKSPACE}"""
+ bat '''
+ call "C:\\Program Files (x86)\\Microsoft Visual Studio
14.0\\VC\\bin\\x86_amd64\\vcvarsx86_amd64.bat"
+ cd build_%BUILD_NAME%
+ set /a cores=%NUMBER_OF_PROCESSORS% * 2
+ jom -j %cores%
+ '''
+ bat '''rmdir /s/q pkg_%BUILD_NAME%
+ mkdir pkg_%BUILD_NAME%\\lib
+ mkdir pkg_%BUILD_NAME%\\python
+ mkdir pkg_%BUILD_NAME%\\include
+ mkdir pkg_%BUILD_NAME%\\build
+ copy build_%BUILD_NAME%\\libmxnet.lib pkg_%BUILD_NAME%\\lib
+ copy build_%BUILD_NAME%\\libmxnet.dll pkg_%BUILD_NAME%\\build
+ copy build_%BUILD_NAME%\\3rdparty\\mkldnn\\src\\mkldnn.dll
pkg_%BUILD_NAME%\\build
+ copy build_%BUILD_NAME%\\libiomp5md.dll pkg_%BUILD_NAME%\\build
+ copy build_%BUILD_NAME%\\mklml.dll pkg_%BUILD_NAME%\\build
+ xcopy python pkg_%BUILD_NAME%\\python /E /I /Y
+ xcopy include pkg_%BUILD_NAME%\\include /E /I /Y
+ xcopy 3rdparty\\dmlc-core\\include pkg_%BUILD_NAME%\\include /E
/I /Y
+ xcopy 3rdparty\\mshadow\\mshadow
pkg_%BUILD_NAME%\\include\\mshadow /E /I /Y
+ xcopy 3rdparty\\nnvm\\include pkg_%BUILD_NAME%\\nnvm\\include /E
/I /Y
+ del /Q *.7z
+ 7z.exe a %BUILD_NAME%.7z pkg_%BUILD_NAME%\\
+ '''
+ stash includes: 'vc14_gpu_mkldnn.7z', name: 'vc14_gpu_mkldnn'
+ }
+ }
+ }
+ }
}
}
@@ -98,6 +139,53 @@ try {
docker_run('ubuntu_nightly_gpu', 'nightly_test_KVStore_singleNode',
true)
}
}
+ },
+ 'Python 3: MKLDNN-GPU Win':{
+ node('mxnetwindows-gpu') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ ws('workspace/ut-python-gpu') {
+ try {
+ init_git_win()
+ unstash 'vc14_gpu_mkldnn'
+ bat '''rmdir /s/q pkg_vc14_gpu_mkldnn
+ 7z x -y vc14_gpu_mkldnn.7z'''
+ bat """xcopy C:\\mxnet\\data data /E /I /Y
+ xcopy C:\\mxnet\\model model /E /I /Y
+ call activate py3
+ set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_gpu_mkldnn\\python
+ del /S /Q ${env.WORKSPACE}\\pkg_vc14_gpu_mkldnn\\python\\*.pyc
+ C:\\mxnet\\test_gpu.bat"""
+ } finally {
+ collect_test_results_windows('nosetests_gpu_forward.xml',
'nosetests_gpu_forward_windows_python3_gpu_mkldnn.xml')
+ collect_test_results_windows('nosetests_gpu_operator.xml',
'nosetests_gpu_operator_windows_python3_gpu_mkldnn.xml')
+ }
+ }
+ }
+ }
+ },
+ 'R: CPU': {
+ node('mxnetlinux-cpu') {
+ ws('workspace/ut-r-cpu') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ init_git()
+ unpack_lib('cpu')
+ docker_run('ubuntu_cpu', 'unittest_ubuntu_cpu_R', false)
+ publish_test_coverage()
+ }
+ }
+ }
+ },
+ 'R: GPU': {
+ node('mxnetlinux-gpu') {
+ ws('workspace/ut-r-gpu') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ init_git()
+ unpack_lib('gpu')
+ docker_run('ubuntu_gpu', 'unittest_ubuntu_gpu_R', true)
+ publish_test_coverage()
+ }
+ }
+ }
}
}
} catch (caughtError) {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
