revert to stable 0.75

Author: devgony

.cargo/config.toml

@@ -1,11 +1,8 @@
-[target.x86_64-pc-windows-msvc]
-linker = 'link.exe'
-
-[build]
-target-dir = 'D:/temp/cargo-target'
-
 [env]
-# Ensure we use the correct toolchain paths
-CC_x86_64_pc_windows_msvc = 'cl.exe'
-CXX_x86_64_pc_windows_msvc = 'cl.exe'
-AR_x86_64_pc_windows_msvc = 'lib.exe'
+MACOSX_DEPLOYMENT_TARGET = { value = "14.2", force = true }
+
+[target.'cfg(all(windows, target_env = "msvc"))']
+rustflags = [
+  "-C",
+  "target-feature=-crt-static",
+]

Cargo.lock

@@ -29,7 +29,6 @@ hypr-db-user = { workspace = true }
 hypr-host = { workspace = true }
 hypr-intercept = { workspace = true }
 hypr-turso = { workspace = true }
-hypr-whisper-local = { workspace = true }
 hypr-whisper-local-model = { workspace = true }
 
 tauri-plugin-analytics = { workspace = true }

apps/desktop/src-tauri/Cargo.toml

@@ -79,10 +79,3 @@ pub fn set_individualization_needed<R: tauri::Runtime>(
         .set(StoreKey::IndividualizationNeeded, v)
         .map_err(|e| e.to_string())
 }
-
-#[tauri::command]
-#[specta::specta]
-#[cfg(target_os = "windows")]
-pub fn check_cpu_avx_support() -> Result<bool, String> {
-    Ok(hypr_whisper_local::cpu_supports_avx())
-}

apps/desktop/src-tauri/src/commands.rs

@@ -15,10 +15,6 @@ use tracing_subscriber::{
 
 #[tokio::main]
 pub async fn main() {
-    // Set up CPU-aware DLL loading for Windows before any whisper-rs initialization
-    #[cfg(target_os = "windows")]
-    setup_cpu_aware_dll_loading();
-
     tauri::async_runtime::set(tokio::runtime::Handle::current());
 
     {
@@ -357,7 +353,7 @@ fn create_quit_handler(app_handle: tauri::AppHandle) -> impl Fn() -> bool {
 }
 
 fn make_specta_builder<R: tauri::Runtime>() -> tauri_specta::Builder<R> {
-    let mut builder = tauri_specta::Builder::<R>::new()
+    tauri_specta::Builder::<R>::new()
         .commands(tauri_specta::collect_commands![
             commands::sentry_dsn::<tauri::Wry>,
             commands::is_onboarding_needed::<tauri::Wry>,
@@ -366,45 +362,8 @@ fn make_specta_builder<R: tauri::Runtime>() -> tauri_specta::Builder<R> {
             commands::set_autostart::<tauri::Wry>,
             commands::is_individualization_needed::<tauri::Wry>,
             commands::set_individualization_needed::<tauri::Wry>,
-        ]);
-
-    #[cfg(target_os = "windows")]
-    {
-        builder = builder.commands(tauri_specta::collect_commands![
-            commands::check_cpu_avx_support,
-        ]);
-    }
-
-    builder.error_handling(tauri_specta::ErrorHandlingMode::Throw)
-}
-
-/// Set up CPU-aware DLL loading for Windows to ensure compatibility across different systems
-#[cfg(target_os = "windows")]
-fn setup_cpu_aware_dll_loading() {
-    use std::path::PathBuf;
-    use hypr_whisper_local::cpu_supports_avx;
-    
-    // Select the appropriate DLL file in the same directory as the executable
-    let dll_filename = if cpu_supports_avx() {
-        tracing::info!("CPU supports AVX2, using optimized whisper DLL");
-        "whisper_avx.dll"
-    } else {
-        tracing::info!("CPU does not support AVX2, using scalar whisper DLL");
-        "whisper_scalar.dll"
-    };
-    
-    let dll_path = std::path::PathBuf::from("./").join(dll_filename);
-    
-    // Add the current directory to PATH if the DLL exists
-    if dll_path.exists() {
-        let current_path = std::env::var("PATH").unwrap_or_default();
-        let new_path = format!(".;{}", current_path);
-        std::env::set_var("PATH", new_path);
-        
-        tracing::info!("Updated PATH to include current directory for DLL: {}", dll_filename);
-    } else {
-        tracing::warn!("DLL file not found: {} - using system defaults", dll_path.display());
-    }
+        ])
+        .error_handling(tauri_specta::ErrorHandlingMode::Throw)
 }
 
 #[cfg(test)]

apps/desktop/src-tauri/src/lib.rs

@@ -6,14 +6,13 @@ edition = "2021"
 # https://github.com/tazz4843/whisper-rs/blob/e3d67d5/Cargo.toml
 [features]
 default = []
-# Features kept for compatibility but without whisper-rs dependency
-coreml = []
-cuda = []
-hipblas = []
-openblas = []
-metal = []
-vulkan = []
-openmp = []
+coreml = ["whisper-rs/coreml"]
+cuda = ["whisper-rs/cuda"]
+hipblas = ["whisper-rs/hipblas"]
+openblas = ["whisper-rs/openblas"]
+metal = ["whisper-rs/metal"]
+vulkan = ["whisper-rs/vulkan"]
+openmp = ["whisper-rs/openmp"]
 
 [dev-dependencies]
 hypr-data = { workspace = true }
@@ -29,7 +28,7 @@ hypr-whisper = { workspace = true }
 dasp = { workspace = true }
 kalosm-sound = { workspace = true, default-features = false }
 rodio = { workspace = true }
-raw-cpuid = "11.0.1"
+whisper-rs = { version = "0.15.0", features = ["raw-api", "tracing_backend"] }
 
 futures-util = { workspace = true }
 tracing = { workspace = true }

crates/whisper-local/Cargo.toml

@@ -4,8 +4,8 @@ use serde::{ser::Serializer, Serialize};
 pub enum Error {
     #[error("model_not_found")]
     ModelNotFound,
-    #[error("whisper_error: {0}")]
-    WhisperError(String),
+    #[error(transparent)]
+    LocalWhisperError(#[from] whisper_rs::WhisperError),
 }
 
 impl Serialize for Error {

crates/whisper-local/src/error.rs

@@ -19,13 +19,7 @@ pub struct GgmlBackend {
 }
 
 // https://github.com/ggml-org/llama.cpp/blob/3a9457d/common/arg.cpp#L2300
-// Temporarily disabled until whisper-rs builds correctly
 pub fn list_ggml_backends() -> Vec<GgmlBackend> {
-    // Return empty list for now to allow building without whisper-rs
-    Vec::new()
-    
-    // TODO: Re-enable when whisper-rs builds correctly
-    /*
     use whisper_rs::whisper_rs_sys::{
         ggml_backend_dev_count, ggml_backend_dev_description, ggml_backend_dev_get,
         ggml_backend_dev_memory, ggml_backend_dev_name, ggml_backend_dev_type,
@@ -70,33 +64,4 @@ pub fn list_ggml_backends() -> Vec<GgmlBackend> {
     }
 
     devices
-    */
-}
-
-/// Check if the CPU supports AVX2 instructions for optimal whisper-rs performance
-/// Returns true if AVX2 is supported, false otherwise
-pub fn cpu_supports_avx() -> bool {
-    #[cfg(target_arch = "x86_64")]
-    {
-        // Use CPUID to check for AVX2 support on x86_64
-        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
-    }
-    #[cfg(not(target_arch = "x86_64"))]
-    {
-        // For non-x86_64 architectures, assume no AVX support
-        false
-    }
 }