Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Jenkins CI for GPU (#3294)

Browse Source
This commit is contained in:
Rory Mitchell 2018-05-04 16:50:59 +12:00 committed by GitHub
parent c80d51ccb3
commit 90a5c4db9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Jenkinsfile vendored
View File

@ -8,7 +8,7 @@ dockerRun = 'tests/ci_build/ci_build.sh'
def buildMatrix = [ def buildMatrix = [
[ "enabled": true, "os" : "linux", "withGpu": true, "withOmp": true, "pythonVersion": "2.7" ], [ "enabled": true, "os" : "linux", "withGpu": true, "withOmp": true, "pythonVersion": "2.7" ],
[ "enabled": true, "os" : "linux", "withGpu": false, "withOmp": true, "pythonVersion": "2.7" ], [ "enabled": false, "os" : "linux", "withGpu": false, "withOmp": true, "pythonVersion": "2.7" ],
[ "enabled": false, "os" : "osx", "withGpu": false, "withOmp": false, "pythonVersion": "2.7" ], [ "enabled": false, "os" : "osx", "withGpu": false, "withOmp": false, "pythonVersion": "2.7" ],
] ]
@ -69,8 +69,7 @@ def buildFactory(buildName, conf) {
def os = conf["os"] def os = conf["os"]
def nodeReq = conf["withGpu"] ? "${os} && gpu" : "${os}" def nodeReq = conf["withGpu"] ? "${os} && gpu" : "${os}"
def dockerTarget = conf["withGpu"] ? "gpu" : "cpu" def dockerTarget = conf["withGpu"] ? "gpu" : "cpu"
[ ("cmake_${buildName}") : { buildPlatformCmake("cmake_${buildName}", conf, nodeReq, dockerTarget) }, [ ("cmake_${buildName}") : { buildPlatformCmake("cmake_${buildName}", conf, nodeReq, dockerTarget) }
("make_${buildName}") : { buildPlatformMake("make_${buildName}", conf, nodeReq, dockerTarget) }
] ]
} }
@ -129,7 +128,6 @@ def buildPlatformMake(buildName, conf, nodeReq, dockerTarget) {
def makeOptions(conf) { def makeOptions(conf) {
return ([ return ([
conf["withGpu"] ? 'PLUGIN_UPDATER_GPU=ON' : 'PLUGIN_UPDATER_GPU=OFF',
conf["withOmp"] ? 'USE_OPENMP=1' : 'USE_OPENMP=0'] conf["withOmp"] ? 'USE_OPENMP=1' : 'USE_OPENMP=0']
).join(" ") ).join(" ")
} }
@ -137,7 +135,7 @@ def makeOptions(conf) {
def cmakeOptions(conf) { def cmakeOptions(conf) {
return ([ return ([
conf["withGpu"] ? '-DPLUGIN_UPDATER_GPU:BOOL=ON' : '', conf["withGpu"] ? '-DUSE_CUDA=ON' : '-DUSE_CUDA=OFF',
conf["withOmp"] ? '-DOPEN_MP:BOOL=ON' : ''] conf["withOmp"] ? '-DOPEN_MP:BOOL=ON' : '']
).join(" ") ).join(" ")
} }

5
tests/ci_build/test_gpu.sh
View File

@ -2,5 +2,6 @@
cd python-package cd python-package
python setup.py install --user python setup.py install --user
cd ../plugin/updater_gpu cd ..
python -m nose test/python python -m nose tests/python-gpu