No commit message

Juee14Desai · Jul 23, 2024 · b7e165e · b7e165e
1 parent 0382f9f
commit b7e165e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/contrib/intel/jenkins/Jenkinsfile b/contrib/intel/jenkins/Jenkinsfile
@@ -177,7 +177,7 @@ def checkout_ci_resources() {
       rm -rf ${env.WORKSPACE}/ci_resources && mkdir ${env.WORKSPACE}/ci_resources
     fi
 
-    git clone ${env.CI_RESOURCES} ${env.WORKSPACE}/ci_resources
+    git clone -b master ${env.JDESAI_CI_RESOURCES} ${env.WORKSPACE}/ci_resources
 
   """
 }
@@ -190,7 +190,7 @@ def checkout_ci() {
       rm -rf ${env.WORKSPACE}/ci && mkdir ${env.WORKSPACE}/ci
     fi
 
-    git clone --recurse-submodules ${env.CI} ${env.WORKSPACE}/ci
+    git clone -b master --recurse-submodules ${env.JDESAI_CI} ${env.WORKSPACE}/ci
   """
 }
 
@@ -484,7 +484,7 @@ pipeline {
             }
           }
         }
-        stage ('build-ucx') {
+        /*stage ('build-ucx') {
           steps {
             script {
               slurm_build(BUILD_MODES, "totodile", "ucx", "ucx", "ucx")
@@ -528,7 +528,7 @@ pipeline {
               }
             }
           }
-        }
+        }*/
         stage ('build-gpu') {
           agent {
             node {
@@ -556,7 +556,7 @@ 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) {
@@ -739,7 +739,7 @@ pipeline {
               }
             }
           }
-        }
+        }*/
 	      stage ('oneCCL') {
           steps {
             script {
@@ -782,7 +782,7 @@ pipeline {
             }
           }
         }
-        stage('daos_tcp') {
+        /*stage('daos_tcp') {
           agent { node { label 'daos_tcp' } }
           options { skipDefaultCheckout() }
           steps {
@@ -875,7 +875,7 @@ pipeline {
               }
             }
           }
-        }
+        }*/
       }
     }
     stage ('Summary') {

diff --git a/prov/verbs/src/verbs_info.c b/prov/verbs/src/verbs_info.c
@@ -1890,6 +1890,24 @@ void vrb_alter_info(const struct fi_info *hints, struct fi_info *info)
 	}
 }
 
+static void vrb_filter_info_by_addr_format(struct fi_info **info, int addr_format)
+{
+	struct fi_info *cur, *prev= NULL, *next = NULL;
+	for (cur = *info; cur; cur = next) {
+		next = cur->next;
+		if (!ofi_match_addr_format(cur->addr_format, addr_format)) {
+			if (prev)
+				prev->next = cur->next;
+			else
+				*info = cur->next;
+			cur->next = NULL;
+			fi_freeinfo(cur);
+		} else {
+			prev = cur;
+		}
+	}
+}
+
 int vrb_getinfo(uint32_t version, const char *node, const char *service,
 		   uint64_t flags, const struct fi_info *hints,
 		   struct fi_info **info)
@@ -1910,6 +1928,8 @@ int vrb_getinfo(uint32_t version, const char *node, const char *service,
 	ofi_alter_info(*info, hints, version);
 
 	vrb_alter_info(hints, *info);
+
+	vrb_filter_info_by_addr_format(info, hints->addr_format);
 out:
 	vrb_prof_func_end(__func__);
 	if (!ret || ret == -FI_ENOMEM || ret == -FI_ENODEV)