Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Raise min required HWLOC version to 2.1.0 #43

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Raise min required HWLOC version to 2.1.0 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ release=0
# List in x.y.z format.

pmix_min_version=4.2.4
hwloc_min_version=1.11.0
hwloc_min_version=2.1.0
event_min_version=2.0.21
automake_min_version=1.13.4
autoconf_min_version=2.69.0
Expand Down
1 change: 0 additions & 1 deletion src/docs/show-help-files/help-prte-hwloc-base.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ additional information may be of help:
.. code::

Message: %s
Cache level: %d

[missing-cpulist]

Expand Down
62 changes: 3 additions & 59 deletions src/hwloc/hwloc-internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Copyright (c) 2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
*
* Copyright (c) 2021-2023 Nanook Consulting. All rights reserved.
* Copyright (c) 2021-2024 Nanook Consulting All rights reserved.
* Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved.
* $COPYRIGHT$
*
Expand All @@ -28,24 +28,7 @@
#include <stdarg.h>
#include <stdint.h>
#include <hwloc.h>
#if HWLOC_API_VERSION >= 0x20000
# include <hwloc/shmem.h>
#endif

#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 <hwloc/shmem.h>

#include "src/class/pmix_list.h"
#include "src/class/pmix_value_array.h"
Expand Down Expand Up @@ -161,20 +144,6 @@ PRTE_EXPORT extern hwloc_obj_type_t prte_hwloc_levels[];
PRTE_EXPORT extern char *prte_hwloc_default_cpu_list;
PRTE_EXPORT extern bool prte_hwloc_default_use_hwthread_cpus;

#if HWLOC_API_VERSION < 0x20000
# define HWLOC_OBJ_L3CACHE HWLOC_OBJ_CACHE
# define HWLOC_OBJ_L2CACHE HWLOC_OBJ_CACHE
# define HWLOC_OBJ_L1CACHE HWLOC_OBJ_CACHE
# if HWLOC_API_VERSION < 0x10a00
# define HWLOC_OBJ_PACKAGE HWLOC_OBJ_SOCKET
# endif
# define HAVE_DECL_HWLOC_OBJ_OSDEV_COPROC 0
# define HAVE_HWLOC_TOPOLOGY_DUP 0
#else
# define HAVE_DECL_HWLOC_OBJ_OSDEV_COPROC 1
# define HAVE_HWLOC_TOPOLOGY_DUP 1
#endif

/**
* Debugging output stream
*/
Expand Down Expand Up @@ -210,20 +179,6 @@ PRTE_EXPORT extern bool prte_hwloc_synthetic_topo;
hwloc_bitmap_free(bind); \
} while (0);

#if HWLOC_API_VERSION < 0x20000
# define PRTE_HWLOC_MAKE_OBJ_CACHE(level, obj, cache_level) \
do { \
obj = HWLOC_OBJ_CACHE; \
cache_level = level; \
} while (0)
#else
# define PRTE_HWLOC_MAKE_OBJ_CACHE(level, obj, cache_level) \
do { \
obj = HWLOC_OBJ_L##level##CACHE; \
cache_level = 0; \
} while (0)
#endif

PRTE_EXPORT prte_hwloc_locality_t prte_hwloc_base_get_relative_locality(hwloc_topology_t topo,
char *cpuset1,
char *cpuset2);
Expand Down Expand Up @@ -283,17 +238,6 @@ PRTE_EXPORT hwloc_cpuset_t prte_hwloc_base_generate_cpuset(hwloc_topology_t topo

PRTE_EXPORT hwloc_cpuset_t prte_hwloc_base_filter_cpus(hwloc_topology_t topo);

/**
* Free the hwloc topology.
*/
PRTE_EXPORT unsigned int prte_hwloc_base_get_nbobjs_by_type(hwloc_topology_t topo,
hwloc_obj_type_t target,
unsigned cache_level);

PRTE_EXPORT hwloc_obj_t prte_hwloc_base_get_obj_by_type(hwloc_topology_t topo,
hwloc_obj_type_t target,
unsigned cache_level,
unsigned int instance);
PRTE_EXPORT unsigned int prte_hwloc_base_get_obj_idx(hwloc_topology_t topo, hwloc_obj_t obj);

/**
Expand Down Expand Up @@ -354,7 +298,7 @@ PRTE_EXPORT char *prte_hwloc_base_cset2str(hwloc_const_cpuset_t cpuset,

PRTE_EXPORT void prte_hwloc_get_binding_info(hwloc_const_cpuset_t cpuset,
bool use_hwthread_cpus,
hwloc_topology_t topo, int *pkgnum,
hwloc_topology_t topo, int *pkgnum,
char *cores, int sz);

/* get the hwloc object that corresponds to the given processor id and type */
Expand Down
11 changes: 0 additions & 11 deletions src/hwloc/hwloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,23 +377,12 @@ int prte_hwloc_base_set_default_binding(void *jd, void *opt)
PRTE_SET_DEFAULT_BINDING_POLICY(jdata->map->binding, PRTE_BIND_TO_PACKAGE);
} else if (HWLOC_OBJ_NUMANODE== options->maptype) {
PRTE_SET_DEFAULT_BINDING_POLICY(jdata->map->binding, PRTE_BIND_TO_NUMA);
#if HWLOC_API_VERSION < 0x20000
} else if (HWLOC_OBJ_CACHE == options->maptype) {
if (1 == options->cmaplvl) {
PRTE_SET_DEFAULT_BINDING_POLICY(jdata->map->binding, PRTE_BIND_TO_L1CACHE);
} else if (2 == options->cmaplvl) {
PRTE_SET_DEFAULT_BINDING_POLICY(jdata->map->binding, PRTE_BIND_TO_L2CACHE);
} else if (3 == options->cmaplvl) {
PRTE_SET_DEFAULT_BINDING_POLICY(jdata->map->binding, PRTE_BIND_TO_L3CACHE);
}
#else
} else if (HWLOC_OBJ_L1CACHE == options->maptype) {
PRTE_SET_DEFAULT_BINDING_POLICY(jdata->map->binding, PRTE_BIND_TO_L1CACHE);
} else if (HWLOC_OBJ_L2CACHE == options->maptype) {
PRTE_SET_DEFAULT_BINDING_POLICY(jdata->map->binding, PRTE_BIND_TO_L2CACHE);
} else if (HWLOC_OBJ_L3CACHE == options->maptype) {
PRTE_SET_DEFAULT_BINDING_POLICY(jdata->map->binding, PRTE_BIND_TO_L3CACHE);
#endif
} else if (HWLOC_OBJ_CORE == options->maptype) {
PRTE_SET_DEFAULT_BINDING_POLICY(jdata->map->binding, PRTE_BIND_TO_CORE);
} else if (HWLOC_OBJ_PU == options->maptype) {
Expand Down
Loading
Loading