Fix Hwloc API Incompatibility

[jlpeyton]

Summary

Older Hwloc's (< 1.10.0) don't offer the HWLOC_OBJ_NUMANODE nor HWLOC_OBJ_PACKAGE types. Instead they are named HWLOC_OBJ_NODE and HWLOC_OBJ_SOCKET instead. This patch just defines the newer names when using an older Hwloc. Tested with 1.9.1, 1.10.1, and 1.11.6.

[AndreyChurbanov]

runtime/src/kmp.h

91

Both HWLOC 1.10 and 1.10.1 have version 0x00010a00; in 10.0 there is no HWLOC_OBJ_NUMANODE definition, but in 10.1 this definition is provided in deprecate.h header file (probably as a preparation for future renaming?).

Is it safer to use:

#ifndef HWLOC_OBJ_NUMANODE
#define HWLOC_OBJ_NUMANODE HWLOC_OBJ_NODE
#endif
#ifndef HWLOC_OBJ_PACKAGE
#define HWLOC_OBJ_PACKAGE HWLOC_OBJ_SOCKET
#endif

as opposed to version checking?

[jlpeyton]

Updated the diff. I had gotten errors when I tried that first, but now I realize that the SOCKET name is used in address2os map creation. I've changed all of them to HWLOC_OBJ_PACKAGE now and added the #ifndef method.

[AndreyChurbanov]

LGTM

runtime/src/kmp.h

 #include "kmp_safe_c_api.h"
 
 #if KMP_STATS_ENABLED
 class kmp_stats_list;
 #endif
 
 #if KMP_USE_HWLOC && KMP_AFFINITY_SUPPORTED
 # include "hwloc.h"
+# if HWLOC_API_VERSION < 0x00010a00
+#  define HWLOC_OBJ_NUMANODE HWLOC_OBJ_NODE
+#  define HWLOC_OBJ_PACKAGE HWLOC_OBJ_SOCKET
+# endif
 #endif
 
 #if KMP_ARCH_X86 || KMP_ARCH_X86_64
 #include <xmmintrin.h>
 #endif
 
 #include "kmp_version.h"
 #include "kmp_debug.h"