Skip to content
This repository was archived by the owner on Jul 4, 2025. It is now read-only.

fix: map nvidia and vulkan uuid #1954

Merged
merged 1 commit into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 engine/services/hardware_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ std::vector<int> HardwareService::GetCudaConfig() {
// Map uuid back to nvidia id
for (auto const& uuid : uuids) {
for (auto const& ngpu : nvidia_gpus) {
if (uuid == ngpu.uuid) {
if (ngpu.uuid.find(uuid) != std::string::npos) {
res.push_back(std::stoi(ngpu.id));
}
}
Expand Down
22 changes: 10 additions & 12 deletions engine/utils/hardware/gpu/vulkan/vulkan_gpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -421,18 +421,16 @@ inline cpp::result<std::vector<cortex::hw::GPU>, std::string> GetGpuInfoList() {
#endif
int free_vram_MiB =
total_vram_MiB > used_vram_MiB ? total_vram_MiB - used_vram_MiB : 0;
if (total_vram_MiB > 0) {
gpus.emplace_back(cortex::hw::GPU{
.id = std::to_string(id),
.device_id = device_properties.deviceID,
.name = device_properties.deviceName,
.version = std::to_string(device_properties.driverVersion),
.add_info = cortex::hw::AmdAddInfo{},
.free_vram = free_vram_MiB,
.total_vram = total_vram_MiB,
.uuid = uuid_to_string(device_id_properties.deviceUUID),
.vendor = GetVendorStr(device_properties.vendorID)});
}
gpus.emplace_back(cortex::hw::GPU{
.id = std::to_string(id),
.device_id = device_properties.deviceID,
.name = device_properties.deviceName,
.version = std::to_string(device_properties.driverVersion),
.add_info = cortex::hw::AmdAddInfo{},
.free_vram = free_vram_MiB,
.total_vram = total_vram_MiB,
.uuid = uuid_to_string(device_id_properties.deviceUUID),
.vendor = GetVendorStr(device_properties.vendorID)});
id++;
}

Expand Down
9 changes: 9 additions & 0 deletions engine/utils/hardware/gpu_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@ inline std::vector<GPU> GetGPUInfo() {
}
}

// Erase invalid GPUs
for (std::vector<cortex::hw::GPU>::iterator it = vulkan_gpus.begin();
it != vulkan_gpus.end();) {
if ((*it).total_vram <= 0)
it = vulkan_gpus.erase(it);
else
++it;
}

if (use_vulkan_info) {
return vulkan_gpus;
} else {
Expand Down
Loading