New hwloc API compatibility

[pawosm01]

Summary

latest hwloc library (git upstream) has bit different API.

[pawosm01]

fixed indentation

[AndreyChurbanov]

LGTM

We will ultimately need to not ignore cache objects and use them as part of the machine topology. OK to ignore them for now.

openmp/trunk/runtime/src/kmp_settings.c

if ( ! TCR_4(__kmp_init_middle) ) {
         //
         const char *var = "KMP_AFFINITY";
 # if KMP_USE_HWLOC
         if(hwloc_topology_init(&__kmp_hwloc_topology) < 0) {
             __kmp_hwloc_error = TRUE;
             if(__kmp_affinity_verbose)
                 KMP_WARNING(AffHwlocErrorOccurred, var, "hwloc_topology_init()");
         }
+# if HWLOC_API_VERSION >= 0x00020000
+        // new hwloc API
+        hwloc_topology_set_type_filter(__kmp_hwloc_topology, HWLOC_OBJ_L1CACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
+        hwloc_topology_set_type_filter(__kmp_hwloc_topology, HWLOC_OBJ_L2CACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
+        hwloc_topology_set_type_filter(__kmp_hwloc_topology, HWLOC_OBJ_L3CACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
+        hwloc_topology_set_type_filter(__kmp_hwloc_topology, HWLOC_OBJ_L4CACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
+        hwloc_topology_set_type_filter(__kmp_hwloc_topology, HWLOC_OBJ_L5CACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
+        hwloc_topology_set_type_filter(__kmp_hwloc_topology, HWLOC_OBJ_L1ICACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
+        hwloc_topology_set_type_filter(__kmp_hwloc_topology, HWLOC_OBJ_L2ICACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
+        hwloc_topology_set_type_filter(__kmp_hwloc_topology, HWLOC_OBJ_L3ICACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
+# else
+        // old hwloc API
         hwloc_topology_ignore_type(__kmp_hwloc_topology, HWLOC_OBJ_CACHE);
 # endif
+# endif
         if ( __kmp_affinity_type == affinity_disabled ) {
             KMP_AFFINITY_DISABLE();
         }
         else if ( ! KMP_AFFINITY_CAPABLE() ) {
 # if KMP_USE_HWLOC
             const hwloc_topology_support* topology_support = hwloc_topology_get_support(__kmp_hwloc_topology);
             if(hwloc_topology_load(__kmp_hwloc_topology) < 0) {
                 __kmp_hwloc_error = TRUE;