checkpoint

Author: ggouaillardet

opal/mca/hwloc/base/base.h

@@ -290,6 +290,7 @@ OPAL_DECLSPEC opal_hwloc_locality_t opal_hwloc_compute_relative_locality(char *l
 
 OPAL_DECLSPEC int opal_hwloc_base_topology_export_xmlbuffer(hwloc_topology_t topology, char **xmlpath, int *buflen);
 
+OPAL_DECLSPEC int opal_hwloc_base_topology_set_flags (hwloc_topology_t topology, unsigned long flags, bool io);
 END_C_DECLS
 
 #endif /* OPAL_HWLOC_BASE_H */

opal/mca/hwloc/base/hwloc_base_dt.c

@@ -106,11 +106,7 @@ int opal_hwloc_unpack(opal_buffer_t *buffer, void *dest,
         /* since we are loading this from an external source, we have to
          * explicitly set a flag so hwloc sets things up correctly
          */
-        if (0 != hwloc_topology_set_flags(t, (HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM
-#if HWLOC_API_VERSION < 0x20000
-                                              | HWLOC_TOPOLOGY_FLAG_IO_DEVICES
-#endif
-                                             ))) {
+        if (0 != opal_hwloc_base_topology_set_flags(t, HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM, true)) {
             rc = OPAL_ERROR;
             hwloc_topology_destroy(t);
             goto cleanup;

opal/mca/hwloc/base/hwloc_base_util.c

@@ -187,12 +187,9 @@ int opal_hwloc_base_get_topology(void)
         /* since we are loading this from an external source, we have to
          * explicitly set a flag so hwloc sets things up correctly
          */
-        if (0 != hwloc_topology_set_flags(opal_hwloc_topology,
-                                         (HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM
-#if HWLOC_API_VERSION < 0x20000
-                                          | HWLOC_TOPOLOGY_FLAG_IO_DEVICES
-#endif
-                                         ))) {
+        if (0 != opal_hwloc_base_topology_set_flags(opal_hwloc_topology,
+                                                    HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM,
+                                                    true)) {
             hwloc_topology_destroy(opal_hwloc_topology);
             free(val);
             return OPAL_ERROR;
@@ -206,10 +203,7 @@ int opal_hwloc_base_get_topology(void)
         free(val);
     } else if (NULL == opal_hwloc_base_topo_file) {
         if (0 != hwloc_topology_init(&opal_hwloc_topology) ||
-#if HWLOC_API_VERSION < 0x20000
-            0 != hwloc_topology_set_flags(opal_hwloc_topology,
-                                          HWLOC_TOPOLOGY_FLAG_IO_DEVICES) ||
-#endif
+            0 != opal_hwloc_base_topology_set_flags(opal_hwloc_topology, 0, true) ||
             0 != hwloc_topology_load(opal_hwloc_topology)) {
             return OPAL_ERR_NOT_SUPPORTED;
         }
@@ -253,12 +247,9 @@ int opal_hwloc_base_set_topology(char *topofile)
     /* since we are loading this from an external source, we have to
      * explicitly set a flag so hwloc sets things up correctly
      */
-    if (0 != hwloc_topology_set_flags(opal_hwloc_topology,
-                                      (HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM
-#if HWLOC_API_VERSION < 0x20000
-                                       | HWLOC_TOPOLOGY_FLAG_IO_DEVICES
-#endif
-                                      ))) {
+    if (0 != opal_hwloc_base_topology_set_flags(opal_hwloc_topology,
+                                                HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM,
+                                                true)) {
         hwloc_topology_destroy(opal_hwloc_topology);
         return OPAL_ERR_NOT_SUPPORTED;
     }
@@ -2346,3 +2337,14 @@ int opal_hwloc_base_topology_export_xmlbuffer(hwloc_topology_t topology, char **
 #endif
 }
 
+int opal_hwloc_base_topology_set_flags (hwloc_topology_t topology, unsigned long flags, bool io) {
+    if (io) {
+#if HWLOC_API_VERSION < 0x20000
+        flags |= HWLOC_TOPOLOGY_FLAG_IO_DEVICES;
+#else
+        int ret = hwloc_topology_set_io_types_filter(topology, HWLOC_TYPE_FILTER_KEEP_IMPORTANT);
+        if (0 != ret) return ret;
+#endif
+    }
+    return hwloc_topology_set_flags(topology, flags);
+}

orte/mca/ess/singleton/ess_singleton_module.c

@@ -288,12 +288,8 @@ static int rte_init(void)
         /* since we are loading this from an external source, we have to
          * explicitly set a flag so hwloc sets things up correctly
          */
-        if (0 != hwloc_topology_set_flags(opal_hwloc_topology,
-                                         (HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM
-#if HWLOC_API_VERSION < 0x20000
-                                          | HWLOC_TOPOLOGY_FLAG_IO_DEVICES
-#endif
-                                         ))) {
+        if (0 != opal_hwloc_base_topology_set_flags(opal_hwloc_topology,
+                                         HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM, true)) {
             ret = OPAL_ERROR;
             hwloc_topology_destroy(opal_hwloc_topology);
             free(val);

orte/mca/ras/simulator/ras_sim_module.c

@@ -135,7 +135,7 @@ static int allocate(orte_job_t *jdata, opal_list_t *nodes)
             /* since we are loading this from an external source, we have to
              * explicitly set a flag so hwloc sets things up correctly
              */
-            if (0 != hwloc_topology_set_flags(topo, HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM)) {
+            if (0 != opal_hwloc_base_topology_set_flags(topo, HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM, false)) {
                 orte_show_help("help-ras-simulator.txt",
                                "hwloc API fail", true,
                                __FILE__, __LINE__, "hwloc_topology_set_flags");

orte/test/system/opal_hwloc.c

@@ -72,9 +72,8 @@ int main(int argc, char* argv[])
     /* since we are loading this from an external source, we have to
      * explicitly set a flag so hwloc sets things up correctly
      */
-    if (0 != hwloc_topology_set_flags(my_topology,
-                                      (HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM |
-                                       HWLOC_TOPOLOGY_FLAG_IO_DEVICES))) {
+    if (0 != opal_hwloc_base_topology_set_flags(my_topology,
+                                                HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM)) {
         hwloc_topology_destroy(my_topology);
         return OPAL_ERR_NOT_SUPPORTED;
     }