Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

contrib/intel/jenkins: Fix Failing UCX & IMB tests #9383

Merged
merged 6 commits into from
Oct 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 33 additions & 17 deletions contrib/intel/jenkins/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ properties([disableConcurrentBuilds(abortPrevious: true)])
@Field def SCRIPT_LOCATION="py_scripts/contrib/intel/jenkins"
@Field def RELEASE=false
@Field def BUILD_MODES=["reg", "dbg", "dl"]
@Field def MPI_TYPES=["impi", "mpich", "ompi"]
@Field def PYTHON_VERSION="3.9"
@Field def TIMEOUT="3600"

Expand Down Expand Up @@ -315,6 +314,27 @@ pipeline {
}
}
}
stage ('build_ucx') {
steps {
script {
dir ("${CUSTOM_WORKSPACE}/ucx") {
checkout scm
def prefix = "python$PYTHON_VERSION ${RUN_LOCATION}/build.py"
def opts = ""
def build_cmd = ""
for (mode in BUILD_MODES) {
for (item in ["libfabric", "fabtests"]) {
opts = "--build_item=${item} --ofi_build_mode=${mode} --ucx"
build_cmd = "${build_cmd} ${prefix} ${opts}; "
}
}
slurm_batch("squirtle,totodile", "1",
"${env.LOG_DIR}/libfabric_ucx_build_log",
"${build_cmd}")
}
}
}
}
stage ('build-daos') {
agent {
node {
Expand Down Expand Up @@ -362,7 +382,7 @@ pipeline {
script {
dir (RUN_LOCATION) {
def providers = [["verbs", "rxm"]]
for (mpi in MPI_TYPES) {
for (def mpi in ["impi"]) {
for (imb_grp = 1; imb_grp < 4; imb_grp++) {
run_middleware(providers, "MPI", "IMB",
"squirtle,totodile", "2", "${mpi}",
Expand All @@ -378,7 +398,7 @@ pipeline {
script {
dir (RUN_LOCATION) {
def providers = [["verbs", "rxm"]]
for (mpi in MPI_TYPES) {
for (def mpi in ["impi", "mpich"]) {
run_middleware(providers, "MPI", "osu", "squirtle,totodile",
"2", "${mpi}")
}
Expand All @@ -391,11 +411,11 @@ pipeline {
script {
dir (RUN_LOCATION) {
def providers = [["tcp", null]]
for (mpi in MPI_TYPES) {
for (imb_grp = 1; imb_grp < 4; imb_grp++) {
run_middleware(providers, "MPI", "IMB",
"bulbasaur", "2", "${mpi}", "${imb_grp}")
}
for (imb_grp = 1; imb_grp < 4; imb_grp++) {
run_middleware(providers, "MPI", "IMB",
"bulbasaur", "2", "impi", "${imb_grp}")
}
for (def mpi in ["impi", "mpich"]) {
run_middleware(providers, "MPI", "osu", "bulbasaur", "2",
"${mpi}")
}
Expand Down Expand Up @@ -472,14 +492,6 @@ pipeline {
stage('ucx') {
steps {
script {
dir (CUSTOM_WORKSPACE) {
for (mode in BUILD_MODES) {
echo "Building Libfabric $mode"
build("libfabric", "${mode}", null, false, "--ucx")
echo "Building Fabtests $mode"
build("fabtests", "${mode}", null, false, "--ucx")
}
}
dir (RUN_LOCATION) {
run_fabtests("ucx", "totodile", "2", "ucx")
}
Expand All @@ -501,7 +513,11 @@ pipeline {
script {
dir (RUN_LOCATION) {
def providers = [['tcp', null], ["verbs","rxm"]]
for (mpi in MPI_TYPES) {
def MPIS = ["mpich"]
if (env.WEEKLY.toBoolean()) {
MPIS = ["impi", "mpich"]
}
for (def mpi in MPIS) {
run_middleware(providers, "mpichtestsuite", "mpichtestsuite",
"squirtle,totodile", "2", "${mpi}")
}
Expand Down
Loading