Skip to content

Commit

Permalink
Trigger benchmark via commit message and add mr-dl3 for testing (h2oa…
Browse files Browse the repository at this point in the history 
…i#377)
  • Loading branch information
@pseudotensor
pseudotensor authored Dec 28, 2017
1 parent 6901367 commit 1464d01
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 20 deletions.
9 changes: 7 additions & 2 deletions Jenkinsfile-nccl-cuda8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ def doruntime = "1"
//def dockerimagesruntime = ["nvidia/cuda:8.0-cudnn5-runtime-ubuntu16.04", "nvidia/cuda:8.0-cudnn5-runtime-ubuntu16.04", "nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04", "nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04"]
//def dists = ["dist1","dist2","dist3","dist4"]

def benchmark_commit_trigger

pipeline {
agent none

Expand Down Expand Up @@ -82,8 +84,10 @@ pipeline {
script {
h2o4gpuUtils = load "Jenkinsfile.utils"
buildInfo("h2o4gpu", h2o4gpuUtils.isRelease())
commitMessage = sh(script: 'git log -1 --pretty=%B', returnStdout: true).trim()
commitMessage = sh(script: 'git log -1 --pretty=%B | tr "\n" " "', returnStdout: true).trim()
echo "Commit Message: ${commitMessage}"
benchmark_commit_trigger = ("${commitMessage}" ==~ /.*trigger_benchmark.*/)
echo "benchmark_commit_trigger: ${benchmark_commit_trigger}"
}
stash includes: "Jenkinsfile*", name: "jenkinsfiles"
}
Expand Down Expand Up @@ -230,7 +234,8 @@ pipeline {
expression {
unstash "jenkinsfiles"
h2o4gpuUtils = load "Jenkinsfile.utils"
return h2o4gpuUtils.doTriggerBenchmarksJob() && "${dobenchmark}" == "1" && env.BRANCH_NAME == "master"
echo "benchmark_commit_trigger: ${benchmark_commit_trigger}"
return ("${benchmark_commit_trigger}"=="true" || h2o4gpuUtils.doTriggerBenchmarksJob()) && "${dobenchmark}" == "1" && env.BRANCH_NAME == "master"
}
}
steps {
Expand Down
9 changes: 7 additions & 2 deletions Jenkinsfile-nccl-cuda9
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ def doruntime = "1"
//def dockerimagesruntime = ["nvidia/cuda:8.0-cudnn5-runtime-ubuntu16.04", "nvidia/cuda:8.0-cudnn5-runtime-ubuntu16.04", "nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04", "nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04"]
//def dists = ["dist1","dist2","dist3","dist4"]

def benchmark_commit_trigger

pipeline {
agent none

Expand Down Expand Up @@ -82,8 +84,10 @@ pipeline {
script {
h2o4gpuUtils = load "Jenkinsfile.utils"
buildInfo("h2o4gpu", h2o4gpuUtils.isRelease())
commitMessage = sh(script: 'git log -1 --pretty=%B', returnStdout: true).trim()
commitMessage = sh(script: 'git log -1 --pretty=%B | tr "\n" " "', returnStdout: true).trim()
echo "Commit Message: ${commitMessage}"
benchmark_commit_trigger = ("${commitMessage}" ==~ /.*trigger_benchmark.*/)
echo "benchmark_commit_trigger: ${benchmark_commit_trigger}"
}
stash includes: "Jenkinsfile*", name: "jenkinsfiles"
}
Expand Down Expand Up @@ -230,7 +234,8 @@ pipeline {
expression {
unstash "jenkinsfiles"
h2o4gpuUtils = load "Jenkinsfile.utils"
return h2o4gpuUtils.doTriggerBenchmarksJob() && "${dobenchmark}" == "1" && env.BRANCH_NAME == "master"
echo "benchmark_commit_trigger: ${benchmark_commit_trigger}"
return ("${benchmark_commit_trigger}"=="true" || h2o4gpuUtils.doTriggerBenchmarksJob()) && "${dobenchmark}" == "1" && env.BRANCH_NAME == "master"
}
}
steps {
Expand Down
9 changes: 7 additions & 2 deletions Jenkinsfile-nccl-cuda9-aws1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ def doruntime = "0"
//def dockerimagesruntime = ["nvidia/cuda:8.0-cudnn5-runtime-ubuntu16.04", "nvidia/cuda:8.0-cudnn5-runtime-ubuntu16.04", "nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04", "nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04"]
//def dists = ["dist1","dist2","dist3","dist4"]

def benchmark_commit_trigger

pipeline {
agent none

Expand Down Expand Up @@ -82,8 +84,10 @@ pipeline {
script {
h2o4gpuUtils = load "Jenkinsfile.utils"
buildInfo("h2o4gpu", h2o4gpuUtils.isRelease())
commitMessage = sh(script: 'git log -1 --pretty=%B', returnStdout: true).trim()
commitMessage = sh(script: 'git log -1 --pretty=%B | tr "\n" " "', returnStdout: true).trim()
echo "Commit Message: ${commitMessage}"
benchmark_commit_trigger = ("${commitMessage}" ==~ /.*trigger_benchmark.*/)
echo "benchmark_commit_trigger: ${benchmark_commit_trigger}"
}
stash includes: "Jenkinsfile*", name: "jenkinsfiles"
}
Expand Down Expand Up @@ -230,7 +234,8 @@ pipeline {
expression {
unstash "jenkinsfiles"
h2o4gpuUtils = load "Jenkinsfile.utils"
return h2o4gpuUtils.doTriggerBenchmarksJob() && "${dobenchmark}" == "1" && env.BRANCH_NAME == "master"
echo "benchmark_commit_trigger: ${benchmark_commit_trigger}"
return ("${benchmark_commit_trigger}"=="true" || h2o4gpuUtils.doTriggerBenchmarksJob()) && "${dobenchmark}" == "1" && env.BRANCH_NAME == "master"
}
}
steps {
Expand Down
15 changes: 10 additions & 5 deletions Jenkinsfile-nccl-cuda9-benchmark
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ def cudart = "nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04"
def extratag = "-nccl-cuda9-benchmark"
def linuxwheel = "linux_whl6"
def testtype = "dotestperf"
def labelbuild = "ec2P32xlarge"
def labeltest = "ec2P32xlarge"
def labelruntime = "ec2P32xlarge"
def labelbuild = "mr-dl3"
def labeltest = "mr-dl3"
def labelruntime = "mr-dl3"
def dobenchmark = "0"
def doruntime = "0"

Expand All @@ -37,6 +37,8 @@ def doruntime = "0"
//def dockerimagesruntime = ["nvidia/cuda:8.0-cudnn5-runtime-ubuntu16.04", "nvidia/cuda:8.0-cudnn5-runtime-ubuntu16.04", "nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04", "nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04"]
//def dists = ["dist1","dist2","dist3","dist4"]

def benchmark_commit_trigger

pipeline {
agent none

Expand Down Expand Up @@ -82,8 +84,10 @@ pipeline {
script {
h2o4gpuUtils = load "Jenkinsfile.utils"
buildInfo("h2o4gpu", h2o4gpuUtils.isRelease())
commitMessage = sh(script: 'git log -1 --pretty=%B', returnStdout: true).trim()
commitMessage = sh(script: 'git log -1 --pretty=%B | tr "\n" " "', returnStdout: true).trim()
echo "Commit Message: ${commitMessage}"
benchmark_commit_trigger = ("${commitMessage}" ==~ /.*trigger_benchmark.*/)
echo "benchmark_commit_trigger: ${benchmark_commit_trigger}"
}
stash includes: "Jenkinsfile*", name: "jenkinsfiles"
}
Expand Down Expand Up @@ -230,7 +234,8 @@ pipeline {
expression {
unstash "jenkinsfiles"
h2o4gpuUtils = load "Jenkinsfile.utils"
return h2o4gpuUtils.doTriggerBenchmarksJob() && "${dobenchmark}" == "1" && env.BRANCH_NAME == "master"
echo "benchmark_commit_trigger: ${benchmark_commit_trigger}"
return ("${benchmark_commit_trigger}"=="true" || h2o4gpuUtils.doTriggerBenchmarksJob()) && "${dobenchmark}" == "1" && env.BRANCH_NAME == "master"
}
}
steps {
Expand Down
10 changes: 8 additions & 2 deletions Jenkinsfile-nonccl-cuda8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ def doruntime = "1"
//def dockerimagesruntime = ["nvidia/cuda:8.0-cudnn5-runtime-ubuntu16.04", "nvidia/cuda:8.0-cudnn5-runtime-ubuntu16.04", "nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04", "nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04"]
//def dists = ["dist1","dist2","dist3","dist4"]

def benchmark_commit_trigger

pipeline {
agent none

Expand Down Expand Up @@ -82,13 +84,16 @@ pipeline {
script {
h2o4gpuUtils = load "Jenkinsfile.utils"
buildInfo("h2o4gpu", h2o4gpuUtils.isRelease())
commitMessage = sh(script: 'git log -1 --pretty=%B', returnStdout: true).trim()
commitMessage = sh(script: 'git log -1 --pretty=%B | tr "\n" " "', returnStdout: true).trim()
echo "Commit Message: ${commitMessage}"
benchmark_commit_trigger = ("${commitMessage}" ==~ /.*trigger_benchmark.*/)
echo "benchmark_commit_trigger: ${benchmark_commit_trigger}"
}
stash includes: "Jenkinsfile*", name: "jenkinsfiles"
}
}
stage("Build Wheel on Linux nonccl-cuda8") {

agent {
label "${labelbuild}"
}
Expand Down Expand Up @@ -229,7 +234,8 @@ pipeline {
expression {
unstash "jenkinsfiles"
h2o4gpuUtils = load "Jenkinsfile.utils"
return h2o4gpuUtils.doTriggerBenchmarksJob() && "${dobenchmark}" == "1" && env.BRANCH_NAME == "master"
echo "benchmark_commit_trigger: ${benchmark_commit_trigger}"
return ("${benchmark_commit_trigger}"=="true" || h2o4gpuUtils.doTriggerBenchmarksJob()) && "${dobenchmark}" == "1" && env.BRANCH_NAME == "master"
}
}
steps {
Expand Down
10 changes: 8 additions & 2 deletions Jenkinsfile-nonccl-cuda9
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ def doruntime = "1"
//def dockerimagesruntime = ["nvidia/cuda:8.0-cudnn5-runtime-ubuntu16.04", "nvidia/cuda:8.0-cudnn5-runtime-ubuntu16.04", "nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04", "nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04"]
//def dists = ["dist1","dist2","dist3","dist4"]

def benchmark_commit_trigger

pipeline {
agent none

Expand Down Expand Up @@ -82,13 +84,16 @@ pipeline {
script {
h2o4gpuUtils = load "Jenkinsfile.utils"
buildInfo("h2o4gpu", h2o4gpuUtils.isRelease())
commitMessage = sh(script: 'git log -1 --pretty=%B', returnStdout: true).trim()
commitMessage = sh(script: 'git log -1 --pretty=%B | tr "\n" " "', returnStdout: true).trim()
echo "Commit Message: ${commitMessage}"
benchmark_commit_trigger = ("${commitMessage}" ==~ /.*trigger_benchmark.*/)
echo "benchmark_commit_trigger: ${benchmark_commit_trigger}"
}
stash includes: "Jenkinsfile*", name: "jenkinsfiles"
}
}
stage("Build Wheel on Linux nonccl-cuda9") {

agent {
label "${labelbuild}"
}
Expand Down Expand Up @@ -229,7 +234,8 @@ pipeline {
expression {
unstash "jenkinsfiles"
h2o4gpuUtils = load "Jenkinsfile.utils"
return h2o4gpuUtils.doTriggerBenchmarksJob() && "${dobenchmark}" == "1" && env.BRANCH_NAME == "master"
echo "benchmark_commit_trigger: ${benchmark_commit_trigger}"
return ("${benchmark_commit_trigger}"=="true" || h2o4gpuUtils.doTriggerBenchmarksJob()) && "${dobenchmark}" == "1" && env.BRANCH_NAME == "master"
}
}
steps {
Expand Down
9 changes: 7 additions & 2 deletions Jenkinsfile.utils2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
//def dockerimagesruntime = ["nvidia/cuda:8.0-cudnn5-runtime-ubuntu16.04", "nvidia/cuda:8.0-cudnn5-runtime-ubuntu16.04", "nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04", "nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04"]
//def dists = ["dist1","dist2","dist3","dist4"]

def benchmark_commit_trigger

pipeline {
agent none

Expand Down Expand Up @@ -55,8 +57,10 @@ pipeline {
script {
h2o4gpuUtils = load "Jenkinsfile.utils"
buildInfo("h2o4gpu", h2o4gpuUtils.isRelease())
commitMessage = sh(script: 'git log -1 --pretty=%B', returnStdout: true).trim()
commitMessage = sh(script: 'git log -1 --pretty=%B | tr "\n" " "', returnStdout: true).trim()
echo "Commit Message: ${commitMessage}"
benchmark_commit_trigger = ("${commitMessage}" ==~ /.*trigger_benchmark.*/)
echo "benchmark_commit_trigger: ${benchmark_commit_trigger}"
}
stash includes: "Jenkinsfile*", name: "jenkinsfiles"
}
Expand Down Expand Up @@ -203,7 +207,8 @@ pipeline {
expression {
unstash "jenkinsfiles"
h2o4gpuUtils = load "Jenkinsfile.utils"
return h2o4gpuUtils.doTriggerBenchmarksJob() && "${dobenchmark}" == "1" && env.BRANCH_NAME == "master"
echo "benchmark_commit_trigger: ${benchmark_commit_trigger}"
return ("${benchmark_commit_trigger}"=="true" || h2o4gpuUtils.doTriggerBenchmarksJob()) && "${dobenchmark}" == "1" && env.BRANCH_NAME == "master"
}
}
steps {
Expand Down
12 changes: 9 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@ buildjenkins: update_submodule cpp c py

installjenkins: pyinstall

######### h2o.ai systems
# for nccl cuda8 build
fullinstalljenkins-nccl-cuda8: cleanjenkins alldeps_private-nccl-cuda8 buildjenkins installjenkins
mkdir -p src/interface_py/dist1/ && mv src/interface_py/dist/*.whl src/interface_py/dist1/
Expand All @@ -483,13 +484,18 @@ fullinstalljenkins-nccl-cuda9: cleanjenkins alldeps_private-nccl-cuda9 buildjenk
fullinstalljenkins-nonccl-cuda9: cleanjenkins alldeps_private-nonccl-cuda9 buildjenkins installjenkins
mkdir -p src/interface_py/dist3/ && mv src/interface_py/dist/*.whl src/interface_py/dist3/

# for nccl cuda9 build benchmark
fullinstalljenkins-nccl-cuda9-benchmark: cleanjenkins alldeps_private-nccl-cuda9 buildjenkins installjenkins
mkdir -p src/interface_py/dist6/ && mv src/interface_py/dist/*.whl src/interface_py/dist6/

########## AWS
# for nccl cuda9 build aws build/test
fullinstalljenkins-nccl-cuda9-aws1: cleanjenkins alldeps_private-nccl-cuda9 buildjenkins installjenkins
mkdir -p src/interface_py/dist5/ && mv src/interface_py/dist/*.whl src/interface_py/dist5/

# for nccl cuda9 build benchmark
fullinstalljenkins-nccl-cuda9-benchmark: cleanjenkins alldeps_private-nccl-cuda9 buildjenkins installjenkins
mkdir -p src/interface_py/dist6/ && mv src/interface_py/dist/*.whl src/interface_py/dist6/
# for nccl cuda9 build benchmark on aws1
fullinstalljenkins-nccl-cuda9-aws1-benchmark: cleanjenkins alldeps_private-nccl-cuda9 buildjenkins installjenkins
mkdir -p src/interface_py/dist7/ && mv src/interface_py/dist/*.whl src/interface_py/dist7/

.PHONY: mrproper
mrproper: clean
Expand Down

0 comments on commit 1464d01

Please sign in to comment.