refactor to pass less redundant data from ipc

src/hooks/useWarnings.ts

@@ -45,8 +45,8 @@ const checkModelWarnings = (
 };
 
 interface GpuCapabilities {
-  cuda: { supported: boolean };
-  rocm: { supported: boolean };
+  cuda: { devices: readonly string[] };
+  rocm: { devices: readonly string[] };
 }
 
 interface GpuInfo {
@@ -63,7 +63,7 @@ const checkGpuWarnings = async (
 
   if (
     backendSupport.cuda &&
-    !gpuCapabilities.cuda.supported &&
+    gpuCapabilities.cuda.devices.length === 0 &&
     gpuInfo.hasNVIDIA
   ) {
     warnings.push({
@@ -75,7 +75,7 @@ const checkGpuWarnings = async (
 
   if (
     backendSupport.rocm &&
-    !gpuCapabilities.rocm.supported &&
+    gpuCapabilities.rocm.devices.length === 0 &&
     gpuInfo.hasAMD
   ) {
     const platform = await window.electronAPI.kobold.getPlatform();

src/main/modules/hardware.ts

@@ -15,11 +15,7 @@ import type {
 import { execa } from 'execa';
 import { formatDeviceName } from '@/utils/format';
 import { platform } from 'process';
-import {
-  getVulkanInfo,
-  detectLinuxGPUViaVulkan,
-  detectVulkan,
-} from '@/utils/node/vulkan';
+import { getVulkanInfo, detectLinuxGPUViaVulkan } from '@/utils/node/vulkan';
 
 const COMMON_EXEC_OPTIONS = {
   timeout: 3000,
@@ -104,6 +100,25 @@ export async function detectGPUCapabilities() {
   return gpuCapabilitiesCache;
 }
 
+async function detectVulkan() {
+  try {
+    const vulkanInfo = await getVulkanInfo();
+
+    const devices: string[] = [];
+
+    for (const gpu of vulkanInfo.discreteGPUs) {
+      devices.push(formatDeviceName(gpu.deviceName));
+    }
+
+    return {
+      devices,
+      version: vulkanInfo.apiVersion || 'Unknown',
+    };
+  } catch {
+    return { devices: [], version: 'Unknown' };
+  }
+}
+
 async function detectCUDA() {
   try {
     const { stdout } = await execa('nvidia-smi', [], COMMON_EXEC_OPTIONS);
@@ -122,7 +137,7 @@ async function detectCUDA() {
       );
 
       if (hasError) {
-        return { supported: false, devices: [] } as const;
+        return { devices: [] } as const;
       }
 
       const devices: string[] = [];
@@ -156,16 +171,15 @@ async function detectCUDA() {
       }
 
       return {
-        supported: devices.length > 0 || !!cudaVersion,
         devices,
         version: cudaVersion,
         driverVersion,
       } as const;
     }
 
-    return { supported: false, devices: [] } as const;
+    return { devices: [] } as const;
   } catch {
-    return { supported: false, devices: [] };
+    return { devices: [] };
   }
 }
 
@@ -300,16 +314,15 @@ export async function detectROCm() {
       }
 
       return {
-        supported: devices.length > 0,
         devices,
         version,
         driverVersion,
       };
     }
 
-    return { supported: false, devices: [] };
+    return { devices: [] };
   } catch {
-    return { supported: false, devices: [] };
+    return { devices: [] };
   }
 }
 
@@ -322,19 +335,19 @@ function parseClInfoOutput(output: string) {
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i].trim();
 
-    if (line.includes('Platform Name:')) {
-      currentPlatform = line.split('Platform Name:')[1]?.trim() || '';
+    if (line.includes('Platform Name')) {
+      currentPlatform = line.split('Platform Name')[1]?.trim() || '';
       continue;
     }
 
-    if (line.includes('Device Type:') && line.includes('GPU')) {
+    if (line.includes('Device Type') && line.includes('GPU')) {
       const deviceName = findDeviceNameInClInfo(lines, i);
       const computeUnits = findComputeUnitsInClInfo(lines, i);
 
       if (deviceName && currentPlatform) {
         devices.push({
           name: formatDeviceName(deviceName),
-          isIntegrated: !isDiscreteGPU(deviceName, computeUnits),
+          isIntegrated: !isDiscreteGPU(computeUnits),
         });
       }
     }
@@ -350,6 +363,9 @@ function findDeviceNameInClInfo(lines: string[], startIndex: number) {
     j++
   ) {
     const nextLine = lines[j].trim();
+    if (nextLine.includes('Device Board Name (AMD)')) {
+      return nextLine.split('Device Board Name (AMD)')[1]?.trim() || '';
+    }
     if (nextLine.includes('Board name:')) {
       return nextLine.split('Board name:')[1]?.trim() || '';
     }
@@ -361,6 +377,9 @@ function findDeviceNameInClInfo(lines: string[], startIndex: number) {
     j++
   ) {
     const nextLine = lines[j].trim();
+    if (nextLine.startsWith('Device Name:')) {
+      return nextLine.split('Device Name:')[1]?.trim() || '';
+    }
     if (nextLine.startsWith('Name:')) {
       return nextLine.split('Name:')[1]?.trim() || '';
     }
@@ -376,30 +395,15 @@ function findComputeUnitsInClInfo(lines: string[], startIndex: number) {
     j++
   ) {
     const nextLine = lines[j].trim();
-    if (nextLine.includes('Max compute units:')) {
-      const units = nextLine.split('Max compute units:')[1]?.trim();
+    if (nextLine.includes('Max compute units')) {
+      const units = nextLine.split('Max compute units')[1]?.trim();
       return units ? parseInt(units, 10) : 0;
     }
   }
   return 0;
 }
 
-function isDiscreteGPU(deviceName: string, computeUnits: number) {
-  const lowerName = deviceName.toLowerCase();
-
-  if (
-    lowerName.includes('radeon(tm) graphics') ||
-    lowerName.includes('intel')
-  ) {
-    return false;
-  }
-
-  if (computeUnits <= 2) {
-    return false;
-  }
-
-  return true;
-}
+const isDiscreteGPU = (computeUnits: number) => computeUnits > 12;
 
 async function detectCLBlast() {
   try {
@@ -408,33 +412,17 @@ async function detectCLBlast() {
     if (stdout.trim()) {
       const devices = parseClInfoOutput(stdout);
 
-      let version = 'Unknown';
-      try {
-        const versionLine = stdout
-          .split('\n')
-          .find(
-            (line) =>
-              line.includes('OpenCL C version') ||
-              line.includes('CL_DEVICE_OPENCL_C_VERSION')
-          );
-        if (versionLine) {
-          const match = versionLine.match(/OpenCL C\s+(\d+\.\d+)/);
-          if (match) {
-            version = match[1];
-          }
-        }
-      } catch {}
+      const version = 'Available';
 
       return {
-        supported: devices.length > 0,
         devices,
         version,
       };
     }
 
-    return { supported: false, devices: [], version: 'Unknown' };
+    return { devices: [], version: 'Unknown' };
   } catch {
-    return { supported: false, devices: [], version: 'Unknown' };
+    return { devices: [], version: 'Unknown' };
   }
 }
 

src/main/modules/koboldcpp/backend.ts

@@ -106,7 +106,7 @@ export async function getAvailableBackends(includeDisabled = false) {
     const backends: BackendOption[] = [];
 
     if (backendSupport.cuda) {
-      const isSupported = hardwareCapabilities.cuda.supported;
+      const isSupported = hardwareCapabilities.cuda.devices.length > 0;
       if (isSupported || includeDisabled) {
         backends.push({
           value: 'cuda',
@@ -118,7 +118,7 @@ export async function getAvailableBackends(includeDisabled = false) {
     }
 
     if (backendSupport.rocm) {
-      const isSupported = hardwareCapabilities.rocm.supported;
+      const isSupported = hardwareCapabilities.rocm.devices.length > 0;
       if (isSupported || includeDisabled) {
         backends.push({
           value: 'rocm',
@@ -130,7 +130,7 @@ export async function getAvailableBackends(includeDisabled = false) {
     }
 
     if (backendSupport.vulkan) {
-      const isSupported = hardwareCapabilities.vulkan.supported;
+      const isSupported = hardwareCapabilities.vulkan.devices.length > 0;
       if (isSupported || includeDisabled) {
         backends.push({
           value: 'vulkan',
@@ -142,7 +142,7 @@ export async function getAvailableBackends(includeDisabled = false) {
     }
 
     if (backendSupport.clblast) {
-      const isSupported = hardwareCapabilities.clblast.supported;
+      const isSupported = hardwareCapabilities.clblast.devices.length > 0;
       if (isSupported || includeDisabled) {
         backends.push({
           value: 'clblast',

src/types/hardware.d.ts

@@ -14,24 +14,20 @@ export interface SystemMemoryInfo {
 
 export interface GPUCapabilities {
   cuda: {
-    readonly supported: boolean;
     readonly devices: readonly string[];
     readonly version?: string;
     readonly driverVersion?: string;
   };
   rocm: {
-    readonly supported: boolean;
     readonly devices: readonly string[];
     readonly version?: string;
     readonly driverVersion?: string;
   };
   vulkan: {
-    readonly supported: boolean;
     readonly devices: readonly string[];
     readonly version?: string;
   };
   clblast: {
-    readonly supported: boolean;
     readonly devices: readonly CLBlastDevice[];
     readonly version?: string;
   };

src/utils/node/vulkan.ts

@@ -161,23 +161,3 @@ export async function detectLinuxGPUViaVulkan() {
     };
   }
 }
-
-export async function detectVulkan() {
-  try {
-    const vulkanInfo = await getVulkanInfo();
-
-    const devices: string[] = [];
-
-    for (const gpu of vulkanInfo.discreteGPUs) {
-      devices.push(formatDeviceName(gpu.deviceName));
-    }
-
-    return {
-      supported: devices.length > 0,
-      devices,
-      version: vulkanInfo.apiVersion || 'Unknown',
-    };
-  } catch {
-    return { supported: false, devices: [], version: 'Unknown' };
-  }
-}

src/utils/systemInfo.ts

@@ -62,7 +62,7 @@ export const createDriverItems = (hardwareInfo: HardwareInfo) => {
     ];
   }
 
-  if (gpuCapabilities.cuda.supported) {
+  if (gpuCapabilities.cuda.devices.length > 0) {
     items.push({
       label: 'CUDA',
       value: gpuCapabilities.cuda.version
@@ -78,7 +78,7 @@ export const createDriverItems = (hardwareInfo: HardwareInfo) => {
     }
   }
 
-  if (gpuCapabilities.rocm.supported) {
+  if (gpuCapabilities.rocm.devices.length > 0) {
     items.push({
       label: 'ROCm',
       value: gpuCapabilities.rocm.version
@@ -94,7 +94,7 @@ export const createDriverItems = (hardwareInfo: HardwareInfo) => {
     }
   }
 
-  if (gpuCapabilities.vulkan.supported) {
+  if (gpuCapabilities.vulkan.devices.length > 0) {
     items.push({
       label: 'Vulkan',
       value: gpuCapabilities.vulkan.version
@@ -108,7 +108,7 @@ export const createDriverItems = (hardwareInfo: HardwareInfo) => {
     });
   }
 
-  if (gpuCapabilities.clblast.supported) {
+  if (gpuCapabilities.clblast.devices.length > 0) {
     items.push({
       label: 'CLBlast',
       value: gpuCapabilities.clblast.version