Skip to content

armgit / uzu

Public Imported from GitHub
0

A high-performance inference engine for AI models

Improve backend cfg (#644)

uuuvn207e546ab2ae
diff --git a/Cargo.toml b/Cargo.toml
index 12b5b21a1..0fca0b33e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -225,7 +225,7 @@ needless_range_loop = "allow" # TODO: remove
missing_safety_doc = "allow" # TODO: maybe remove?
[workspace.metadata.dinghy]
-forward-cfgs = ["metal_backend", "grammar_xgrammar"]
+forward-cfgs = ["backend", "grammar"]
[workspace.metadata.dinghy.test-attribute-aliases]
uzu_test = "dinghy_apple_runner_macros::test_case"
diff --git a/crates/backend-uzu/Cargo.toml b/crates/backend-uzu/Cargo.toml
index f90539cd8..12fdcdcd6 100644
--- a/crates/backend-uzu/Cargo.toml
+++ b/crates/backend-uzu/Cargo.toml
@@ -13,7 +13,9 @@ build = "build/main.rs"
workspace = true
[features]
-default = ["metal", "grammar"]
+default = ["cpu", "metal", "grammar"]
+
+cpu = []
metal = [
"dep:clang-ast",
diff --git a/crates/backend-uzu/build/main.rs b/crates/backend-uzu/build/main.rs
index 3f572a34e..51828c1e2 100644
--- a/crates/backend-uzu/build/main.rs
+++ b/crates/backend-uzu/build/main.rs
@@ -1,4 +1,4 @@
-use std::{env, fs, path::PathBuf};
+use std::{env, fs, path::PathBuf, process::ExitCode};
use anyhow::Context;
use futures::future::try_join_all;
@@ -12,7 +12,7 @@ mod cpu;
mod metal;
#[tokio::main(flavor = "current_thread")]
-async fn main() -> anyhow::Result<()> {
+async fn main() -> anyhow::Result<ExitCode> {
println!("cargo::rerun-if-changed=.");
if envs::build_always() {
println!("cargo::rerun-if-changed=/var/empty/hack_nonexistent_file_to_always_rerun");
@@ -21,16 +21,22 @@ async fn main() -> anyhow::Result<()> {
let target_arch = env::var("CARGO_CFG_TARGET_ARCH")?;
let target_os = env::var("CARGO_CFG_TARGET_OS")?;
- let metal_backend = cfg!(feature = "metal") && matches!(target_os.as_ref(), "macos" | "ios" | "tvos" | "visionos");
- println!("cargo::rustc-check-cfg=cfg(metal_backend)");
- if metal_backend {
- println!("cargo::rustc-cfg=metal_backend");
+ println!("cargo::rustc-check-cfg=cfg(backend, values(\"cpu\", \"metal\"))");
+
+ let backend_cpu = cfg!(feature = "cpu");
+ if backend_cpu {
+ println!("cargo::rustc-cfg=backend=\"cpu\"");
+ }
+
+ let backend_metal = cfg!(feature = "metal") && matches!(target_os.as_ref(), "macos" | "ios" | "tvos" | "visionos");
+ if backend_metal {
+ println!("cargo::rustc-cfg=backend=\"metal\"");
}
- let grammar_xgrammar = cfg!(feature = "grammar") && target_arch != "wasm32";
- println!("cargo::rustc-check-cfg=cfg(grammar_xgrammar)");
- if grammar_xgrammar {
- println!("cargo::rustc-cfg=grammar_xgrammar");
+ let grammar = cfg!(feature = "grammar") && target_arch != "wasm32";
+ println!("cargo::rustc-check-cfg=cfg(grammar)");
+ if grammar {
+ println!("cargo::rustc-cfg=grammar");
}
debug_log!("build script started");
@@ -49,15 +55,23 @@ async fn main() -> anyhow::Result<()> {
let enum_paths = EnumPaths::from_gpu_types(&gpu_types).context("Failed to build enum path map")?;
+ #[allow(unused_mut)]
let mut compilers: Vec<Box<dyn Compiler>> = Vec::new();
- compilers.push(Box::new(cpu::CpuCompiler::new()?));
+ if backend_cpu {
+ compilers.push(Box::new(cpu::CpuCompiler::new()?));
+ }
#[cfg(all(feature = "metal", target_os = "macos"))]
- if metal_backend {
+ if backend_metal {
compilers.push(Box::new(metal::MetalCompiler::new()?));
}
+ if compilers.is_empty() {
+ println!("cargo::error=uzu requires at least one backend to be compiled in!");
+ return Ok(ExitCode::FAILURE);
+ }
+
let backends_kernels = try_join_all(compilers.iter().map(|c| c.build(&gpu_types, &enum_paths))).await?;
debug_log!("backend build end");
@@ -66,5 +80,5 @@ async fn main() -> anyhow::Result<()> {
debug_log!("build script ended");
- Ok(())
+ Ok(ExitCode::SUCCESS)
}
diff --git a/crates/backend-uzu/src/backends/common/allocator/allocator.rs b/crates/backend-uzu/src/backends/common/allocator/allocator.rs
index aafab4f30..3ed01e9f7 100644
--- a/crates/backend-uzu/src/backends/common/allocator/allocator.rs
+++ b/crates/backend-uzu/src/backends/common/allocator/allocator.rs
@@ -262,6 +262,6 @@ impl<B: Backend> Allocator<B> {
}
}
-#[cfg(all(test, metal_backend))]
+#[cfg(all(test, backend = "metal"))]
#[path = "../../../../tests/unit/backends/common/allocator/allocator.rs"]
mod tests;
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/kernel.rs b/crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/kernel.rs
index 40f0d26d1..5f4c1df0e 100644
--- a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/kernel.rs
+++ b/crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/kernel.rs
@@ -24,6 +24,7 @@ static GEMV_MAX_BATCH: OnceLock<u32> = OnceLock::new();
fn max_gemv_batch_threshold() -> u32 {
*GEMV_MAX_BATCH.get_or_init(|| {
+ // TODO: remove magic env var
std::env::var("UZU_GEMV_MAX_BATCH").ok().and_then(|s| s.parse().ok()).unwrap_or(DEFAULT_GEMV_MAX_BATCH)
})
}
diff --git a/crates/backend-uzu/src/backends/mod.rs b/crates/backend-uzu/src/backends/mod.rs
index 8cf23bf33..3abd2f766 100644
--- a/crates/backend-uzu/src/backends/mod.rs
+++ b/crates/backend-uzu/src/backends/mod.rs
@@ -1,23 +1,28 @@
pub mod common;
+#[cfg(backend = "cpu")]
pub mod cpu;
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
pub mod metal;
macro_rules! select_backend {
($expr:expr, $unk:expr) => {{
- let default = if cfg!(metal_backend) {
+ let default = if cfg!(backend = "metal") {
"metal"
- } else {
+ } else if cfg!(backend = "cpu") {
"cpu"
+ } else {
+ unreachable!()
};
+ // TODO: remove magic env var
match std::env::var("UZU_BACKEND").map(|s| s.to_lowercase()).as_deref().unwrap_or(default) {
+ #[cfg(backend = "cpu")]
"cpu" => {
type B = crate::backends::cpu::Cpu;
$expr
},
- #[cfg(metal_backend)]
+ #[cfg(backend = "metal")]
"metal" => {
type B = crate::backends::metal::Metal;
$expr
diff --git a/crates/backend-uzu/src/encodable_block/sampling/mod.rs b/crates/backend-uzu/src/encodable_block/sampling/mod.rs
index 81f6ec204..63eef2a73 100644
--- a/crates/backend-uzu/src/encodable_block/sampling/mod.rs
+++ b/crates/backend-uzu/src/encodable_block/sampling/mod.rs
@@ -18,7 +18,9 @@ use crate::{
mod gumbel;
mod prng;
-pub use gumbel::{gumbel_float, revidx, speculator_sample};
+pub use gumbel::speculator_sample;
+#[cfg(backend = "cpu")]
+pub use gumbel::{gumbel_float, revidx};
pub use prng::PRng;
pub struct Sampling<B: Backend> {
diff --git a/crates/backend-uzu/src/engine/language_model/grammar/mod.rs b/crates/backend-uzu/src/engine/language_model/grammar/mod.rs
index a59fc0fce..d380afb51 100644
--- a/crates/backend-uzu/src/engine/language_model/grammar/mod.rs
+++ b/crates/backend-uzu/src/engine/language_model/grammar/mod.rs
@@ -4,7 +4,7 @@ use schemars::JsonSchema;
use thiserror::Error;
use tokenizers::Tokenizer;
-#[cfg(grammar_xgrammar)]
+#[cfg(grammar)]
mod xgrammar;
#[derive(Debug, Clone)]
@@ -128,17 +128,17 @@ pub trait Grammar: Send {
}
impl dyn Grammar {
- #[cfg_attr(not(grammar_xgrammar), allow(unused_variables))]
+ #[cfg_attr(not(grammar), allow(unused_variables))]
pub fn new(
config: &GrammarConfig,
tokenizer: &Tokenizer,
trigger_token_id: Option<u64>,
stop_token_ids: Option<&[i32]>,
) -> Result<Box<dyn Grammar>, GrammarError> {
- #[cfg(grammar_xgrammar)]
+ #[cfg(grammar)]
return Ok(Box::new(xgrammar::XGrammar::new(config, tokenizer, trigger_token_id, stop_token_ids)?));
- #[cfg(not(grammar_xgrammar))]
+ #[cfg(not(grammar))]
return Err(GrammarError(Box::new(NoGrammarBackend)));
}
}
diff --git a/crates/backend-uzu/src/lib.rs b/crates/backend-uzu/src/lib.rs
index b7f02056d..954a99876 100644
--- a/crates/backend-uzu/src/lib.rs
+++ b/crates/backend-uzu/src/lib.rs
@@ -17,8 +17,8 @@ pub mod engine;
pub use utils::version::{TOOLCHAIN_VERSION, VERSION};
-// needed for tests to resolve `backend_uzu::` imports
#[cfg(test)]
extern crate self as backend_uzu;
+
#[cfg(test)]
pub mod tests;
diff --git a/crates/backend-uzu/src/tests/matmul/harness.rs b/crates/backend-uzu/src/tests/matmul/harness.rs
index bfa214161..d491ac229 100644
--- a/crates/backend-uzu/src/tests/matmul/harness.rs
+++ b/crates/backend-uzu/src/tests/matmul/harness.rs
@@ -1,7 +1,7 @@
use num_traits::Float;
use super::Shape;
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use crate::backends::metal::{GemmDispatchPath, Metal, MetalContext};
use crate::{
array::ArrayElement,
@@ -18,7 +18,7 @@ use crate::{
tests::helpers::{alloc_allocation_with_data, allocation_to_vec},
};
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
pub type MetalMatmulKernel = <<Metal as Backend>::Kernels as Kernels>::MatmulKernel;
#[derive(Debug, Clone, Copy)]
@@ -193,7 +193,7 @@ pub fn cpu_reference<T: ArrayElement + Float>(input: &Input<T>) -> Vec<T> {
})
}
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
pub fn run_metal<T: ArrayElement + Float>(
context: &MetalContext,
kernel: &mut MetalMatmulKernel,
diff --git a/crates/backend-uzu/src/tests/matmul/mod.rs b/crates/backend-uzu/src/tests/matmul/mod.rs
index 81c30e3b5..754732966 100644
--- a/crates/backend-uzu/src/tests/matmul/mod.rs
+++ b/crates/backend-uzu/src/tests/matmul/mod.rs
@@ -4,10 +4,10 @@ pub mod quant;
pub mod shape;
pub use bench::{iter_encode_loop, iter_encode_loop_named};
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
pub use harness::run_metal;
pub use harness::{Case, cpu_reference, deterministic_input};
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
pub use quant::run_quant_metal;
pub use quant::{QuantBuffers, QuantInput, quant_arguments, run_quant_cpu};
pub use shape::{
diff --git a/crates/backend-uzu/src/tests/matmul/quant.rs b/crates/backend-uzu/src/tests/matmul/quant.rs
index 46015ddeb..c153438de 100644
--- a/crates/backend-uzu/src/tests/matmul/quant.rs
+++ b/crates/backend-uzu/src/tests/matmul/quant.rs
@@ -3,7 +3,7 @@ use std::mem::size_of_val;
use num_traits::Float;
use rand::{RngExt, SeedableRng, rngs::SmallRng};
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use crate::backends::metal::{GemmDispatchPath, Metal, MetalContext};
use crate::{
array::ArrayElement,
@@ -246,7 +246,7 @@ pub fn run_quant_cpu<T: ArrayElement + Float>(input: &QuantInput<T>) -> Vec<T> {
allocation_to_vec::<Cpu, T>(&buffers.y)
}
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
pub fn run_quant_metal<T: ArrayElement + Float>(
context: &MetalContext,
input: &QuantInput<T>,
diff --git a/crates/backend-uzu/src/tests/mod.rs b/crates/backend-uzu/src/tests/mod.rs
index b3a652e7d..bd7370a90 100644
--- a/crates/backend-uzu/src/tests/mod.rs
+++ b/crates/backend-uzu/src/tests/mod.rs
@@ -1,5 +1,7 @@
-#![cfg(test)]
-#![allow(dead_code)]
+#![allow(dead_code)] // TODO
+
+#[cfg(not(backend = "cpu"))]
+compile_error!("uzu tests require cpu backend");
pub extern crate test;
diff --git a/crates/backend-uzu/src/tests/proptest.rs b/crates/backend-uzu/src/tests/proptest.rs
index 23fea6d07..c0e678a8d 100644
--- a/crates/backend-uzu/src/tests/proptest.rs
+++ b/crates/backend-uzu/src/tests/proptest.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
use proptest::prelude::*;
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use crate::backends::metal::Metal;
use crate::{
backends::{
@@ -18,7 +18,7 @@ pub fn kernel_data_type() -> impl Strategy<Value = DataType> {
pub struct TestContextes {
pub cpu: Arc<<Cpu as Backend>::Context>,
- #[cfg(metal_backend)]
+ #[cfg(backend = "metal")]
pub metal: Arc<<Metal as Backend>::Context>,
}
@@ -26,7 +26,7 @@ impl TestContextes {
pub fn new() -> TestContextes {
TestContextes {
cpu: <Cpu as Backend>::Context::new().expect("Failed to create Cpu context"),
- #[cfg(metal_backend)]
+ #[cfg(backend = "metal")]
metal: <Metal as Backend>::Context::new().expect("Failed to create Metal context"),
}
}
@@ -34,7 +34,7 @@ impl TestContextes {
pub struct TestResults<T> {
pub cpu: T,
- #[cfg(metal_backend)]
+ #[cfg(backend = "metal")]
pub metal: T,
}
@@ -47,7 +47,7 @@ macro_rules! for_each_context {
let $CONTEXT_NAME = $CONTEXTES.cpu.as_ref();
$body
})?,
- #[cfg(metal_backend)]
+ #[cfg(backend = "metal")]
metal: ({
type $CONTEXT_TYPE =
<backend_uzu::backends::metal::Metal as backend_uzu::backends::common::Backend>::Context;
@@ -69,7 +69,7 @@ pub trait ComparableTestResults {
impl<T: ComparableTestResults> TestResults<T> {
pub fn compare_results(&self) -> Result<(), TestCaseError> {
- #[cfg(metal_backend)]
+ #[cfg(backend = "metal")]
T::compare("metal", &self.metal, &self.cpu)?;
Ok(())
diff --git a/crates/backend-uzu/src/tests/util.rs b/crates/backend-uzu/src/tests/util.rs
index e757dc02a..b0055b011 100644
--- a/crates/backend-uzu/src/tests/util.rs
+++ b/crates/backend-uzu/src/tests/util.rs
@@ -1,10 +1,10 @@
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use std::{cell::OnceCell, sync::Arc};
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use crate::backends::{common::Context, metal::MetalContext};
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
pub fn shared_metal_context() -> Arc<MetalContext> {
thread_local! {
static CTX: OnceCell<Arc<MetalContext>> = const { OnceCell::new() };
diff --git a/crates/backend-uzu/src/utils/mod.rs b/crates/backend-uzu/src/utils/mod.rs
index 4b76b2e29..10458dcce 100644
--- a/crates/backend-uzu/src/utils/mod.rs
+++ b/crates/backend-uzu/src/utils/mod.rs
@@ -1,6 +1,7 @@
pub mod dispatch_dtype;
pub mod fs;
pub mod maybe_mut;
+#[cfg(backend = "cpu")]
pub mod pointers;
pub mod strict_serde;
pub mod version;
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/attention/ancestor_attention_test.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/attention/ancestor_attention_test.rs
index e6fcc7656..04356b975 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/attention/ancestor_attention_test.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/attention/ancestor_attention_test.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use std::{sync::Arc, time::Duration};
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/embedding/quant_embedding_test.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/embedding/quant_embedding_test.rs
index 035415a10..424beed3d 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/embedding/quant_embedding_test.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/embedding/quant_embedding_test.rs
@@ -277,7 +277,7 @@ fn test_symmetric_u8<T: ArrayElement + Float + Debug + Display>() {
});
}
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
fn test_zero_point_group16_hadamard_constructor<T: ArrayElement + Float + Debug + Display>() {
use crate::backends::metal::Metal;
@@ -350,7 +350,7 @@ fn test_uint4_zero_point_group16_bf16() {
test_zero_point_group16::<bf16>();
}
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
#[uzu_test]
fn test_uint4_zero_point_group16_hadamard_bf16_constructor() {
test_zero_point_group16_hadamard_constructor::<bf16>();
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/delta_net_test.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/delta_net_test.rs
index 78971cc1e..30269f7c6 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/delta_net_test.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/delta_net_test.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use half::bf16;
use proc_macros::uzu_test;
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/conv_scan_test.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/conv_scan_test.rs
index ea4d0ecea..43e193ebc 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/conv_scan_test.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/conv_scan_test.rs
@@ -1,16 +1,16 @@
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use std::{mem::size_of, time::Duration};
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use criterion::Criterion;
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use half::bf16;
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use proc_macros::uzu_bench;
use proc_macros::uzu_test;
use test_runner::for_each_non_cpu_backend;
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use crate::{
backends::{common::Allocation, metal::Metal},
tests::{cold_pool::ColdPool, matmul::iter_encode_loop_named},
@@ -128,14 +128,14 @@ fn test_conv_tree_scan() {
assert_eq_float(&baseline.1[state.clone()], &perturbed.1[state], 0.0, "sibling state");
}
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
struct Buffers {
input: Allocation<Metal>,
output: Allocation<Metal>,
suffix_state: Allocation<Metal>,
}
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
#[uzu_bench]
fn bench_conv_tree_scan(c: &mut Criterion) {
const BENCH_CONV_DIM: usize = 10_240;
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/out_bench.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/out_bench.rs
index 2942a30d4..bb5f3f988 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/out_bench.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/out_bench.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use std::time::Duration;
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/out_test.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/out_test.rs
index da362a9c4..016d08d92 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/out_test.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/out_test.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use half::bf16;
use num_traits::Float;
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/prefix_bench.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/prefix_bench.rs
index 6aa242546..61f34fcfc 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/prefix_bench.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/prefix_bench.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use std::mem::size_of;
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/prefix_test.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/prefix_test.rs
index 6392d7508..08a358df1 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/prefix_test.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/prefix_test.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use proc_macros::uzu_test;
use test_runner::for_each_non_cpu_backend;
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/state_advance_test.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/state_advance_test.rs
index 1b141d5b2..d7b428089 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/state_advance_test.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/state_advance_test.rs
@@ -1,11 +1,11 @@
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use std::time::Duration;
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use criterion::Criterion;
use half::bf16;
use num_traits::Float;
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use proc_macros::uzu_bench;
use proc_macros::uzu_test;
use test_runner::for_each_non_cpu_backend;
@@ -21,7 +21,7 @@ use crate::{
helpers::{alloc_allocation_with_data, allocation_to_vec},
},
};
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use crate::{
backends::metal::Metal,
data_type::DataType,
@@ -87,7 +87,7 @@ fn test_state_advance() {
}
}
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
#[uzu_bench]
fn bench_state_advance(c: &mut Criterion) {
const NUM_V_HEADS: usize = 48;
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/tree_gram_bench.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/tree_gram_bench.rs
index 0e01ed629..c882fc0c0 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/tree_gram_bench.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/tree_gram_bench.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use std::{mem::size_of, time::Duration};
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/tree_gram_test.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/tree_gram_test.rs
index ae7744b2b..b007fd068 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/tree_gram_test.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/tree_gram_test.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use half::bf16;
use num_traits::Float;
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_bench.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_bench.rs
index 01cf09285..83d109525 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_bench.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_bench.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use std::{mem::size_of, time::Duration};
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_test.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_test.rs
index 66b6db9b9..84894056f 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_test.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_test.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use half::bf16;
use proc_macros::uzu_test;
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/kv_cache_update_test.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/kv_cache_update_test.rs
index ce3d952e1..e36c2e60a 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/kv_cache_update_test.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/kv_cache_update_test.rs
@@ -1,7 +1,7 @@
use std::fmt::{Debug, Display};
use half::{bf16, f16};
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use ndarray::{Array, Array3};
use num_traits::Float;
use proc_macros::uzu_test;
@@ -18,7 +18,7 @@ use crate::{
helpers::{alloc_allocation_with_data, allocation_to_vec},
},
};
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use crate::{
backends::metal::Metal,
data_type::DataType,
@@ -274,7 +274,7 @@ fn test_large_bf16() {
test_large_internal::<bf16>();
}
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
fn apply_copies_3d<T: Clone>(
array: &mut Array3<T>,
copies: &[Copy],
@@ -291,7 +291,7 @@ fn apply_copies_3d<T: Clone>(
}
}
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
#[uzu_test]
fn test_sparse_random_pattern_f32() {
let context = match <Metal as Backend>::Context::new() {
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/a8w_bench.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/a8w_bench.rs
index d671a605e..c197ab72c 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/a8w_bench.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/a8w_bench.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use std::time::Duration;
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/dispatch_paths_test.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/dispatch_paths_test.rs
index 042759c32..0b942b2c2 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/dispatch_paths_test.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/dispatch_paths_test.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use std::fmt::{Debug, Display};
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/gemm_bench.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/gemm_bench.rs
index 2a5bd330c..41f6422c4 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/gemm_bench.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/gemm_bench.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use criterion::{BenchmarkId, Criterion, Throughput};
use half::bf16;
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/quant_dispatch_test.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/quant_dispatch_test.rs
index 368ba2d11..689b0522f 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/quant_dispatch_test.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/quant_dispatch_test.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use std::{
error::Error as StdError,
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/quant_gemm_bench.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/quant_gemm_bench.rs
index 9a09ebdb6..7ea4422e4 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/quant_gemm_bench.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/quant_gemm_bench.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use criterion::{BenchmarkId, Criterion, Throughput};
use half::bf16;
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/qwen3_bench.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/qwen3_bench.rs
index 80f7200b1..93fb2259e 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/qwen3_bench.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/matmul/qwen3_bench.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use criterion::{BenchmarkId, Criterion, Throughput};
use half::bf16;
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/radix_top_k_small_test.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/radix_top_k_small_test.rs
index dbc0e5a45..a7f823b27 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/radix_top_k_small_test.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/radix_top_k_small_test.rs
@@ -1,10 +1,10 @@
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use std::time::Instant;
use proc_macros::uzu_test;
use test_runner::for_each_non_cpu_backend;
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
use crate::backends::metal::Metal;
use crate::{
backends::{
@@ -109,7 +109,7 @@ fn radix_top_k_small_matches_cpu() {
}
}
-#[cfg(metal_backend)]
+#[cfg(backend = "metal")]
#[uzu_test]
#[ignore = "benchmark"]
fn benchmark_radix_top_k_small() {
diff --git a/crates/backend-uzu/tests/unit/backends/common/kernel/weaver/weaver_node_cache_write_test.rs b/crates/backend-uzu/tests/unit/backends/common/kernel/weaver/weaver_node_cache_write_test.rs
index 50fdc7078..bd1260d26 100644
--- a/crates/backend-uzu/tests/unit/backends/common/kernel/weaver/weaver_node_cache_write_test.rs
+++ b/crates/backend-uzu/tests/unit/backends/common/kernel/weaver/weaver_node_cache_write_test.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use half::bf16;
use proc_macros::uzu_test;
diff --git a/crates/backend-uzu/tests/unit/backends/metal/kernel/rht_quantize_activations_test.rs b/crates/backend-uzu/tests/unit/backends/metal/kernel/rht_quantize_activations_test.rs
index d5e3ab5f5..9f6525c87 100644
--- a/crates/backend-uzu/tests/unit/backends/metal/kernel/rht_quantize_activations_test.rs
+++ b/crates/backend-uzu/tests/unit/backends/metal/kernel/rht_quantize_activations_test.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use proc_macros::uzu_test;
use rand::{RngExt, SeedableRng, rngs::SmallRng};
diff --git a/crates/backend-uzu/tests/unit/encodable_block/attention_test.rs b/crates/backend-uzu/tests/unit/encodable_block/attention_test.rs
index 4574612ca..8e8fb4702 100644
--- a/crates/backend-uzu/tests/unit/encodable_block/attention_test.rs
+++ b/crates/backend-uzu/tests/unit/encodable_block/attention_test.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use ndarray::{Array4, s};
use proc_macros::uzu_test;
diff --git a/crates/backend-uzu/tests/unit/encodable_block/delta_net_tree_verify_bench.rs b/crates/backend-uzu/tests/unit/encodable_block/delta_net_tree_verify_bench.rs
index 0910f2e17..bea09ba33 100644
--- a/crates/backend-uzu/tests/unit/encodable_block/delta_net_tree_verify_bench.rs
+++ b/crates/backend-uzu/tests/unit/encodable_block/delta_net_tree_verify_bench.rs
@@ -1,4 +1,4 @@
-#![cfg(metal_backend)]
+#![cfg(backend = "metal")]
use std::time::{Duration, Instant};
diff --git a/crates/cli-storage/Cargo.toml b/crates/cli-storage/Cargo.toml
index 54e3b32d1..9b9899c20 100644
--- a/crates/cli-storage/Cargo.toml
+++ b/crates/cli-storage/Cargo.toml
@@ -14,7 +14,7 @@ path = "src/main.rs"
[dependencies]
shoji.workspace = true
-uzu.workspace = true
+uzu = { workspace = true, features = ["backend-cpu"] }
tokio = { workspace = true, features = ["full"] }
futures-util.workspace = true
crossterm.workspace = true
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index 6455f2077..4e6970368 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -13,7 +13,7 @@ name = "cli"
path = "src/main.rs"
[features]
-default = ["backend-metal", "capability-grammar", "capability-cli"]
+default = ["backend-cpu", "backend-metal", "capability-grammar", "capability-cli"]
backend-cpu = ["uzu/backend-cpu"]
backend-metal = ["uzu/backend-metal"]
capability-grammar = ["uzu/capability-grammar"]
diff --git a/crates/test-runner/src/lib.rs b/crates/test-runner/src/lib.rs
index 6aa2370db..d66eab81c 100644
--- a/crates/test-runner/src/lib.rs
+++ b/crates/test-runner/src/lib.rs
@@ -23,7 +23,7 @@ macro_rules! for_each_backend {
type $B = backend_uzu::backends::cpu::Cpu;
$body
}
- #[cfg(metal_backend)]
+ #[cfg(backend = "metal")]
{
type $B = backend_uzu::backends::metal::Metal;
$body
@@ -34,7 +34,7 @@ macro_rules! for_each_backend {
#[macro_export]
macro_rules! for_each_non_cpu_backend {
(|$B:ident| $body:expr) => {{
- #[cfg(metal_backend)]
+ #[cfg(backend = "metal")]
{
type $B = backend_uzu::backends::metal::Metal;
$body
diff --git a/crates/uzu/Cargo.toml b/crates/uzu/Cargo.toml
index d8d4a48f6..85766f04b 100644
--- a/crates/uzu/Cargo.toml
+++ b/crates/uzu/Cargo.toml
@@ -12,8 +12,8 @@ license.workspace = true
crate-type = ["lib", "cdylib", "staticlib"]
[features]
-default = ["backend-metal", "capability-grammar", "capability-cli"]
-backend-cpu = []
+default = ["backend-cpu", "backend-metal", "capability-grammar", "capability-cli"]
+backend-cpu = ["backend-uzu/cpu"]
backend-metal = ["backend-uzu/metal"]
capability-grammar = ["backend-uzu/grammar"]
capability-cli = ["dep:iocraft", "dep:indoc"]