|
13 | 13 | * Copyright (c) 2011-2018 Cisco Systems, Inc. All rights reserved
|
14 | 14 | * Copyright (c) 2012-2017 Los Alamos National Security, LLC.
|
15 | 15 | * All rights reserved.
|
16 |
| - * Copyright (c) 2013-2018 Intel, Inc. All rights reserved. |
| 16 | + * Copyright (c) 2013-2019 Intel, Inc. All rights reserved. |
17 | 17 | * Copyright (c) 2015-2017 Research Organization for Information Science
|
18 | 18 | * and Technology (RIST). All rights reserved.
|
19 |
| - * Copyright (C) 2018 Mellanox Technologies, Ltd. |
| 19 | + * Copyright (C) 2018 Mellanox Technologies, Ltd. |
20 | 20 | * All rights reserved.
|
21 | 21 | * Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
|
22 | 22 | * Copyright (c) 2019 IBM Corporation. All rights reserved.
|
@@ -1858,8 +1858,9 @@ static void sort_by_dist(hwloc_topology_t topo, char* device_name, opal_list_t *
|
1858 | 1858 | hwloc_obj_t root = NULL;
|
1859 | 1859 | int depth;
|
1860 | 1860 | unsigned i;
|
1861 |
| -#endif |
| 1861 | +#else |
1862 | 1862 | unsigned distances_nr = 0;
|
| 1863 | +#endif |
1863 | 1864 |
|
1864 | 1865 | for (device_obj = hwloc_get_obj_by_type(topo, HWLOC_OBJ_OS_DEVICE, 0); device_obj; device_obj = hwloc_get_next_osdev(topo, device_obj)) {
|
1865 | 1866 | if (device_obj->attr->osdev.type == HWLOC_OBJ_OSDEV_OPENFABRICS
|
@@ -1890,7 +1891,7 @@ static void sort_by_dist(hwloc_topology_t topo, char* device_name, opal_list_t *
|
1890 | 1891 |
|
1891 | 1892 | /* find distance matrix for all numa nodes */
|
1892 | 1893 | #if HWLOC_API_VERSION < 0x20000
|
1893 |
| - distances = hwloc_get_whole_distance_matrix_by_type(topo, HWLOC_OBJ_NODE); |
| 1894 | + distances = (struct hwloc_distances_s*)hwloc_get_whole_distance_matrix_by_type(topo, HWLOC_OBJ_NODE); |
1894 | 1895 | if (NULL == distances) {
|
1895 | 1896 | /* we can try to find distances under group object. This info can be there. */
|
1896 | 1897 | depth = hwloc_get_type_depth(topo, HWLOC_OBJ_NODE);
|
|
0 commit comments