Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
@Juee14Desai
Juee14Desai committed Mar 15, 2024
1 parent 2bca01e commit afc42d5
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 33 deletions.
53 changes: 28 additions & 25 deletions contrib/intel/jenkins/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ import groovy.transform.Field
properties([disableConcurrentBuilds(abortPrevious: true)])
@Field def DO_RUN=true
@Field def TARGET="main"
@Field def SCRIPT_LOCATION="upstream/libfabric/contrib/intel/jenkins"
@Field def SCRIPT_LOCATION="source/libfabric/contrib/intel/jenkins"
@Field def RELEASE=false
@Field def BUILD_MODES=["reg", "dbg", "dl"]
/*@Field def BUILD_MODES=["reg", "dbg", "dl"]*/
@Field def BUILD_MODES=["reg"]
@Field def PYTHON_VERSION="3.9"
@Field def TIMEOUT="7200"

Expand Down Expand Up @@ -392,7 +393,7 @@ pipeline {
stage ('parallel-builds') {
when { equals expected: true, actual: DO_RUN }
parallel {
stage ('build-water') {
/*stage ('build-water') {
steps {
script {
slurm_build(BUILD_MODES, "water", "water", "water")
Expand Down Expand Up @@ -476,7 +477,7 @@ pipeline {
}
}
}
}
}*/
stage ('build-gpu') {
agent {
node {
Expand All @@ -503,7 +504,7 @@ pipeline {
stage('parallel-tests') {
when { equals expected: true, actual: DO_RUN }
parallel {
stage('MPI_verbs-rxm_IMB') {
/*stage('MPI_verbs-rxm_IMB') {
steps {
script {
dir (RUN_LOCATION) {
Expand Down Expand Up @@ -691,23 +692,23 @@ pipeline {
}
}
}
stage ('oneCCL') {
stage ('oneCCL') {
steps {
script {
dir (RUN_LOCATION) {
run_middleware([["verbs", null]], "oneCCL",
run_middleware([["verbs", null]], "oneCCL",
"oneccl", "water", "squirtle,totodile", "2")
run_middleware([["shm", null]], "oneCCL",
"oneccl", "grass", "bulbasaur", "1")
run_middleware([["psm3", null]], "oneCCL",
"oneccl", "water", "squirtle", "2")
run_middleware([["tcp", null]], "oneCCL",
"oneccl", "grass", "bulbasaur", "2")
run_middleware([["shm", null]], "oneCCL",
"oneccl", "grass", "bulbasaur", "1")
run_middleware([["psm3", null]], "oneCCL",
"oneccl", "water", "squirtle", "2")
run_middleware([["tcp", null]], "oneCCL",
"oneccl", "grass", "bulbasaur", "2")
}
}
}
}
stage ('oneCCL-DSA') {
stage ('oneCCL-DSA') {
steps {
script {
dir (RUN_LOCATION) {
Expand All @@ -716,24 +717,26 @@ pipeline {
}
}
}
}
}*/
stage ('oneCCL-GPU-v3') {
agent { node { label 'ze' } }
options { skipDefaultCheckout() }
steps {
script {
dir (RUN_LOCATION) {
run_middleware([["tcp", null]], "oneCCL-GPU-v3", "onecclgpu",
"gpu", "fabrics-ci", "2")
run_middleware([["psm3", null]], "oneCCL-GPU-v3", "onecclgpu",
"gpu", "fabrics-ci", "2")
run_middleware([["verbs", null]], "oneCCL-GPU-v3", "onecclgpu",
/*run_middleware([["tcp", null]], "oneCCL-GPU-v3", "onecclgpu",
"gpu", "fabrics-ci", "2")
run_middleware([["psm3", null]], "oneCCL-GPU-v3", "onecclgpu",
"gpu", "fabrics-ci", "2")
run_middleware([["verbs", null]], "oneCCL-GPU-v3", "onecclgpu",
"gpu", "fabrics-ci", "2")*/
run_middleware([["shm", null]], "oneCCL-GPU-v3", "onecclgpu",
"gpu", "fabrics-ci", "2")
}
}
}
}
stage('daos_tcp') {
/*stage('daos_tcp') {
agent { node { label 'daos_tcp' } }
options { skipDefaultCheckout() }
steps {
Expand Down Expand Up @@ -833,7 +836,7 @@ pipeline {
}
}
}
}
}*/
}
}
stage ('Summary') {
Expand Down Expand Up @@ -874,7 +877,7 @@ pipeline {
node ('ze') {
dir ("${DELETE_LOCATION}/middlewares") { deleteDir() }
}
dir ("${DELETE_LOCATION}/middlewares") { deleteDir() }
/*dir ("${DELETE_LOCATION}/middlewares") { deleteDir() }*/
}
cleanup {
node ('daos_head') {
Expand All @@ -885,8 +888,8 @@ pipeline {
dir("${env.WORKSPACE}") { deleteDir() }
dir("${env.WORKSPACE}@tmp") { deleteDir() }
}
dir("${env.WORKSPACE}") { deleteDir() }
dir("${env.WORKSPACE}@tmp") { deleteDir() }
/*dir("${env.WORKSPACE}") { deleteDir() }
dir("${env.WORKSPACE}@tmp") { deleteDir() }*/
}
}
}
4 changes: 2 additions & 2 deletions contrib/intel/jenkins/build.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ def copy_build_dir(install_path):
f'{middlewares_path}/impi')
os.symlink(f'{cloudbees_config.build_dir}/ompi',
f'{middlewares_path}/ompi')
os.symlink(f'{cloudbees_config.build_dir}/oneccl_gpu',
f'{middlewares_path}/oneccl_gpu')
os.symlink(f'{cloudbees_config.build_dir}/oneCCL-2021.11.2',
f'{middlewares_path}/oneCCL-2021.11.2')

def copy_file(file_name):
if (os.path.exists(f'{workspace}/{file_name}')):
Expand Down
16 changes: 10 additions & 6 deletions contrib/intel/jenkins/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ def __init__(self, jobname, buildno, testname, hw, core_prov, fabric,
super().__init__(jobname, buildno, testname, hw, core_prov, fabric,
hosts, ofi_build_mode, user_env, log_file, None, util_prov)

self.oneccl_path = f'{self.middlewares_path}/oneccl/'
self.oneccl_path = f'{self.middlewares_path}/oneccl'
self.test_dir = f'{self.middlewares_path}/oneccl/ci_tests'
if self.util_prov:
self.prov = f"{self.core_prov}\;{self.util_prov}"
Expand Down Expand Up @@ -866,7 +866,7 @@ def export_env(self):
self.oneccl_environ['FI_SHM_DISABLE_CMA'] = '1'
self.oneccl_environ['FI_SHM_USE_DSA_SAR'] = '1'
#self.oneccl_environ['CCL_LOG_LEVEL'] = 'debug'
#self.oneccl_environ['FI_LOG_LEVEL'] = 'warn'
self.oneccl_environ['FI_LOG_LEVEL'] = 'warn'

for key, val in self.oneccl_environ.items():
environ += f"export {key}={val}; "
Expand Down Expand Up @@ -913,7 +913,7 @@ def __init__(self, jobname, buildno, testname, hw, core_prov, fabric,

self.n = 2
self.ppn = 1
self.oneccl_path = f'{self.middlewares_path}/oneccl_gpu/build'
self.oneccl_path = f'{self.middlewares_path}/oneCCL-2021.11.2/build'
if self.util_prov:
self.prov = f"{self.core_prov}\;{self.util_prov}"
else:
Expand Down Expand Up @@ -967,7 +967,11 @@ def __init__(self, jobname, buildno, testname, hw, core_prov, fabric,
def export_env(self):
environ = f"source {cloudbees_config.impi_root}/env/vars.sh "\
"-i_mpi_internal=0; "
environ += f"source {cloudbees_config.intel_compiler_root}/env/vars.sh; "
environ = f"source {cloudbees_config.intel_compiler_root}/env/vars.sh; "
#environ = f"source /home/cstbuild/intel/oneapi/setvars.sh; "
environ += f"source /home/cstbuild/cloudbees_middlewares/oneCCL-2021.11.2/build/_install/env/setvars.sh; "


for key, val in self.onecclgpu_environ.items():
environ += f"export {key}={val}; "

Expand All @@ -979,13 +983,13 @@ def export_env(self):
return environ

def cmd(self):
return f"{self.oneccl_path}/_install/bin/mpiexec "
return f"{self.oneccl_path}/_install/opt/mpi/bin/mpiexec "

def options(self):
opts = "-l "
opts += f"-n {self.n} "
opts += f"-ppn {self.ppn} "
opts += f"-hosts {self.server},{self.client} "
opts += f"-hosts pvc6,pvc6 "
return opts

@property
Expand Down

0 comments on commit afc42d5

Please sign in to comment.