From 456bfd7bb90cec20fadda1646436f92ef2c6b9f3 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 24 Mar 2025 22:31:58 -0400 Subject: [PATCH] trigger with --feature ml_models (need to make default) --- crates/desktop/src-tauri/Cargo.toml | 16 ++++++++++++---- .../desktop/src-tauri/src/stubs/model_cache.rs | 2 +- .../desktop/src-tauri/src/stubs/model_config.rs | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/crates/desktop/src-tauri/Cargo.toml b/crates/desktop/src-tauri/Cargo.toml index 83d504da8c..bf1cddb99f 100644 --- a/crates/desktop/src-tauri/Cargo.toml +++ b/crates/desktop/src-tauri/Cargo.toml @@ -28,7 +28,7 @@ primitives = { path = "../../lib/data/primitives" } # Internal ML # TODO: Only on Windows and Linux -ml_models = { path = "../ml_models", optional = true } +#ml_models = { path = "../ml_models", optional = true } # External #openssl = { version = "0.10", features = ["vendored"] } @@ -58,16 +58,24 @@ tokio-util = { version = "0.7", features = ["codec"] } # tracing-subscriber = { version = "0.3", features = [ "env-filter", "fmt" ] } +[target.'cfg(not(target_os = "macos"))'.dependencies] +ml_models = { path = "../ml_models" } + [dev-dependencies] libloading = "0.8.6" serial_test = "3.2.0" assertor = "0.0.3" -[target.'cfg(target_os = "macos")'.features] -default = [] +#[target.'cfg(target_os = "macos")'.features] +#default = [] +#ml_models = ["dep:ml_models"] [target.'cfg(not(target_os = "macos"))'.features] -default = ["dep:ml_models"] +default = ["ml_models"] +#ml_models = ["dep:ml_models"] + +[features] +ml_models = [] [profile.dev] incremental = true # Compile your binary in smaller steps. diff --git a/crates/desktop/src-tauri/src/stubs/model_cache.rs b/crates/desktop/src-tauri/src/stubs/model_cache.rs index 9737dc1a07..8b252a100e 100644 --- a/crates/desktop/src-tauri/src/stubs/model_cache.rs +++ b/crates/desktop/src-tauri/src/stubs/model_cache.rs @@ -1,5 +1,5 @@ #[cfg(feature = "ml_models")] -use ml_models::ml::model_cache::ModelCache; +pub use ml_models::ml::model_cache::ModelCache; #[cfg(not(feature = "ml_models"))] pub struct ModelCache { diff --git a/crates/desktop/src-tauri/src/stubs/model_config.rs b/crates/desktop/src-tauri/src/stubs/model_config.rs index 0047bb375a..55fa3e236a 100644 --- a/crates/desktop/src-tauri/src/stubs/model_config.rs +++ b/crates/desktop/src-tauri/src/stubs/model_config.rs @@ -1,5 +1,5 @@ #[cfg(feature = "ml_models")] -use ml_models::ml::model_config::ModelConfig; +pub use ml_models::ml::model_config::ModelConfig; #[cfg(not(feature = "ml_models"))] pub struct ModelConfig {