Fix whisper-local compilation issues after removing whisper-rs dependency

devgony · devgony · commit 61d11056cee6 · 2025-09-02T16:49:49.000+09:00
- Fix raw_cpuid API usage for CPU AVX detection
- Replace whisper_rs error types with generic WhisperError
- Create stub implementation for Whisper model functionality
- Remove whisper-rs dependencies from Cargo.lock
- Maintain API compatibility while removing problematic dependencies
diff --git a/.claude/settings.local.json b/.claude/settings.local.json
@@ -3,7 +3,8 @@
     "allow": [
       "Bash(pwsh:*)",
       "WebFetch(domain:github.com)",
-      "WebSearch"
+      "WebSearch",
+      "Bash(cmd /c:*)"
     ],
     "deny": [],
     "ask": []
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/build_with_dlls.ps1 b/build_with_dlls.ps1
@@ -0,0 +1,36 @@
+# PowerShell script to build with pre-built DLLs
+$ErrorActionPreference = "Stop"
+
+# Get the current directory
+$currentDir = Get-Location
+$dllDir = Join-Path $currentDir "apps\desktop\src-tauri\dlls"
+
+Write-Host "Setting up environment for pre-built DLLs..." -ForegroundColor Green
+Write-Host "DLL Directory: $dllDir" -ForegroundColor Cyan
+
+# Set environment variables for whisper-rs to use pre-built libraries
+$env:WHISPER_DONT_GENERATE_BINDINGS = "1"
+$env:CARGO_TARGET_DIR = "D:\temp\cargo-target"
+
+# Set library paths for Windows
+$env:LIB = "$dllDir;$env:LIB"
+$env:PATH = "$dllDir;$env:PATH"
+
+Write-Host "`nEnvironment variables set:" -ForegroundColor Green
+Write-Host "  WHISPER_DONT_GENERATE_BINDINGS = $env:WHISPER_DONT_GENERATE_BINDINGS" -ForegroundColor Yellow
+Write-Host "  Added $dllDir to LIB and PATH" -ForegroundColor Yellow
+
+Write-Host "`nAttempting to build..." -ForegroundColor Green
+
+# Clean previous build artifacts
+cargo clean --target-dir D:\temp\cargo-target
+
+# Try to build with verbose output
+cargo build --verbose 2>&1 | Tee-Object -FilePath build_log.txt
+
+if ($LASTEXITCODE -ne 0) {
+    Write-Host "`nBuild failed! Check build_log.txt for details." -ForegroundColor Red
+    exit 1
+} else {
+    Write-Host "`nBuild succeeded!" -ForegroundColor Green
+}
diff --git a/crates/whisper-local/src/error.rs b/crates/whisper-local/src/error.rs
@@ -4,8 +4,8 @@ use serde::{ser::Serializer, Serialize};
 pub enum Error {
     #[error("model_not_found")]
     ModelNotFound,
-    #[error(transparent)]
-    LocalWhisperError(#[from] whisper_rs::WhisperError),
+    #[error("whisper_error: {0}")]
+    WhisperError(String),
 }
 
 impl Serialize for Error {
diff --git a/crates/whisper-local/src/lib.rs b/crates/whisper-local/src/lib.rs
@@ -79,19 +79,18 @@ pub fn cpu_supports_avx() -> bool {
     #[cfg(target_arch = "x86_64")]
     {
         // Use CPUID to check for AVX2 support on x86_64
-        if let Ok(cpuid) = raw_cpuid::CpuId::new() {
-            if let Some(feature_info) = cpuid.get_feature_info() {
-                // Check for AVX support (bit 28 in ECX)
-                let avx_supported = feature_info.has_avx();
-                
-                // Check for AVX2 support (bit 5 in EBX of leaf 7)
-                if let Some(extended_features) = cpuid.get_extended_feature_info() {
-                    let avx2_supported = extended_features.has_avx2();
-                    return avx_supported && avx2_supported;
-                }
-                
-                return avx_supported;
+        let cpuid = raw_cpuid::CpuId::new();
+        if let Some(feature_info) = cpuid.get_feature_info() {
+            // Check for AVX support (bit 28 in ECX)
+            let avx_supported = feature_info.has_avx();
+            
+            // Check for AVX2 support (bit 5 in EBX of leaf 7)
+            if let Some(extended_features) = cpuid.get_extended_feature_info() {
+                let avx2_supported = extended_features.has_avx2();
+                return avx_supported && avx2_supported;
             }
+            
+            return avx_supported;
         }
         false
     }
diff --git a/crates/whisper-local/src/model.rs b/crates/whisper-local/src/model.rs
