Protect against stone age HWLOC versions

Provide a missing function in cases where we are building against HWLOC pre-v1.10. Signed-off-by: Ralph Castain <[email protected]> (cherry picked from commit 58650f8)
openpmix · Jan 24, 2022 · bd34aee · bd34aee
1 parent 571a4f3
commit bd34aee
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/hwloc/hwloc-internal.h b/src/hwloc/hwloc-internal.h
@@ -7,7 +7,7 @@
  * Copyright (c) 2018      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  *
- * Copyright (c) 2021      Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -31,10 +31,20 @@
 #    include <hwloc/shmem.h>
 #endif
 
-#if HWLOC_API_VERSION < 0x00010b00
+#if HWLOC_API_VERSION < 0x10b00
 #define HWLOC_OBJ_NUMANODE HWLOC_OBJ_NODE
 #define HWLOC_OBJ_PACKAGE HWLOC_OBJ_SOCKET
 #endif
+#if HWLOC_API_VERSION < 0x10a00
+static inline hwloc_obj_t hwloc_get_numanode_obj_by_os_index(hwloc_topology_t topology, unsigned os_index)
+{
+    hwloc_obj_t obj = NULL;
+    while ((obj = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_NUMANODE, obj)) != NULL)
+        if (obj->os_index == os_index)
+            return obj;
+    return NULL;
+}
+#endif
 
 #include "src/class/prte_list.h"
 #include "src/class/prte_value_array.h"