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

Properly Route HWLOC_GET_TOPOLOGY_FUNCTION #351

Merged
merged 1 commit into from
Mar 13, 2025
Merged

Properly Route HWLOC_GET_TOPOLOGY_FUNCTION #351

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
4 changes: 4 additions & 0 deletions src/affinity/binders.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ static int qt_affinity_compact(int num_workers, hwloc_obj_t obj) {
void INTERNAL qt_affinity_init(qthread_shepherd_id_t *nbshepherds,
qthread_worker_id_t *nbworkers,
size_t *hw_par) {
#ifdef HWLOC_GET_TOPOLOGY_FUNCTION
extern void *HWLOC_GET_TOPOLOGY_FUNCTION;
topology = (hwloc_topology_t)HWLOC_GET_TOPOLOGY_FUNCTION;
#endif
// Note: the lack of a teardown routine will cause topology initialization
// to be skipped if qthreads is re-initialized
if (topology == NULL) {
Expand Down
4 changes: 4 additions & 0 deletions src/affinity/hwloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ void INTERNAL qt_affinity_init(qthread_shepherd_id_t *nbshepherds,
qthread_worker_id_t *nbworkers,
size_t *hw_par) {
if (qthread_cas(&initialized, 0, 1) == 0) {
#ifdef HWLOC_GET_TOPOLOGY_FUNCTION
extern void *HWLOC_GET_TOPOLOGY_FUNCTION;
topology = (hwloc_topology_t)HWLOC_GET_TOPOLOGY_FUNCTION;
#endif
if (topology == NULL) {
qassert(hwloc_topology_init(&topology), 0);
qassert(hwloc_topology_load(topology), 0);
Expand Down
Loading