checkpoint

TODO - IO_DEVICES - btl/openib - topo/treematch - revamp OBJ_CACHE v1 vs v2
open-mpi · Apr 7, 2017 · 9469c19 · 9469c19
1 parent d6e7534
commit 9469c19
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/ompi/mca/topo/treematch/treematch/tm_hwloc.c b/ompi/mca/topo/treematch/treematch/tm_hwloc.c
@@ -159,7 +159,11 @@ tm_topology_t* hwloc_to_tm(char *filename,double **pcost)
     exit(-1);
   }
 
+#if HWLOC_API_VERSION < 0x20000
   hwloc_topology_ignore_all_keep_structure(topology);
+#else
+#warning FIXME hwloc v2
+#endif
   hwloc_topology_load(topology);
 
 
@@ -229,7 +233,11 @@ tm_topology_t* get_local_topo_with_hwloc(void)
 
   /* Build the topology */
   hwloc_topology_init(&topology);
+#if HWLOC_API_VERSION < 0x20000
   hwloc_topology_ignore_all_keep_structure(topology);
+#else
+#warning FIXME hwloc v2
+#endif
   hwloc_topology_load(topology);
 
   /* Test if symetric */

diff --git a/orte/mca/rmaps/round_robin/rmaps_rr.c b/orte/mca/rmaps/round_robin/rmaps_rr.c
@@ -171,8 +171,13 @@ static int orte_rmaps_rr_map(orte_job_t *jdata)
                                           app->num_procs);
             }
         } else if (ORTE_MAPPING_BYL1CACHE == ORTE_GET_MAPPING_POLICY(jdata->map->mapping)) {
-            rc = orte_rmaps_rr_byobj(jdata, app, &node_list, num_slots,
-                                     app->num_procs, HWLOC_OBJ_CACHE, 1);
+            rc = orte_rmaps_rr_byobj(jdata, app, &node_list, num_slots, app->num_procs,
+#if HWLOC_API_VERSION < 0x20000
+                                     HWLOC_OBJ_CACHE, 1
+#else
+                                     HWLOC_OBJ_L1CACHE, 0
+#endif
+                                    );
             if (ORTE_ERR_NOT_FOUND == rc) {
                 /* if the mapper couldn't map by this object because
                  * it isn't available, but the error allows us to try
@@ -183,8 +188,13 @@ static int orte_rmaps_rr_map(orte_job_t *jdata)
                                           app->num_procs);
             }
         } else if (ORTE_MAPPING_BYL2CACHE == ORTE_GET_MAPPING_POLICY(jdata->map->mapping)) {
-            rc = orte_rmaps_rr_byobj(jdata, app, &node_list, num_slots,
-                                     app->num_procs, HWLOC_OBJ_CACHE, 2);
+            rc = orte_rmaps_rr_byobj(jdata, app, &node_list, num_slots, app->num_procs,
+#if HWLOC_API_VERSION < 0x20000
+                                     HWLOC_OBJ_CACHE, 2
+#else
+                                     HWLOC_OBJ_L2CACHE, 0
+#endif
+                                    );
             if (ORTE_ERR_NOT_FOUND == rc) {
                 /* if the mapper couldn't map by this object because
                  * it isn't available, but the error allows us to try
@@ -195,8 +205,13 @@ static int orte_rmaps_rr_map(orte_job_t *jdata)
                                           app->num_procs);
             }
         } else if (ORTE_MAPPING_BYL3CACHE == ORTE_GET_MAPPING_POLICY(jdata->map->mapping)) {
-            rc = orte_rmaps_rr_byobj(jdata, app, &node_list, num_slots,
-                                     app->num_procs, HWLOC_OBJ_CACHE, 3);
+            rc = orte_rmaps_rr_byobj(jdata, app, &node_list, num_slots, app->num_procs,
+#if HWLOC_API_VERSION < 0x20000
+                                     HWLOC_OBJ_CACHE, 3
+#else
+                                     HWLOC_OBJ_L3CACHE, 0
+#endif
+                                    );
             if (ORTE_ERR_NOT_FOUND == rc) {
                 /* if the mapper couldn't map by this object because
                  * it isn't available, but the error allows us to try