You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by lx...@apache.org on 2017/06/29 22:43:20 UTC
incubator-mxnet-test git commit: Remove windows & temporarily change
node names
Repository: incubator-mxnet-test
Updated Branches:
refs/heads/master 8f4964140 -> 9014cc90f
Remove windows & temporarily change node names
Project: http://git-wip-us.apache.org/repos/asf/incubator-mxnet-test/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mxnet-test/commit/9014cc90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mxnet-test/tree/9014cc90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mxnet-test/diff/9014cc90
Branch: refs/heads/master
Commit: 9014cc90f1707b6de0723c26ea82a9904c78b07f
Parents: 8f49641
Author: Nguyen <ly...@amazon.com>
Authored: Thu Jun 29 15:43:11 2017 -0700
Committer: Nguyen <ly...@amazon.com>
Committed: Thu Jun 29 15:43:11 2017 -0700
----------------------------------------------------------------------
Jenkinsfile | 128 ++++++-------------------------------------------------
1 file changed, 14 insertions(+), 114 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mxnet-test/blob/9014cc90/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index f2beae0..164eb96 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,7 +40,7 @@ def init_git_win() {
stage("Sanity Check") {
timeout(time: max_time, unit: 'MINUTES') {
- node('linux') {
+ node('mxnet') {
ws('workspace/sanity') {
init_git()
make('lint', 'cpplint rcpplint jnilint')
@@ -86,7 +86,7 @@ echo ${libs} | sed -e 's/,/ /g' | xargs md5sum
stage('Build') {
parallel 'CPU: Openblas': {
- node('linux') {
+ node('mxnet') {
ws('workspace/build-cpu') {
init_git()
def flag = """ \
@@ -102,7 +102,7 @@ USE_BLAS=openblas \
}
},
'GPU: CUDA7.5+cuDNN5': {
- node('GPU' && 'linux') {
+ node('mxnet') {
ws('workspace/build-gpu') {
init_git()
def flag = """ \
@@ -122,7 +122,7 @@ USE_CPP_PACKAGE=1 \
}
},
'Amalgamation': {
- node('linux') {
+ node('mxnet') {
ws('workspace/amalgamation') {
init_git()
make('cpu', '-C amalgamation/ USE_BLAS=openblas MIN=1')
@@ -130,7 +130,7 @@ USE_CPP_PACKAGE=1 \
}
},
'GPU: MKLML': {
- node('GPU' && 'linux') {
+ node('mxnet') {
ws('workspace/build-mklml') {
init_git()
def flag = """ \
@@ -149,66 +149,6 @@ USE_CPP_PACKAGE=1 \
pack_lib('mklml')
}
}
- },
- 'CPU windows':{
- node('windows') {
- ws('workspace/build-cpu') {
- withEnv(['OpenBLAS_HOME=C:\\mxnet\\openblas', 'OpenCV_DIR=C:\\mxnet\\opencv_vc14', 'CUDA_PATH=C:\\CUDA\\v8.0']) {
- init_git_win()
- bat """mkdir build_vc14_cpu
-cd build_vc14_cpu
-cmake -G \"Visual Studio 14 2015 Win64\" -DUSE_CUDA=0 -DUSE_CUDNN=0 -DUSE_NVRTC=0 -DUSE_OPENCV=1 -DUSE_OPENMP=1 -DUSE_PROFILER=1 -DUSE_BLAS=open -DUSE_LAPACK=1 -DUSE_DIST_KVSTORE=0 ${env.WORKSPACE}"""
- bat 'C:\\mxnet\\build_vc14_cpu.bat'
-
- bat '''rmdir /s/q pkg_vc14_gpu
-mkdir pkg_vc14_cpu\\lib
-mkdir pkg_vc14_cpu\\python
-mkdir pkg_vc14_cpu\\include
-mkdir pkg_vc14_cpu\\build
-copy build_vc14_cpu\\Release\\libmxnet.lib pkg_vc14_cpu\\lib
-copy build_vc14_cpu\\Release\\libmxnet.dll pkg_vc14_cpu\\build
-xcopy python pkg_vc14_cpu\\python /E /I /Y
-xcopy include pkg_vc14_cpu\\include /E /I /Y
-xcopy dmlc-core\\include pkg_vc14_cpu\\include /E /I /Y
-xcopy mshadow\\mshadow pkg_vc14_cpu\\include\\mshadow /E /I /Y
-xcopy nnvm\\include pkg_vc14_cpu\\nnvm\\include /E /I /Y
-del /Q *.7z
-7z.exe a vc14_cpu.7z pkg_vc14_cpu\\
-'''
- stash includes: 'vc14_cpu.7z', name: 'vc14_cpu'
- }
- }
- }
- },
- 'GPU windows':{
- node('windows') {
- ws('workspace/build-gpu') {
- withEnv(['OpenBLAS_HOME=C:\\mxnet\\openblas', 'OpenCV_DIR=C:\\mxnet\\opencv_vc14', 'CUDA_PATH=C:\\CUDA\\v8.0']) {
- init_git_win()
- bat """mkdir build_vc14_gpu
-call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\x86_amd64\\vcvarsx86_amd64.bat"
-cd build_vc14_gpu
-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 -DCMAKE_CXX_FLAGS_RELEASE="/FS /MD /O2 /Ob2 /DNDEBUG" -DCMAKE_BUILD_TYPE=Release ${env.WORKSPACE}"""
- bat 'C:\\mxnet\\build_vc14_gpu.bat'
- bat '''rmdir /s/q pkg_vc14_gpu
-mkdir pkg_vc14_gpu\\lib
-mkdir pkg_vc14_gpu\\python
-mkdir pkg_vc14_gpu\\include
-mkdir pkg_vc14_gpu\\build
-copy build_vc14_gpu\\libmxnet.lib pkg_vc14_gpu\\lib
-copy build_vc14_gpu\\libmxnet.dll pkg_vc14_gpu\\build
-xcopy python pkg_vc14_gpu\\python /E /I /Y
-xcopy include pkg_vc14_gpu\\include /E /I /Y
-xcopy dmlc-core\\include pkg_vc14_gpu\\include /E /I /Y
-xcopy mshadow\\mshadow pkg_vc14_gpu\\include\\mshadow /E /I /Y
-xcopy nnvm\\include pkg_vc14_gpu\\nnvm\\include /E /I /Y
-del /Q *.7z
-7z.exe a vc14_gpu.7z pkg_vc14_gpu\\
-'''
- stash includes: 'vc14_gpu.7z', name: 'vc14_gpu'
- }
- }
- }
}
}
@@ -232,7 +172,7 @@ def python_gpu_ut(docker_type) {
stage('Unit Test') {
parallel 'Python2/3: CPU': {
- node('linux') {
+ node('mxnet') {
ws('workspace/ut-python-cpu') {
init_git()
unpack_lib('cpu')
@@ -241,7 +181,7 @@ stage('Unit Test') {
}
},
'Python2/3: GPU': {
- node('GPU' && 'linux') {
+ node('mxnet') {
ws('workspace/ut-python-gpu') {
init_git()
unpack_lib('gpu', mx_lib)
@@ -250,7 +190,7 @@ stage('Unit Test') {
}
},
'Python2/3: MKLML': {
- node('GPU' && 'linux') {
+ node('mxnet') {
ws('workspace/ut-python-mklml') {
init_git()
unpack_lib('mklml')
@@ -260,7 +200,7 @@ stage('Unit Test') {
}
},
'Scala: CPU': {
- node('linux') {
+ node('mxnet') {
ws('workspace/ut-scala-cpu') {
init_git()
unpack_lib('cpu')
@@ -270,53 +210,13 @@ stage('Unit Test') {
}
}
}
- },
- 'Python2/3: CPU Win':{
- node('windows') {
- ws('workspace/ut-python-cpu') {
- init_git_win()
- unstash 'vc14_cpu'
- bat '''rmdir /s/q pkg_vc14_cpu
-7z x -y vc14_cpu.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_cpu\\python
-C:\\mxnet\\test_cpu.bat"""
- bat """xcopy C:\\mxnet\\data data /E /I /Y
-xcopy C:\\mxnet\\model model /E /I /Y
-call activate py2
-set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_cpu\\python
-C:\\mxnet\\test_cpu.bat"""
- }
- }
- },
- 'Python2/3: GPU Win':{
- node('windows') {
- ws('workspace/ut-python-gpu') {
- init_git_win()
- unstash 'vc14_gpu'
- bat '''rmdir /s/q pkg_vc14_gpu
-7z x -y vc14_gpu.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\\python
-C:\\mxnet\\test_gpu.bat"""
- bat """xcopy C:\\mxnet\\data data /E /I /Y
-xcopy C:\\mxnet\\model model /E /I /Y
-call activate py2
-set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_gpu\\python
-C:\\mxnet\\test_gpu.bat"""
- }
- }
- }
+ }
}
stage('Integration Test') {
parallel 'Python': {
- node('GPU' && 'linux') {
+ node('mxnet') {
ws('workspace/it-python-gpu') {
init_git()
unpack_lib('gpu')
@@ -327,7 +227,7 @@ stage('Integration Test') {
}
},
'Caffe': {
- node('GPU' && 'linux') {
+ node('mxnet') {
ws('workspace/it-caffe') {
init_git()
unpack_lib('gpu')
@@ -338,7 +238,7 @@ stage('Integration Test') {
}
},
'cpp-package': {
- node('GPU' && 'linux') {
+ node('mxnet') {
ws('workspace/it-cpp-package') {
init_git()
unpack_lib('gpu')
@@ -352,7 +252,7 @@ stage('Integration Test') {
}
stage('Deploy') {
- node('linux') {
+ node('mxnet') {
ws('workspace/docs') {
if (env.BRANCH_NAME == "master") {
init_git()