build(android): split GPU acceleration into optional features
Both `kon-transcription` and `kon-llm` previously hardcoded their native acceleration features in Cargo.toml — `whisper-rs` with `vulkan`, `llama-cpp-2` with `openmp` + `vulkan`. That worked everywhere desktop ships (Linux/macOS/Windows all have Vulkan via MoltenVK on Mac), but it made an Android build structurally impossible: NDK builds against drivers that vary wildly across SoCs (Adreno OK, Mali patchy, PowerVR worse), and some older devices have no Vulkan at all. Roadmap step 0 from the Android plan: make the GPU acceleration opt-in so a CPU-only target compiles. Reuses the existing pattern that README's "future Windows non-AVX2 build" comment hinted at. - kon-transcription: new `whisper-vulkan` feature gates `whisper-rs/vulkan` via the optional-syntax `whisper-rs?/vulkan`. Default features stay as `["whisper", "whisper-vulkan"]` so desktop is unchanged. - kon-llm: new `gpu-vulkan` and `openmp` features each gate the matching `llama-cpp-2` feature. Default stays `["gpu-vulkan", "openmp"]`. They are independent so an Android Vulkan build can opt into vulkan without openmp (NDK OpenMP linking has known cross-version fragility). CPU-only build invocations: cargo build -p kon-transcription --no-default-features --features whisper cargo build -p kon-llm --no-default-features Verified: all 91 tests in the buildable-in-sandbox crates still pass. The two crates whose Cargo.toml changed (kon-transcription, kon-llm) can't be compiled in this sandbox (ort-sys CDN + cmake-built llama.cpp); CI's Linux/macOS/Windows builders will exercise the default-feature path exactly as before. https://claude.ai/code/session_0189xUb6ie6t9qHkzatGZ9Rb
This commit is contained in:
@@ -3,11 +3,22 @@ name = "kon-llm"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
# Default desktop build keeps the existing openmp + vulkan acceleration.
|
||||||
|
# Mobile / CPU-only targets can drop one or both via:
|
||||||
|
# cargo build -p kon-llm --no-default-features
|
||||||
|
# These are independent so an Android Vulkan build can opt into vulkan
|
||||||
|
# without openmp (the NDK ships OpenMP libs but the toolchain configuration
|
||||||
|
# is fragile across NDK versions).
|
||||||
|
default = ["gpu-vulkan", "openmp"]
|
||||||
|
gpu-vulkan = ["llama-cpp-2/vulkan"]
|
||||||
|
openmp = ["llama-cpp-2/openmp"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
kon-core = { path = "../core" }
|
kon-core = { path = "../core" }
|
||||||
encoding_rs = "0.8"
|
encoding_rs = "0.8"
|
||||||
futures-util = "0.3"
|
futures-util = "0.3"
|
||||||
llama-cpp-2 = { version = "0.1.144", default-features = false, features = ["openmp", "vulkan"] }
|
llama-cpp-2 = { version = "0.1.144", default-features = false }
|
||||||
num_cpus = "1"
|
num_cpus = "1"
|
||||||
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "stream"] }
|
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "stream"] }
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
|
|||||||
@@ -6,13 +6,19 @@ description = "Speech-to-text engine wrappers, model management, and inference c
|
|||||||
build = "build.rs"
|
build = "build.rs"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
# Whisper backend (direct whisper-rs, vulkan-accelerated). Default on —
|
# Whisper backend (direct whisper-rs). Default on — gating it exists so
|
||||||
# gating it exists so a future Windows non-AVX2 build, or a cloud-only
|
# a future Windows non-AVX2 build, or a cloud-only ASR configuration,
|
||||||
# ASR configuration, can drop whisper-rs-sys entirely per brief item
|
# can drop whisper-rs-sys entirely per brief item #13. Disabling this
|
||||||
# #13. Disabling this feature also drops the WhisperRsBackend module
|
# feature also drops the WhisperRsBackend module and the load_whisper
|
||||||
# and the load_whisper entry point.
|
# entry point.
|
||||||
default = ["whisper"]
|
#
|
||||||
|
# `whisper-vulkan` is a separate feature so a non-Vulkan target (Android
|
||||||
|
# without GPU drivers, a CPU-only Windows build) can pull in whisper-rs
|
||||||
|
# but skip the Vulkan backend. Build CPU-only with:
|
||||||
|
# cargo build -p kon-transcription --no-default-features --features whisper
|
||||||
|
default = ["whisper", "whisper-vulkan"]
|
||||||
whisper = ["dep:whisper-rs", "dep:num_cpus"]
|
whisper = ["dep:whisper-rs", "dep:num_cpus"]
|
||||||
|
whisper-vulkan = ["whisper-rs?/vulkan"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
kon-core = { path = "../core" }
|
kon-core = { path = "../core" }
|
||||||
@@ -30,8 +36,9 @@ futures-util = "0.3"
|
|||||||
# Download integrity verification
|
# Download integrity verification
|
||||||
sha2 = "0.10"
|
sha2 = "0.10"
|
||||||
|
|
||||||
# Gated behind the `whisper` feature (see [features] above).
|
# Gated behind the `whisper` feature (see [features] above). Vulkan is
|
||||||
whisper-rs = { version = "0.16", default-features = false, features = ["vulkan"], optional = true }
|
# additive via the `whisper-vulkan` feature so non-GPU targets can drop it.
|
||||||
|
whisper-rs = { version = "0.16", default-features = false, optional = true }
|
||||||
|
|
||||||
# Direct whisper-rs backend (WhisperRsBackend): thread pool sizing.
|
# Direct whisper-rs backend (WhisperRsBackend): thread pool sizing.
|
||||||
# Gated alongside whisper-rs since no other code in this crate needs it.
|
# Gated alongside whisper-rs since no other code in this crate needs it.
|
||||||
|
|||||||
Reference in New Issue
Block a user