Use Win32 API for GPU detection, replace driver with runtime version

Author: andriiryzhkov

src/ai/ort_install.c

@@ -30,6 +30,9 @@
 #include <curl/curl.h>
 #include <gio/gio.h>
 #include <string.h>
+#ifdef _WIN32
+#include <windows.h>
+#endif
 
 // forward declarations
 static gchar *_get_rocm_version(void);
@@ -380,42 +383,59 @@ static gchar *_get_rocm_version(void)
 // GPU detection
 // ---------------------------------------------------------------------------
 
+// Get CUDA toolkit version (major.minor) from nvcc, e.g. "13.2".
+// Returns NULL if nvcc is not available.
+static gchar *_get_cuda_version(void)
+{
+  gchar *nvcc_out = NULL;
+  if(!g_spawn_command_line_sync("nvcc --version", &nvcc_out, NULL, NULL, NULL)
+     || !nvcc_out)
+    return NULL;
+  gchar *v = g_strstr_len(nvcc_out, -1, ", V");
+  gchar *result = NULL;
+  if(v)
+    result = _version_major_minor(v + 3);  // skip ", V"
+  g_free(nvcc_out);
+  return result;
+}
+
 static dt_ort_gpu_info_t *_detect_nvidia(void)
 {
-  gchar *output = NULL;
+  gchar *gpu_label = NULL;
+
 #ifdef _WIN32
-  const gchar *argv[] = { "nvidia-smi.exe",
-                          "--query-gpu=name,driver_version",
-                          "--format=csv,noheader", NULL };
-  if(!_run_argv(argv, &output))
+  // enumerate display adapters via Win32 API — no subprocess overhead
+  DISPLAY_DEVICEA dev = { .cb = sizeof(dev) };
+  for(DWORD i = 0; EnumDisplayDevicesA(NULL, i, &dev, 0); i++)
   {
-    // fallback to known absolute path (System32 is always on PATH but
-    // GUI processes occasionally lose env vars)
-    const gchar *argv2[] = { "C:\\Windows\\System32\\nvidia-smi.exe",
-                             "--query-gpu=name,driver_version",
-                             "--format=csv,noheader", NULL };
-    if(!_run_argv(argv2, &output))
-      return NULL;
+    if(strstr(dev.DeviceString, "NVIDIA"))
+    {
+      gpu_label = g_strdup(dev.DeviceString);
+      break;
+    }
   }
+  if(!gpu_label) return NULL;
 #else
-  const gchar *argv[] = { "nvidia-smi",
-                          "--query-gpu=name,driver_version",
+  // Linux: use nvidia-smi to get GPU name
+  const gchar *argv[] = { "nvidia-smi", "--query-gpu=name",
                           "--format=csv,noheader", NULL };
-  if(!_run_argv(argv, &output))
+  if(!_run_argv(argv, &gpu_label) || !gpu_label || !gpu_label[0])
+  {
+    g_free(gpu_label);
     return NULL;
+  }
 #endif
 
-  // parse "GeForce RTX 4090, 550.54.14"
-  gchar **fields = g_strsplit(output, ",", 2);
-  g_free(output);
-  if(!fields[0]) { g_strfreev(fields); return NULL; }
-
   dt_ort_gpu_info_t *info = g_new0(dt_ort_gpu_info_t, 1);
   info->vendor = DT_ORT_GPU_NVIDIA;
-  info->label = g_strdup(g_strstrip(fields[0]));
-  info->driver_version = fields[1] ? g_strdup(g_strstrip(fields[1])) : g_strdup("unknown");
+  info->label = gpu_label;
   info->download_size_mb = 200;
-  g_strfreev(fields);
+
+  gchar *cuda_ver = _get_cuda_version();
+  info->runtime_version = cuda_ver
+                          ? g_strdup_printf("CUDA %s", cuda_ver)
+                          : g_strdup("");
+  g_free(cuda_ver);
 
   // check cuDNN
   info->deps_met = TRUE;
@@ -496,7 +516,7 @@ static dt_ort_gpu_info_t *_detect_amd(void)
   dt_ort_gpu_info_t *info = g_new0(dt_ort_gpu_info_t, 1);
   info->vendor = DT_ORT_GPU_AMD;
   info->label = gpu_name ? gpu_name : g_strdup("AMD GPU");
-  info->driver_version = g_strdup_printf("ROCm %s", rocm_ver);
+  info->runtime_version = g_strdup_printf("ROCm %s", rocm_ver);
   info->download_size_mb = 300;
 
   // check MIGraphX
@@ -527,7 +547,26 @@ static dt_ort_gpu_info_t *_detect_amd(void)
 static dt_ort_gpu_info_t *_detect_intel(void)
 {
 #ifdef _WIN32
-  return NULL;  // OpenVINO EP on Windows uses DirectML instead
+  // enumerate display adapters via Win32 API — no subprocess overhead
+  DISPLAY_DEVICEA dev = { .cb = sizeof(dev) };
+  gchar *gpu_name = NULL;
+  for(DWORD i = 0; EnumDisplayDevicesA(NULL, i, &dev, 0); i++)
+  {
+    if(strstr(dev.DeviceString, "Intel"))
+    {
+      gpu_name = g_strdup(dev.DeviceString);
+      break;
+    }
+  }
+  if(!gpu_name) return NULL;
+
+  dt_ort_gpu_info_t *info = g_new0(dt_ort_gpu_info_t, 1);
+  info->vendor = DT_ORT_GPU_INTEL;
+  info->label = gpu_name;
+  info->runtime_version = g_strdup("");
+  info->deps_met = TRUE;  // OpenVINO runtime is downloaded with the ORT package
+  info->download_size_mb = 100;  // ORT 60MB + OpenVINO runtime 38MB
+  return info;
 #elif defined(__APPLE__)
   return NULL;
 #else
@@ -543,7 +582,7 @@ static dt_ort_gpu_info_t *_detect_intel(void)
   dt_ort_gpu_info_t *info = g_new0(dt_ort_gpu_info_t, 1);
   info->vendor = DT_ORT_GPU_INTEL;
   info->label = gpu_name ? gpu_name : g_strdup("Intel GPU");
-  info->driver_version = g_strdup("");
+  info->runtime_version = g_strdup("");
   info->deps_met = TRUE;  // OpenVINO wheel bundles everything
   info->download_size_mb = 150;
 
@@ -571,7 +610,7 @@ void dt_ort_gpu_info_free(dt_ort_gpu_info_t *info)
 {
   if(!info) return;
   g_free(info->label);
-  g_free(info->driver_version);
+  g_free(info->runtime_version);
   g_free(info->deps_missing);
   g_free(info->deps_hint);
   g_free(info);

src/ai/ort_install.h

@@ -33,7 +33,7 @@ typedef struct
 {
   dt_ort_gpu_vendor_t vendor;
   char *label;            // e.g. "NVIDIA GeForce RTX 4090"
-  char *driver_version;   // e.g. "550.54.14" or ROCm version
+  char *runtime_version;  // e.g. "CUDA 13.2" or "ROCm 7.2", may be ""
   gboolean deps_met;      // all runtime prerequisites satisfied
   char *deps_missing;     // human-readable list of what's missing
   char *deps_hint;        // distro-specific install command

src/gui/preferences_ai.c

@@ -1275,7 +1275,9 @@ static void _on_install_ort_clicked(GtkButton *button, gpointer user_data)
       const char *ep = (g->vendor == DT_ORT_GPU_NVIDIA) ? "CUDA"
                      : (g->vendor == DT_ORT_GPU_AMD)    ? "MIGraphX"
                      :                                     "OpenVINO";
-      gchar *entry = g_strdup_printf("%s (%s) [%s]", g->label, g->driver_version, ep);
+      gchar *entry = (g->runtime_version && g->runtime_version[0])
+                     ? g_strdup_printf("%s (%s) [%s]", g->label, g->runtime_version, ep)
+                     : g_strdup_printf("%s [%s]", g->label, ep);
       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), entry);
       g_free(entry);
     }
@@ -1304,8 +1306,8 @@ static void _on_install_ort_clicked(GtkButton *button, gpointer user_data)
     GString *msg = g_string_new(NULL);
     g_string_append_printf(msg, _("install ONNX Runtime with %s support\n\n"), ep);
     g_string_append_printf(msg, _("GPU: %s\n"), selected->label);
-    if(selected->driver_version && selected->driver_version[0])
-      g_string_append_printf(msg, _("driver: %s\n"), selected->driver_version);
+    if(selected->runtime_version && selected->runtime_version[0])
+      g_string_append_printf(msg, _("runtime: %s\n"), selected->runtime_version);
     g_string_append_printf(msg, _("download size: ~%zu MB\n"), selected->download_size_mb);
 
     if(selected->deps_missing && selected->deps_missing[0])