From 862b74b5187d242a5dba04e2c29d18d26a33a654 Mon Sep 17 00:00:00 2001 From: Juee Himalbhai Desai Date: Mon, 3 Jun 2024 09:28:50 -0700 Subject: [PATCH 1/8] [v1.20.x] Intel/CI: Update oneCCL GPU stage to use torchic partition OneCCL GPU tests require to use new node which is available with torchic partition. Signed-off-by: Juee Himalbhai Desai --- contrib/intel/jenkins/Jenkinsfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/intel/jenkins/Jenkinsfile b/contrib/intel/jenkins/Jenkinsfile index 465be7362ea..a86637d19f6 100644 --- a/contrib/intel/jenkins/Jenkinsfile +++ b/contrib/intel/jenkins/Jenkinsfile @@ -764,13 +764,16 @@ pipeline { script { dir (RUN_LOCATION) { run_middleware([["tcp", null]], "oneCCL-GPU-v3", "onecclgpu", - "gpu", "fabrics-ci", "2", null, null, + "gpu", "torchic", "1", null, null, "FI_HMEM_DISABLE_P2P=1") run_middleware([["psm3", null]], "oneCCL-GPU-v3", "onecclgpu", - "gpu", "fabrics-ci", "2", null, null, + "gpu", "torchic", "1", null, null, "FI_HMEM_DISABLE_P2P=1") run_middleware([["verbs", null]], "oneCCL-GPU-v3", "onecclgpu", - "gpu", "fabrics-ci", "2", null, null, + "gpu", "torchic", "1", null, null, + "FI_HMEM_DISABLE_P2P=1") + run_middleware([["shm", null]], "oneCCL-GPU-v3", "onecclgpu", + "gpu", "torchic", "1", null, null, "FI_HMEM_DISABLE_P2P=1") } } From 17f6e697147b524e3435c9f053140a4acdd271bd Mon Sep 17 00:00:00 2001 From: Juee Himalbhai Desai Date: Thu, 18 Apr 2024 09:05:23 -0700 Subject: [PATCH 2/8] [v1.20.x] Intel/CI: Update DMABUF stage to use torchic partition DMABUF tests require to use new node which is available with torchic partition. There is no need for 2 node tests hence the two node tests have been removed. Log file name has been changed and number of nodes have been removed. Signed-off-by: Juee Himalbhai Desai --- contrib/intel/jenkins/Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/contrib/intel/jenkins/Jenkinsfile b/contrib/intel/jenkins/Jenkinsfile index a86637d19f6..abfd30538fa 100644 --- a/contrib/intel/jenkins/Jenkinsfile +++ b/contrib/intel/jenkins/Jenkinsfile @@ -816,9 +816,7 @@ pipeline { dmabuf_output = "${LOG_DIR}/DMABUF-Tests_verbs-rxm_dmabuf" cmd = """ python3.9 runtests.py --test=dmabuf \ --prov=verbs --util=rxm --build_hw=gpu""" - slurm_batch("fabrics-ci", "1", "${dmabuf_output}_1_reg", - "${cmd}") - slurm_batch("fabrics-ci", "2", "${dmabuf_output}_2_reg", + slurm_batch("torchic", "1", "${dmabuf_output}_reg", "${cmd}") } } From 5eff5cceb59706808b241a0dd35af637dc15c819 Mon Sep 17 00:00:00 2001 From: Zach Dworkin Date: Thu, 11 Apr 2024 11:42:35 -0700 Subject: [PATCH 3/8] contrib/intel/jenkins: Add more build modes to gpu Add dbg and dl builds to gpu cluster Signed-off-by: Zach Dworkin --- contrib/intel/jenkins/Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/intel/jenkins/Jenkinsfile b/contrib/intel/jenkins/Jenkinsfile index abfd30538fa..c619af0bec5 100644 --- a/contrib/intel/jenkins/Jenkinsfile +++ b/contrib/intel/jenkins/Jenkinsfile @@ -536,8 +536,7 @@ pipeline { dir (CUSTOM_WORKSPACE) { build("logdir") build("builddir") - build("libfabric", "reg", "gpu", "--gpu") - build("fabtests", "reg", "gpu") + slurm_build(BUILD_MODES, "fabrics-ci", "source", "gpu", "--gpu") } } } From 4c914b0a5d9555f9fa4b8fc01255f1f10d55ec66 Mon Sep 17 00:00:00 2001 From: Zach Dworkin Date: Thu, 4 Apr 2024 06:23:33 -0700 Subject: [PATCH 4/8] contrib/intel/jenkins: Migrate Fabtests to new CI Module Migrate all fabtests tests to new CI Module like OSU and IMB. Deprecate build_type variable since it is no longer needed. Signed-off-by: Zach Dworkin --- contrib/intel/jenkins/Jenkinsfile | 173 +++++++++++++----------------- 1 file changed, 76 insertions(+), 97 deletions(-) diff --git a/contrib/intel/jenkins/Jenkinsfile b/contrib/intel/jenkins/Jenkinsfile index c619af0bec5..c2558252386 100644 --- a/contrib/intel/jenkins/Jenkinsfile +++ b/contrib/intel/jenkins/Jenkinsfile @@ -428,9 +428,6 @@ pipeline { } } stage ('build-water') { - environment { - build_type = "water" - } steps { script { slurm_build(BUILD_MODES, "water", "water", "water") @@ -448,9 +445,6 @@ pipeline { } } stage ('build-grass') { - environment { - build_type = "grass" - } steps { script { slurm_build(BUILD_MODES, "grass", "grass", "grass") @@ -468,9 +462,6 @@ pipeline { } } stage ('build-electric') { - environment { - build_type = "electric" - } steps { script { slurm_build(BUILD_MODES, "electric", "electric", "electric") @@ -487,9 +478,9 @@ pipeline { stage ('build-cuda') { steps { script { - slurm_build(BUILD_MODES, "cyndaquil", "cuda", "cyndaquil", + slurm_build(["reg"], "cyndaquil", "cuda", "cyndaquil", "--cuda") - slurm_build(BUILD_MODES, "quilava", "cuda", "quilava", + slurm_build(["reg"], "quilava", "cuda", "quilava", "--cuda") } } @@ -536,6 +527,7 @@ pipeline { dir (CUSTOM_WORKSPACE) { build("logdir") build("builddir") + build_ci() slurm_build(BUILD_MODES, "fabrics-ci", "source", "gpu", "--gpu") } } @@ -547,9 +539,6 @@ pipeline { when { equals expected: true, actual: DO_RUN } parallel { stage ('CI_MPI_verbs-rxm_IMB') { - environment { - build_type = "water" - } steps { script { dir (CI_LOCATION) { @@ -559,9 +548,6 @@ pipeline { } } stage ('CI_MPI_verbs-rxm_OSU') { - environment { - build_type = "water" - } steps { script { dir (CI_LOCATION) { @@ -571,9 +557,6 @@ pipeline { } } stage ('CI_MPI_tcp_IMB') { - environment { - build_type = "grass" - } steps { script { dir (CI_LOCATION) { @@ -583,9 +566,6 @@ pipeline { } } stage ('CI_MPI_tcp_OSU') { - environment { - build_type = "grass" - } steps { script { dir (CI_LOCATION) { @@ -594,97 +574,101 @@ pipeline { } } } - stage('tcp') { + stage('CI_fabtests_tcp') { steps { script { - dir (RUN_LOCATION) { - run_fabtests("tcp", "grass", "bulbasaur", "2", "tcp") + dir (CI_LOCATION) { + run_ci("CI_fabtests_tcp_reg", "pr_fabtests_tcp_reg.json") + run_ci("CI_fabtests_tcp_dbg", "pr_fabtests_tcp_dbg.json") + run_ci("CI_fabtests_tcp_dl", "pr_fabtests_tcp_dl.json") } } } } - stage('tcp-iouring') { - steps { + stage('CI_fabtests_sockets') { + steps { script { - dir (RUN_LOCATION) { - run_fabtests("tcp-iouring", "ivysaur", "ivysaur", "2", - "tcp", null, "FI_TCP_IO_URING=1") + dir (CI_LOCATION) { + run_ci("CI_fabtests_sockets_reg", "pr_fabtests_sockets_reg.json") + run_ci("CI_fabtests_sockets_dbg", "pr_fabtests_sockets_dbg.json") + run_ci("CI_fabtests_sockets_dl", "pr_fabtests_sockets_dl.json") } } } } - stage('verbs-rxm') { - steps { + stage('CI_fabtests_udp') { + steps { script { - dir (RUN_LOCATION) { - run_fabtests("verbs-rxm", "water", "squirtle,totodile", "2", - "verbs", "rxm") - run_fabtests("verbs-rxm", "water", "squirtle,totodile", "2", - "verbs", "rxm", "FI_MR_CACHE_MAX_COUNT=0") - run_fabtests("verbs-rxm", "water", "squirtle,totodile", "2", - "verbs", "rxm", "FI_MR_CACHE_MONITOR=userfaultfd") + dir (CI_LOCATION) { + run_ci("CI_fabtests_udp_reg", "pr_fabtests_udp_reg.json") + run_ci("CI_fabtests_udp_dbg", "pr_fabtests_udp_dbg.json") + run_ci("CI_fabtests_udp_dl", "pr_fabtests_udp_dl.json") } } } } - stage('verbs-rxd') { - steps { + stage('CI_fabtests_shm') { + steps { script { - dir (RUN_LOCATION) { - run_fabtests("verbs-rxd", "water", "squirtle", "2", "verbs", - "rxd") - run_fabtests("verbs-rxd", "water", "squirtle", "2", "verbs", - "rxd", "FI_MR_CACHE_MAX_COUNT=0") - run_fabtests("verbs-rxd", "water", "squirtle", "2", "verbs", - "rxd", "FI_MR_CACHE_MONITOR=userfaultfd") + dir (CI_LOCATION) { + run_ci("CI_fabtests_shm_reg", "pr_fabtests_shm_reg.json") + run_ci("CI_fabtests_shm_dbg", "pr_fabtests_shm_dbg.json") + run_ci("CI_fabtests_shm_dl", "pr_fabtests_shm_dl.json") } } } } - stage('udp') { + stage('CI_fabtests_ivysaur') { steps { script { - dir (RUN_LOCATION) { - run_fabtests("udp", "grass", "bulbasaur", "2", "udp") + dir (CI_LOCATION) { + run_ci("CI_fabtests_ivysaur_reg", "pr_fabtests_ivysaur_reg.json") + run_ci("CI_fabtests_ivysaur_dbg", "pr_fabtests_ivysaur_dbg.json") + run_ci("CI_fabtests_ivysaur_dl", "pr_fabtests_ivysaur_dl.json") } } } } - stage('shm') { + stage('CI_fabtests_verbs_rxm') { steps { script { - dir (RUN_LOCATION) { - run_fabtests("shm", "grass", "bulbasaur", "1", "shm") - run_fabtests("shm", "grass", "bulbasaur", "1", "shm", null, - "FI_SHM_DISABLE_CMA=1") + dir (CI_LOCATION) { + run_ci("CI_fabtests_verbs_reg", "pr_fabtests_verbs_rxm_reg.json") + run_ci("CI_fabtests_verbs_dbg", "pr_fabtests_verbs_rxm_dbg.json") + run_ci("CI_fabtests_verbs_dl", "pr_fabtests_verbs_rxm_dl.json") } } } } - stage('sockets') { + stage('CI_fabtests_verbs_rxd') { steps { script { - dir (RUN_LOCATION) { - run_fabtests("sockets", "grass", "bulbasaur", "2", "sockets") + dir (CI_LOCATION) { + run_ci("CI_fabtests_verbs_reg", "pr_fabtests_verbs_rxd_reg.json") + run_ci("CI_fabtests_verbs_dbg", "pr_fabtests_verbs_rxd_dbg.json") + run_ci("CI_fabtests_verbs_dl", "pr_fabtests_verbs_rxd_dl.json") } } } } - stage('ucx') { + stage('CI_fabtests_psm3') { steps { script { - dir (RUN_LOCATION) { - run_fabtests("ucx", "ucx", "totodile", "2", "ucx") + dir (CI_LOCATION) { + run_ci("CI_fabtests_psm3_reg", "pr_fabtests_psm3_reg.json") + run_ci("CI_fabtests_psm3_dbg", "pr_fabtests_psm3_dbg.json") + run_ci("CI_fabtests_psm3_dl", "pr_fabtests_psm3_dl.json") } } } } - stage('psm3') { + stage('CI_fabtests_ucx') { steps { script { - dir (RUN_LOCATION) { - run_fabtests("psm3", "water", "squirtle", "2", "psm3", null, - "PSM3_IDENTIFY=1") + dir (CI_LOCATION) { + run_ci("CI_fabtests_ucx_reg", "pr_fabtests_ucx_reg.json") + run_ci("CI_fabtests_ucx_dbg", "pr_fabtests_ucx_dbg.json") + run_ci("CI_fabtests_ucx_dl", "pr_fabtests_ucx_dl.json") } } } @@ -821,58 +805,53 @@ pipeline { } } } - stage ('cuda-shm-v1') { + stage ('CI_fabtests_cyndaquil') { steps { script { - dir (RUN_LOCATION) { - run_fabtests("cuda_v1_shm", "cyndaquil", "cyndaquil", "1", - "shm", null, null, "h2d") - run_fabtests("cuda_v1_shm", "cyndaquil", "cyndaquil", "1", - "shm", null, null, "d2d") - // run_fabtests("cuda_v1_shm", "cyndaquil", "cyndaquil", "1", - // "shm", null, null, "xd2d") + dir (CI_LOCATION) { + run_ci("CI_fabtests_cyndaquil_h2d_reg", + "pr_fabtests_cyndaquil_h2d_reg.json") + run_ci("CI_fabtests_cyndaquil_d2d_reg", + "pr_fabtests_cyndaquil_d2d_reg.json") } } } } - stage ('cuda-shm-v2') { + stage ('CI_fabtests_quilava') { steps { script { - dir (RUN_LOCATION) { - run_fabtests("cuda_v2_shm", "quilava", "quilava", "1", "shm", - null, null, "h2d") - run_fabtests("cuda_v2_shm", "quilava", "quilava", "1", "shm", - null, null, "d2d") - // run_fabtests("cuda_v2_shm", "quilava ", "quilava", "1", "shm", - // null, null, "xd2d") + dir (CI_LOCATION) { + run_ci("CI_fabtests_quilava_h2d_reg", + "pr_fabtests_quilava_h2d_reg.json") + run_ci("CI_fabtests_quilava_d2d_reg", + "pr_fabtests_quilava_d2d_reg.json") } } } } - stage ('ze-shm-v3') { + stage ('CI_fabtests_charizard') { agent { node { label 'ze' } } options { skipDefaultCheckout() } steps { script { - dir (RUN_LOCATION) { - run_fabtests("ze_v3_shm", "gpu", "fabrics-ci", "1", "shm", null, - "FI_HMEM_DISABLE_P2P=1", "h2d") - run_fabtests("ze_v3_shm", "gpu", "fabrics-ci", "1", "shm", null, - "FI_HMEM_DISABLE_P2P=1", "d2d") - run_fabtests("ze_v3_shm", "gpu", "fabrics-ci", "1", "shm", null, - "FI_HMEM_DISABLE_P2P=1", "xd2d") + dir (CI_LOCATION) { + run_ci("CI_fabtests_charizard_h2d_reg", + "pr_fabtests_charizard_h2d_reg.json") + run_ci("CI_fabtests_charizard_d2d_reg", + "pr_fabtests_charizard_d2d_reg.json") + run_ci("CI_fabtests_charizard_xd2d_reg", + "pr_fabtests_charizard_xd2d_reg.json") } } } } - stage('dsa') { - when { equals expected: true, actual: DO_RUN } + stage('CI_fabtests_electric') { steps { script { - dir (RUN_LOCATION) { - run_fabtests("shm_dsa", "electric", "pikachu", "1", "shm", null, - """FI_SHM_DISABLE_CMA=1 FI_SHM_USE_DSA_SAR=1 \ - FI_LOG_LEVEL=warn""") + dir (CI_LOCATION) { + run_ci("CI_fabtests_electric_reg", "pr_fabtests_electric_reg.json") + run_ci("CI_fabtests_electric_dbg", "pr_fabtests_electric_dbg.json") + run_ci("CI_fabtests_electric_dl", "pr_fabtests_electric_dl.json") } } } From cbd8c3d8674717689d9383f352890e40dd96e07f Mon Sep 17 00:00:00 2001 From: Zach Dworkin Date: Thu, 9 May 2024 07:44:15 -0700 Subject: [PATCH 5/8] contrib/intel/jenkins: Change imb and osu to follow naming convention New CI Module will follow the "CI_" prefix naming convention to log files. Signed-off-by: Zach Dworkin --- contrib/intel/jenkins/Jenkinsfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/intel/jenkins/Jenkinsfile b/contrib/intel/jenkins/Jenkinsfile index c2558252386..65047abc007 100644 --- a/contrib/intel/jenkins/Jenkinsfile +++ b/contrib/intel/jenkins/Jenkinsfile @@ -538,38 +538,38 @@ pipeline { stage('parallel-tests') { when { equals expected: true, actual: DO_RUN } parallel { - stage ('CI_MPI_verbs-rxm_IMB') { + stage ('CI_mpi_verbs-rxm_imb') { steps { script { dir (CI_LOCATION) { - run_ci("CI_MPI_verbs-rxm_IMB", "pr_imb_water.json") + run_ci("CI_mpi_verbs-rxm_imb", "pr_imb_water.json") } } } } - stage ('CI_MPI_verbs-rxm_OSU') { + stage ('CI_mpi_verbs-rxm_osu') { steps { script { dir (CI_LOCATION) { - run_ci("CI_MPI_verbs-rxm_OSU", "pr_osu_water.json") + run_ci("CI_mpi_verbs-rxm_osu", "pr_osu_water.json") } } } } - stage ('CI_MPI_tcp_IMB') { + stage ('CI_mpi_tcp_imb') { steps { script { dir (CI_LOCATION) { - run_ci("CI_MPI_tcp_IMB", "pr_imb_grass.json") + run_ci("CI_mpi_tcp_imb", "pr_imb_grass.json") } } } } - stage ('CI_MPI_tcp_OSU') { + stage ('CI_mpi_tcp_osu') { steps { script { dir (CI_LOCATION) { - run_ci("CI_MPI_tcp_OSU", "pr_osu_grass.json") + run_ci("CI_mpi_tcp_osu", "pr_osu_grass.json") } } } From d974955df3590e5fc1b4e30e585c6f4b45cd2a9d Mon Sep 17 00:00:00 2001 From: Zach Dworkin Date: Thu, 9 May 2024 07:45:48 -0700 Subject: [PATCH 6/8] contrib/intel/jenkins: Use new CI summarizer for CI_ stages Signed-off-by: Zach Dworkin --- contrib/intel/jenkins/Jenkinsfile | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/contrib/intel/jenkins/Jenkinsfile b/contrib/intel/jenkins/Jenkinsfile index 65047abc007..6a1c063e713 100644 --- a/contrib/intel/jenkins/Jenkinsfile +++ b/contrib/intel/jenkins/Jenkinsfile @@ -105,12 +105,27 @@ def gather_logs(cluster, key, dest, source) { def address = "${env.USER}@${cluster}" try { - sh "scp -i ${key} ${address}:${source}/* ${dest}/" + sh "scp -r -i ${key} ${address}:${source}/* ${dest}/" } catch (Exception e) { echo "Caught exception ${e} when transfering files from ${cluster}" } } +def CI_summarize(verbose=false) { + if (verbose) { + sh """source ${CI_LOCATION}/${env.CI_MODULE}/venv/bin/activate;\ + python ${CI_LOCATION}/summarize.py \ + --log_directory=${env.LOG_DIR} \ + -v + """ + } else { + sh """source ${CI_LOCATION}/${env.CI_MODULE}/venv/bin/activate;\ + python ${CI_LOCATION}/summarize.py \ + --log_directory=${env.LOG_DIR} + """ + } +} + def summarize(item, verbose=false, release=false, send_mail=false) { def cmd = "${RUN_LOCATION}/summary.py --summary_item=all" if (verbose) { @@ -867,6 +882,7 @@ pipeline { gather_logs("${env.ZE_ADDR}", "${env.ZE_KEY}", "${env.LOG_DIR}", "${env.LOG_DIR}") + CI_summarize(verbose=false) summarize("all", verbose=false, release=RELEASE, send_mail=env.WEEKLY.toBoolean()) if (RELEASE) { @@ -880,11 +896,13 @@ pipeline { post { always { script { + CI_summarize() summarize("all") } } success { script { + CI_summarize(verbose=true) summarize("all", verbose=true, release=false, send_mail=env.WEEKLY.toBoolean()) } From 35d687a555a6c646675f29d339d9bed389f0c88c Mon Sep 17 00:00:00 2001 From: Zach Dworkin Date: Wed, 26 Jun 2024 10:23:41 -0700 Subject: [PATCH 7/8] contrib/intel/jenkins: Deprecate squirtle partition Squirtle nodes are being removed from our cluster so the partition needs to be deprecated. Signed-off-by: Zach Dworkin --- contrib/intel/jenkins/Jenkinsfile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/contrib/intel/jenkins/Jenkinsfile b/contrib/intel/jenkins/Jenkinsfile index 6a1c063e713..4b03a03addd 100644 --- a/contrib/intel/jenkins/Jenkinsfile +++ b/contrib/intel/jenkins/Jenkinsfile @@ -445,13 +445,13 @@ pipeline { stage ('build-water') { steps { script { - slurm_build(BUILD_MODES, "water", "water", "water") - slurm_batch("squirtle,totodile", "1", + slurm_build(BUILD_MODES, "totodile", "water", "water") + slurm_batch("totodile", "1", "${env.LOG_DIR}/build_mpich_water_log", """python$PYTHON_VERSION ${RUN_LOCATION}/build.py \ --build_item=mpich --build_hw=water""" ) - slurm_batch("water", "1", + slurm_batch("totodile", "1", "${env.LOG_DIR}/build_shmem_water_log", """python$PYTHON_VERSION ${RUN_LOCATION}/build.py \ --build_item=shmem --build_hw=water""" @@ -699,7 +699,7 @@ pipeline { } for (def mpi in MPIS) { run_middleware(providers, "mpichtestsuite", "mpichtestsuite", - "water", "squirtle,totodile", "2", "${mpi}") + "water", "totodile", "2", "${mpi}") } } } @@ -720,7 +720,7 @@ pipeline { script { dir (RUN_LOCATION) { run_middleware([["verbs", "rxm"], ["sockets", null]], "SHMEM", - "shmem", "water", "squirtle,totodile", "2") + "shmem", "water", "totodile", "2") } } } @@ -729,8 +729,10 @@ pipeline { steps { script { dir (RUN_LOCATION) { - run_middleware([["tcp", null]], "multinode_performance", - "multinode", "grass", "bulbasaur", "2") + run_middleware([["tcp", null],["sockets", null]], + "multinode_performance", "multinode", "grass", "grass", "2") + run_middleware([["verbs", "rxm"]], "multinode_performance", + "multinode", "water", "totodile", "2") } } } @@ -740,11 +742,11 @@ pipeline { script { dir (RUN_LOCATION) { run_middleware([["verbs", null]], "oneCCL", - "oneccl", "water", "squirtle,totodile", "2") + "oneccl", "water", "totodile", "2") run_middleware([["shm", null]], "oneCCL", "oneccl", "grass", "bulbasaur", "1") run_middleware([["psm3", null]], "oneCCL", - "oneccl", "water", "squirtle", "2") + "oneccl", "water", "totodile", "2") run_middleware([["tcp", null]], "oneCCL", "oneccl", "grass", "bulbasaur", "2") run_middleware([["shm", null]], "oneCCL_DSA", From 66aaea35e12ea5ee42c4eea0ec6b5b7057fe5e78 Mon Sep 17 00:00:00 2001 From: Zach Dworkin Date: Thu, 27 Jun 2024 07:22:15 -0700 Subject: [PATCH 8/8] contrib/intel/jenkins: Add log name tag to slurm_build Signed-off-by: Zach Dworkin --- contrib/intel/jenkins/Jenkinsfile | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/contrib/intel/jenkins/Jenkinsfile b/contrib/intel/jenkins/Jenkinsfile index 4b03a03addd..00063db8f7b 100644 --- a/contrib/intel/jenkins/Jenkinsfile +++ b/contrib/intel/jenkins/Jenkinsfile @@ -223,7 +223,7 @@ def generate_release_num(def branch_name, def output_loc) { """ } -def slurm_build(modes, partition, location, hw=null, additional_args=null) { +def slurm_build(modes, partition, location, tag, hw=null, additional_args=null) { def cmd = "pwd; " def prefix = "python${PYTHON_VERSION} ${RUN_LOCATION}/build.py" def libfabric = "--build_item=libfabric --build_loc=${CUSTOM_WORKSPACE}/${location}/libfabric" @@ -245,7 +245,7 @@ def slurm_build(modes, partition, location, hw=null, additional_args=null) { cmd = "${cmd} ${prefix} ${fabtests} --ofi_build_mode=${mode};" } - slurm_batch(partition, "1", "${env.LOG_DIR}/libfabric_${partition}", cmd) + slurm_batch(partition, "1", "${env.LOG_DIR}/libfabric_${tag}", cmd) } def build(item, mode=null, hw=null, additional_args=null) { @@ -445,7 +445,7 @@ pipeline { stage ('build-water') { steps { script { - slurm_build(BUILD_MODES, "totodile", "water", "water") + slurm_build(BUILD_MODES, "totodile", "water", "water", "water") slurm_batch("totodile", "1", "${env.LOG_DIR}/build_mpich_water_log", """python$PYTHON_VERSION ${RUN_LOCATION}/build.py \ @@ -462,7 +462,7 @@ pipeline { stage ('build-grass') { steps { script { - slurm_build(BUILD_MODES, "grass", "grass", "grass") + slurm_build(BUILD_MODES, "grass", "grass", "grass", "grass") slurm_batch("grass", "1", "${env.LOG_DIR}/build_mpich_grass_log", """python$PYTHON_VERSION ${RUN_LOCATION}/build.py \ @@ -479,14 +479,15 @@ pipeline { stage ('build-electric') { steps { script { - slurm_build(BUILD_MODES, "electric", "electric", "electric") + slurm_build(BUILD_MODES, "electric", "electric", "electric", + "electric") } } } stage ('build-ucx') { steps { script { - slurm_build(BUILD_MODES, "totodile", "ucx", "ucx") + slurm_build(BUILD_MODES, "totodile", "ucx", "ucx", "ucx") } } } @@ -494,16 +495,17 @@ pipeline { steps { script { slurm_build(["reg"], "cyndaquil", "cuda", "cyndaquil", - "--cuda") + "cyndaquil", "--cuda") slurm_build(["reg"], "quilava", "cuda", "quilava", - "--cuda") + "quilava", "--cuda") } } } stage ('build-iouring') { steps { script { - slurm_build(BUILD_MODES, "ivysaur", "iouring", "ivysaur") + slurm_build(BUILD_MODES, "ivysaur", "iouring", "ivysaur", + "ivysaur") } } } @@ -543,7 +545,8 @@ pipeline { build("logdir") build("builddir") build_ci() - slurm_build(BUILD_MODES, "fabrics-ci", "source", "gpu", "--gpu") + slurm_build(BUILD_MODES, "fabrics-ci", "source", "ze", "gpu", + "--gpu") } } }