Skip to content

Minor fixes to allow compile with pre-stone age HWLOC #5

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

Merged
merged 1 commit into from
Jul 11, 2024
Merged

Minor fixes to allow compile with pre-stone age HWLOC #5

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
4 changes: 4 additions & 0 deletions src/hwloc/hwloc_base_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,7 @@ static hwloc_obj_t df_search(hwloc_topology_t topo, hwloc_obj_t start, hwloc_obj
unsigned cache_level, unsigned int nobj, unsigned int *num_objs)
{
int search_depth;
PRTE_HIDE_UNUSED_PARAMS(start);

search_depth = hwloc_get_type_depth(topo, target);
if (HWLOC_TYPE_DEPTH_MULTIPLE == search_depth) {
Expand Down Expand Up @@ -1304,6 +1305,7 @@ static int bitmap_list_snprintf_exp(char *__hwloc_restrict buf, size_t buflen,
}
}
#else
PRTE_HIDE_UNUSED_PARAMS(set, type);
if (buflen > 0) {
tmp[0] = '\0';
}
Expand Down Expand Up @@ -1876,10 +1878,12 @@ int prte_hwloc_base_topology_set_flags(hwloc_topology_t topology, unsigned long
// Blacklist the "gl" component due to potential conflicts.
// See "https://github.com/open-mpi/ompi/issues/10025" for
// an explanation
#ifdef HWLOC_VERSION_MAJOR
#if HWLOC_VERSION_MAJOR > 2
hwloc_topology_set_components(topology, HWLOC_TOPOLOGY_COMPONENTS_FLAG_BLACKLIST, "gl");
#elif HWLOC_VERSION_MAJOR == 2 && HWLOC_VERSION_MINOR >= 1
hwloc_topology_set_components(topology, HWLOC_TOPOLOGY_COMPONENTS_FLAG_BLACKLIST, "gl");
#endif
#endif
return hwloc_topology_set_flags(topology, flags);
}
Expand Down
Loading