Skip to content

Fix build when CUDA is enabled. #444

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
samuelkgutierrez merged 1 commit into from
Mar 11, 2026
Merged

Fix build when CUDA is enabled. #444

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
33 changes: 17 additions & 16 deletions src/qvi-nvml.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2021-2025 Triad National Security, LLC
* Copyright (c) 2021-2026 Triad National Security, LLC
* All rights reserved.
*
* This file is part of the quo-vadis project. See the LICENSE file at the
Expand All @@ -15,7 +15,7 @@
#include "qvi-hwloc.h"

#ifdef CUDAToolkit_FOUND
#include "hwloc/nvml.h"
#include "hwloc/nvml.h" // IWYU pragma: keep
#endif

int
Expand All @@ -33,7 +33,7 @@ qvi_hwloc_nvml_get_device_cpuset_by_pci_bus_id(
int rc = QV_SUCCESS;
// Because we rely on facilities that require that the given topology is the
// system's topology, we just avoid all that by just catching that here.
if (!qvi_hwloc_topo_is_this_system(hwl)) {
if (!hwl->topology_is_this_system()) {
return qvi_hwloc::bitmap_copy(
hwl->topology_get_cpuset(), cpuset.data()
);
Expand All @@ -46,20 +46,21 @@ qvi_hwloc_nvml_get_device_cpuset_by_pci_bus_id(
if (nvrc != NVML_SUCCESS) return QV_ERR_HWLOC;
// Starting from NVML 5, this API causes NVML to initialize the target GPU
// NVML may initialize additional GPUs if the target GPU is an SLI slave.
nvmlDevice_t device;
nvrc = nvmlDeviceGetHandleByPciBusId_v2(uuid.c_str(), &device);
if (nvrc != NVML_SUCCESS) {
rc = QV_ERR_HWLOC;
goto out;
}
do {
nvmlDevice_t device;
nvrc = nvmlDeviceGetHandleByPciBusId_v2(uuid.c_str(), &device);
if (qvi_unlikely(nvrc != NVML_SUCCESS)) {
rc = QV_ERR_HWLOC;
break;
}

const int hwrc = hwloc_nvml_get_device_cpuset(
hwl->topology_get(), device, cpuset.data()
);
if (hwrc != 0) {
rc = QV_ERR_HWLOC;
}
out:
const int hwrc = hwloc_nvml_get_device_cpuset(
hwl->topology_get(), device, cpuset.data()
);
if (qvi_unlikely(hwrc != 0)) {
rc = QV_ERR_HWLOC;
}
} while (false);
// These are reference counted, so always match with our call to nvmlInit.
(void)nvmlShutdown();
return rc;
Expand Down
Loading