A high-performance inference engine for AI models
remove audio feature and switch runners (#332)
uuuvn119e7ef7abdc
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.ymlindex 448bb474b..4c6bb1285 100644--- a/.github/workflows/tests.yml+++ b/.github/workflows/tests.yml@@ -23,7 +23,7 @@ defaults:jobs:linters:name: linters- runs-on: [ self-hosted, macos, x64, mac, m3max ]+ runs-on: macos-26steps:- uses: actions/checkout@v6@@ -51,15 +51,14 @@ jobs:run: cargo deny checktests:- name: ${{ matrix.backend }} ${{ matrix.tracing && ' (tracing)' || '' }} ${{ matrix.audio && ' (audio-runtime)' || '' }}- runs-on: [ self-hosted, macos, x64, mac, m3max, runner1 ]+ name: ${{ matrix.backend }} ${{ matrix.tracing && ' (tracing)' || '' }}+ runs-on: [ self-hosted, macos, mac, arm64 ]if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}strategy:matrix:backend: [ 'cpu', 'metal' ]tracing: [ false, true ]- audio: [ false, true ]env:CARGO_ENCODED_RUSTFLAGS: "-Dwarnings"@@ -77,22 +76,20 @@ jobs:cargo +stable build --no-default-features \${{ matrix.backend != 'cpu' && format('--features {0}', matrix.backend) || '' }} \${{ matrix.tracing && '--features tracing' || '' }} \- ${{ matrix.audio && '--features audio-runtime' || '' }}- name: Build benches- if: ${{ matrix.backend != 'cpu' && matrix.tracing && matrix.audio }}+ if: ${{ matrix.backend != 'cpu' && !matrix.tracing }}run: |cargo +nightly bench --no-run --no-default-features \${{ matrix.backend != 'cpu' && format('--features {0}', matrix.backend) || '' }} \${{ matrix.tracing && '--features tracing' || '' }} \- ${{ matrix.audio && '--features audio-runtime' || '' }}- name: Run tests- if: ${{ matrix.backend != 'cpu' && matrix.tracing && matrix.audio }}+ if: ${{ matrix.backend != 'cpu' && matrix.tracing }}run: |cargo +stable nextest run --profile=ci --no-default-features \${{ format('--features {0}', matrix.backend) || '' }} \- --features tracing --features audio-runtime+ --features tracingcompleted:name: completeddiff --git a/crates/uzu/Cargo.toml b/crates/uzu/Cargo.tomlindex f916a75b6..c1df0763c 100644--- a/crates/uzu/Cargo.toml+++ b/crates/uzu/Cargo.toml@@ -87,7 +87,6 @@ metal = ["dep:metal",]tracing = []-audio-runtime = [][[test]]name = "integration"diff --git a/crates/uzu/src/audio/context.rs b/crates/uzu/src/audio/context.rsindex e85c62d66..bcf121538 100644--- a/crates/uzu/src/audio/context.rs+++ b/crates/uzu/src/audio/context.rs@@ -1,5 +1,3 @@-#![cfg(feature = "audio-runtime")]-use std::{path::Path, rc::Rc};use super::{AudioResult, NanoCodecFsqRuntime};diff --git a/crates/uzu/src/audio/mod.rs b/crates/uzu/src/audio/mod.rsindex 68052a2e0..2f6b20e42 100644--- a/crates/uzu/src/audio/mod.rs+++ b/crates/uzu/src/audio/mod.rs@@ -1,12 +1,12 @@mod codec;-#[cfg(all(feature = "audio-runtime", metal_backend))]+#[cfg(metal_backend)]mod context;pub mod nanocodec;mod types;pub use codec::AudioCodecRuntime;-#[cfg(all(feature = "audio-runtime", metal_backend))]+#[cfg(metal_backend)]pub use context::AudioGenerationContext;-#[cfg(all(feature = "audio-runtime", metal_backend))]+#[cfg(metal_backend)]pub use nanocodec::{NanoCodecFsqRuntime, NanoCodecFsqRuntimeConfig};pub use types::{AudioError, AudioPcmBatch, AudioResult, AudioTokenGrid};diff --git a/crates/uzu/src/audio/nanocodec/mod.rs b/crates/uzu/src/audio/nanocodec/mod.rsindex f4ee66705..9bb7cb421 100644--- a/crates/uzu/src/audio/nanocodec/mod.rs+++ b/crates/uzu/src/audio/nanocodec/mod.rs@@ -1,5 +1,5 @@-#[cfg(all(feature = "audio-runtime", metal_backend))]+#[cfg(metal_backend)]pub mod runtime;-#[cfg(all(feature = "audio-runtime", metal_backend))]+#[cfg(metal_backend)]pub use runtime::{AudioDecodeStepStats, AudioDecodeStreamState, NanoCodecFsqRuntime, NanoCodecFsqRuntimeConfig};diff --git a/crates/uzu/src/config/tts_model.rs b/crates/uzu/src/config/tts_model.rsindex 23e407898..d6f7cdcff 100644--- a/crates/uzu/src/config/tts_model.rs+++ b/crates/uzu/src/config/tts_model.rs@@ -1,5 +1,5 @@use std::collections::BTreeMap;-#[cfg(all(feature = "audio-runtime", metal_backend))]+#[cfg(metal_backend)]use std::path::Path;use serde::{Deserialize, Serialize};@@ -134,7 +134,7 @@ impl FishAudioEmbeddingConfig {}}- #[cfg(all(feature = "audio-runtime", metal_backend))]+ #[cfg(metal_backend)]pub(crate) fn to_text_decoder_embedding_config(&self) -> EmbeddingConfig {match self {FishAudioEmbeddingConfig::Tagged(config) => config.clone(),@@ -267,7 +267,7 @@ pub struct TtsModelConfig {pub message_processor_config: TtsMessageProcessorConfig,}-#[cfg(all(feature = "audio-runtime", metal_backend))]+#[cfg(metal_backend)]impl TtsModelConfig {pub fn create_audio_generation_context_with_model_path<B: crate::backends::common::Backend>(&self,diff --git a/crates/uzu/src/encodable_block/decoder.rs b/crates/uzu/src/encodable_block/decoder.rsindex 8dd52858f..bc5335c07 100644--- a/crates/uzu/src/encodable_block/decoder.rs+++ b/crates/uzu/src/encodable_block/decoder.rs@@ -59,7 +59,7 @@ impl<B: Backend> Decoder<B> {}/// Used by models whose token lookup weights and logits readout weights- #[cfg(all(feature = "audio-runtime", metal_backend))]+ #[cfg(metal_backend)]pub fn new_with_embedding_and_readout_subtrees(context: &B::Context,decoder_config: &DecoderConfig,diff --git a/crates/uzu/src/encodable_block/embedding.rs b/crates/uzu/src/encodable_block/embedding.rsindex a03e223be..35daf60e7 100644--- a/crates/uzu/src/encodable_block/embedding.rs+++ b/crates/uzu/src/encodable_block/embedding.rs@@ -120,7 +120,7 @@ const SHARED_TREE_UNTIED_KEYS: UntiedWeightKeys = UntiedWeightKeys {readout_biases: "output_biases",};-#[cfg(all(feature = "audio-runtime", metal_backend))]+#[cfg(metal_backend)]const SPLIT_TREE_UNTIED_KEYS: UntiedWeightKeys = UntiedWeightKeys {lookup_weights: "weights",lookup_scales: "scales",@@ -169,7 +169,7 @@ impl<B: Backend> Embedding<B> {)}- #[cfg(all(feature = "audio-runtime", metal_backend))]+ #[cfg(metal_backend)]pub(crate) fn new_with_lookup_and_readout_trees(context: &B::Context,vocab_size: u32,diff --git a/crates/uzu/src/lib.rs b/crates/uzu/src/lib.rsindex f64e1eec5..c82390511 100644--- a/crates/uzu/src/lib.rs+++ b/crates/uzu/src/lib.rs@@ -21,7 +21,7 @@ pub mod prelude;pub mod session;pub use array::{Array, ArrayContextExt};-#[cfg(all(feature = "audio-runtime", metal_backend))]+#[cfg(metal_backend)]pub use audio::{NanoCodecFsqRuntime, NanoCodecFsqRuntimeConfig};pub use config::ConfigDataType;pub use data_type::{ArrayElement, DataType};diff --git a/crates/uzu/src/prelude.rs b/crates/uzu/src/prelude.rsindex bb32caa96..d174c73a3 100644--- a/crates/uzu/src/prelude.rs+++ b/crates/uzu/src/prelude.rs@@ -11,7 +11,7 @@// Speculators#[cfg(metal_backend)]pub use crate::backends::metal::MetalContext;-#[cfg(all(feature = "audio-runtime", metal_backend))]+#[cfg(metal_backend)]pub use crate::session::TtsSession;pub use crate::{VERSION,diff --git a/crates/uzu/src/session/config/mod.rs b/crates/uzu/src/session/config/mod.rsindex d87a0831c..877a6e691 100644--- a/crates/uzu/src/session/config/mod.rs+++ b/crates/uzu/src/session/config/mod.rs@@ -10,6 +10,6 @@ pub use grammar_config::GrammarConfig;pub use run_config::RunConfig;pub use speculator_config::SpeculatorConfig;pub use tts_run_config::{TtsChunkPolicy, TtsNonStreamingMode, TtsPerformanceConfig, TtsRunConfig, TtsRunConfigError};-#[cfg(all(feature = "audio-runtime", metal_backend))]+#[cfg(metal_backend)]pub use tts_session_options::TtsSessionOptions;pub use tts_session_options::{TextDecoderRuntimeConfig, TextSamplingConfig};diff --git a/crates/uzu/src/session/config/tts_session_options.rs b/crates/uzu/src/session/config/tts_session_options.rsindex 5a3e72e0d..d1deca2bc 100644--- a/crates/uzu/src/session/config/tts_session_options.rs+++ b/crates/uzu/src/session/config/tts_session_options.rs@@ -34,7 +34,7 @@ impl Default for TextDecoderRuntimeConfig {}}-#[cfg(all(feature = "audio-runtime", metal_backend))]+#[cfg(metal_backend)]#[derive(Debug, Clone, PartialEq, Default)]pub struct TtsSessionOptions {pub text_decoder: TextDecoderRuntimeConfig,diff --git a/crates/uzu/src/session/mod.rs b/crates/uzu/src/session/mod.rsindex 0ff8b0af5..b915dc8cc 100644--- a/crates/uzu/src/session/mod.rs+++ b/crates/uzu/src/session/mod.rs@@ -3,11 +3,11 @@ pub mod classification_session;pub mod config;pub mod helpers;pub mod parameter;-#[cfg(all(feature = "audio-runtime", metal_backend))]+#[cfg(metal_backend)]mod tts_session;pub mod types;pub use chat_session::{ChatSession, ChatSession as Session};pub use classification_session::ClassificationSession;-#[cfg(all(feature = "audio-runtime", metal_backend))]+#[cfg(metal_backend)]pub use tts_session::TtsSession;diff --git a/crates/uzu/src/session/tts_session.rs b/crates/uzu/src/session/tts_session.rsindex fd6c5518e..b1559d1a3 100644--- a/crates/uzu/src/session/tts_session.rs+++ b/crates/uzu/src/session/tts_session.rs@@ -1,4 +1,4 @@-#![cfg(all(feature = "audio-runtime", metal_backend))]+#![cfg(metal_backend)]mod audio_backend;mod backend_factory;diff --git a/crates/uzu/tests/integration/session/tts_session/audio_nanocodec_runtime_test.rs b/crates/uzu/tests/integration/session/tts_session/audio_nanocodec_runtime_test.rsindex 4df491ee1..f42625168 100644--- a/crates/uzu/tests/integration/session/tts_session/audio_nanocodec_runtime_test.rs+++ b/crates/uzu/tests/integration/session/tts_session/audio_nanocodec_runtime_test.rs@@ -1,4 +1,4 @@-#![cfg(all(feature = "audio-runtime", metal_backend))]+#![cfg(metal_backend)]use uzu::{NanoCodecFsqRuntime, NanoCodecFsqRuntimeConfig,diff --git a/crates/uzu/tests/performance/audio_kernel_perf_test.rs b/crates/uzu/tests/performance/audio_kernel_perf_test.rsindex 5a2653ef8..79d959184 100644--- a/crates/uzu/tests/performance/audio_kernel_perf_test.rs+++ b/crates/uzu/tests/performance/audio_kernel_perf_test.rs@@ -1,4 +1,4 @@-#![cfg(all(feature = "audio-runtime", metal_backend))]+#![cfg(metal_backend)]use std::time::Instant;diff --git a/crates/uzu/tests/performance/mod.rs b/crates/uzu/tests/performance/mod.rsindex 3f5455eef..e41fdb139 100644--- a/crates/uzu/tests/performance/mod.rs+++ b/crates/uzu/tests/performance/mod.rs@@ -2,7 +2,6 @@#[path = "../common/mod.rs"]mod common;-#[cfg(feature = "audio-runtime")]mod audio_kernel_perf_test;mod encodable_block;#[cfg(metal_backend)]diff --git a/crates/uzu/tests/unit/kernel/audio/audio_test.rs b/crates/uzu/tests/unit/kernel/audio/audio_test.rsindex 4821f830b..fd9168c91 100644--- a/crates/uzu/tests/unit/kernel/audio/audio_test.rs+++ b/crates/uzu/tests/unit/kernel/audio/audio_test.rs@@ -1,4 +1,4 @@-#![cfg(all(feature = "audio-runtime", metal_backend))]+#![cfg(metal_backend)]use uzu::{ArrayContextExt, DataType,