hwloc: do not set the HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM flag

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>

opal/mca/hwloc/base/hwloc_base_dt.c

@@ -107,7 +107,6 @@ int opal_hwloc_unpack(opal_buffer_t *buffer, void *dest,
          * explicitly set a flag so hwloc sets things up correctly
          */
         if (0 != hwloc_topology_set_flags(t, (HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM |
-                                              HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM |
                                               HWLOC_TOPOLOGY_FLAG_IO_DEVICES))) {
             rc = OPAL_ERROR;
             hwloc_topology_destroy(t);

opal/mca/hwloc/base/hwloc_base_util.c

@@ -305,8 +305,7 @@ int opal_hwloc_base_get_topology(void)
     } else if (NULL == opal_hwloc_base_topo_file) {
         if (0 != hwloc_topology_init(&opal_hwloc_topology) ||
             0 != hwloc_topology_set_flags(opal_hwloc_topology,
-                                          (HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM |
+                                          HWLOC_TOPOLOGY_FLAG_IO_DEVICES) ||
-                                           HWLOC_TOPOLOGY_FLAG_IO_DEVICES)) ||
             0 != hwloc_topology_load(opal_hwloc_topology)) {
             return OPAL_ERR_NOT_SUPPORTED;
         }
@@ -356,7 +355,6 @@ int opal_hwloc_base_set_topology(char *topofile)
      */
     if (0 != hwloc_topology_set_flags(opal_hwloc_topology,
                                       (HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM |
-                                       HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM |
                                        HWLOC_TOPOLOGY_FLAG_IO_DEVICES))) {
         hwloc_topology_destroy(opal_hwloc_topology);
         return OPAL_ERR_NOT_SUPPORTED;

orte/mca/ess/singleton/ess_singleton_module.c

@@ -15,7 +15,7 @@
  * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
  * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2016      Research Organization for Information Science
+ * Copyright (c) 2016-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *

orte/test/system/opal_hwloc.c

@@ -74,7 +74,6 @@ int main(int argc, char* argv[])
      */
     if (0 != hwloc_topology_set_flags(my_topology,
                                       (HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM |
-                                       HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM |
                                        HWLOC_TOPOLOGY_FLAG_IO_DEVICES))) {
         hwloc_topology_destroy(my_topology);
         return OPAL_ERR_NOT_SUPPORTED;