fix: map nvidia and vulkan uuid (#1954)

Co-authored-by: vansangpfiev <sang@jan.ai>

Author: vansangpfiev

engine/services/hardware_service.cc

@@ -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));
       }
     }

engine/utils/hardware/gpu/vulkan/vulkan_gpu.h

@@ -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++;
   }
 

engine/utils/hardware/gpu_info.h

@@ -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 {