No commit message

Juee14Desai · Mar 21, 2024 · a6956d6 · a6956d6
1 parent 993076f
commit a6956d6
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 23 deletions.
diff --git a/contrib/intel/jenkins/Jenkinsfile b/contrib/intel/jenkins/Jenkinsfile
@@ -3,7 +3,7 @@ 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 PYTHON_VERSION="3.9"
@@ -395,7 +395,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")
@@ -479,7 +479,7 @@ pipeline {
               }
             }
           }
-        }
+        }*/
         stage ('build-gpu') {
           agent {
             node {
@@ -506,7 +506,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) {
@@ -709,30 +709,30 @@ pipeline {
               }
             }
           }
-        }
+        }*/
         stage ('oneCCL-GPU-v3') {
           agent { node { label 'ze' } }
           options { skipDefaultCheckout() }
           steps {
             script {
               dir (RUN_LOCATION) {
-		            run_middleware([["tcp", null]], "oneCCL-GPU-v3", "onecclgpu",
+		            /*run_middleware([["tcp", null]], "oneCCL-GPU-v3", "onecclgpu",
 			                         "gpu", "fabrics-ci", "2", null, null,
                                "FI_HMEM_DISABLE_P2P=1")
 		            run_middleware([["psm3", null]], "oneCCL-GPU-v3", "onecclgpu",
 			                         "gpu", "fabrics-ci", "2", null, null,
                                "FI_HMEM_DISABLE_P2P=1")
 		            run_middleware([["verbs", null]], "oneCCL-GPU-v3", "onecclgpu",
                                "gpu", "fabrics-ci", "2", null, null,
-                               "FI_HMEM_DISABLE_P2P=1")
+                               "FI_HMEM_DISABLE_P2P=1")*/
                 run_middleware([["shm", null]], "oneCCL-GPU-v3", "onecclgpu",
                                "gpu", "fabrics-ci", "1", null, null,
                                "FI_HMEM_DISABLE_P2P=1")
               }
             }
           }
         }
-        stage('daos_tcp') {
+        /*stage('daos_tcp') {
           agent { node { label 'daos_tcp' } }
           options { skipDefaultCheckout() }
           steps {
@@ -832,7 +832,7 @@ pipeline {
               }
             }
           }
-        }
+        }*/
       }
     }
     stage ('Summary') {
@@ -844,7 +844,7 @@ pipeline {
           gather_logs("${env.ZE_ADDR}", "${env.ZE_KEY}", "${env.LOG_DIR}",
                       "${env.LOG_DIR}")
 
-          summarize("all", verbose=false, release=RELEASE,
+          summarize("all", verbose=true, release=RELEASE,
                     send_mail=env.WEEKLY.toBoolean())
           if (RELEASE) {
             save_summary()

diff --git a/contrib/intel/jenkins/build.py b/contrib/intel/jenkins/build.py
@@ -168,8 +168,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_gpu_test',
+			   f'{middlewares_path}/oneccl_gpu_test')
 
 def copy_file(file_name):
 	if (os.path.exists(f'{workspace}/{file_name}')):

diff --git a/contrib/intel/jenkins/tests.py b/contrib/intel/jenkins/tests.py
@@ -909,13 +909,13 @@ 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.n = 2
-        if self.core_prov == 'shm':
-            self.n = 1
-        else:
-            self.n = 2
+        self.n = 2
+        #if self.core_prov == 'shm':
+        #    self.n = 1
+        #else:
+        #    self.n = 2
         self.ppn = 1
-        self.oneccl_path = f'{self.middlewares_path}/oneccl_gpu/build'
+        self.oneccl_path = f'{self.middlewares_path}/oneccl_gpu_test/build'
         if self.util_prov:
             self.prov = f"{self.core_prov}\;{self.util_prov}"
         else:
@@ -970,6 +970,9 @@ 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.oneapi_root}/setvars.sh; "
+        environ += f"source /home/cstbuild/intel/oneapi/2024.0.1/setvars.sh; "
+        environ += f"source {self.oneccl_path}/_install/env/setvars.sh; "
         for key, val in self.onecclgpu_environ.items():
             environ += f"export {key}={val}; "
 
@@ -981,16 +984,16 @@ 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} "
-        if self.core_prov == 'shm':
-            opts += f"-hosts {self.server} "
-        else:
-            opts += f"-hosts {self.server},{self.client} "
+        #if self.core_prov == 'shm':
+        #    opts += f"-hosts {self.server} "
+        #else:
+        opts += f"-hosts {self.server},{self.client} "
         return opts
 
     @property