Skip to content

armgit / uzu

Public Imported from GitHub
0

A high-performance inference engine for AI models

Big rename (#759)

uuuvn198695a9fe82
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 05fdcc145..e8dcaaf7a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,12 +1,12 @@
/.github @uuuvn
/apps/playground @alexxale
/crates/legacy/backend-remote @alexxale
-/crates/backend-uzu/build @uuuvn
-/crates/backend-uzu/src/backends/cpu @uuuvn
-/crates/backend-uzu/src/backends/metal @eugenebokhan @uuuvn @CC-Yeh
-/crates/backend-uzu/src/config @uuuvn
-/crates/backend-uzu/src/parameters @uuuvn
-/crates/backend-uzu/src/speculators @uuuvn
+/crates/uzu-engine/build @uuuvn
+/crates/uzu-engine/src/backends/cpu @uuuvn
+/crates/uzu-engine/src/backends/metal @eugenebokhan @uuuvn @CC-Yeh
+/crates/uzu-engine/src/config @uuuvn
+/crates/uzu-engine/src/parameters @uuuvn
+/crates/uzu-engine/src/speculators @uuuvn
/crates/legacy/bindings @alexxale
/crates/legacy/cli @alexxale
/crates/legacy/cli/src/storage @eugenebokhan
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 053c48b3f..636254475 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -32,7 +32,7 @@ jobs:
linters: true
metal: true
- - name: Check backend-uzu rustfmt discovery
+ - name: Check uzu-engine rustfmt discovery
if: ${{ always() && steps.setup.outcome == 'success' }}
run: RUSTUP_TOOLCHAIN=nightly ./scripts/check-rustfmt-discovery.sh
@@ -76,6 +76,7 @@ jobs:
crates: ['cli']
- host: 'linux'
target: 'wasm32-wasip1-threads'
+ nightly: true
crates: ['uzu']
tests: 'kernels'
- host: 'linux'
@@ -97,7 +98,7 @@ jobs:
- name: Build crates
run: |
- cargo +stable build \
+ cargo +${{ matrix.nightly && 'nightly' || 'stable' }} build \
${{ matrix.target && format('--target {0}', matrix.target) || '' }} \
${{ matrix.crates && format('-p {0}', join(matrix.crates, ' -p ')) || '' }}
@@ -113,7 +114,7 @@ jobs:
run: |
cargo +nightly nextest run --profile=ci \
${{ matrix.target && format('--target {0}', matrix.target) || '' }} \
- ${{ matrix.tests == 'kernels' && '-p backend-uzu backends::common::kernel::tests --lib' || '' }}
+ ${{ matrix.tests == 'kernels' && '-p uzu-engine backends::common::kernel::tests --lib' || '' }}
validate-bindings:
name: validate-bindings
diff --git a/Cargo.lock b/Cargo.lock
index 0dccc09fa..efea1730d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -462,70 +462,6 @@ dependencies = [
"tokio-util",
]
-[[package]]
-name = "backend-uzu"
-version = "0.5.19"
-dependencies = [
- "anyhow",
- "async-trait",
- "backend-uzu-macros",
- "bindgen",
- "bitflags 2.13.0",
- "blake3",
- "bytemuck",
- "clang-ast",
- "criterion",
- "depfile",
- "derive_more",
- "futures",
- "half",
- "is_close",
- "itertools 0.14.0",
- "libm",
- "memmap2",
- "monostate",
- "mtl-rs",
- "ndarray",
- "num-traits",
- "obfstr",
- "objc2",
- "parking_lot",
- "prettyplease",
- "proc-macro2",
- "proptest",
- "quote",
- "rand 0.10.2",
- "rand_distr",
- "rangemap",
- "rhai",
- "rstest",
- "rustix",
- "schemars 1.2.1",
- "serde",
- "serde_json",
- "shoji",
- "syn 2.0.118",
- "tempfile",
- "test-runner",
- "test-tag",
- "thiserror 2.0.18",
- "tokenizers",
- "tokio",
- "tokio-util",
- "walkdir",
- "xgrammar-rs",
- "xxhash-rust",
- "zstd",
-]
-
-[[package]]
-name = "backend-uzu-macros"
-version = "0.5.19"
-dependencies = [
- "quote",
- "syn 2.0.118",
-]
-
[[package]]
name = "backoff"
version = "0.4.0"
@@ -1003,7 +939,6 @@ name = "cli"
version = "0.5.19"
dependencies = [
"anyhow",
- "backend-uzu",
"chrono",
"clap",
"comfy-table",
@@ -1033,6 +968,7 @@ dependencies = [
"unicode-width 0.2.2",
"uuid",
"uzu",
+ "uzu-engine",
]
[[package]]
@@ -3565,15 +3501,6 @@ version = "2.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
-[[package]]
-name = "memmap2"
-version = "0.9.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "memmem"
version = "0.1.1"
@@ -7609,7 +7536,6 @@ dependencies = [
"apple-native-keyring-store",
"async-openai",
"backend-remote",
- "backend-uzu",
"bindings",
"bindings-types",
"bitflags 2.13.0",
@@ -7634,10 +7560,12 @@ dependencies = [
"objc2",
"objc2-foundation",
"objc2-security",
+ "parking_lot",
"pyo3",
"pyo3-async-runtimes",
"pyo3-build-config",
"pyo3-stub-gen",
+ "rand 0.10.2",
"reqwest 0.13.4",
"rodio",
"rstest",
@@ -7649,18 +7577,82 @@ dependencies = [
"sysinfo",
"tempfile",
"thiserror 2.0.18",
+ "tokenizers",
"tokio",
"tokio-stream",
+ "tokio-util",
"tracing",
"tracing-appender",
"tracing-subscriber",
"tsify",
"uniffi",
"uuid",
+ "uzu-engine",
"wasm-bindgen",
"wasm-bindgen-futures",
]
+[[package]]
+name = "uzu-engine"
+version = "0.5.19"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "bindgen",
+ "bitflags 2.13.0",
+ "blake3",
+ "bytemuck",
+ "clang-ast",
+ "criterion",
+ "depfile",
+ "derive_more",
+ "futures",
+ "half",
+ "is_close",
+ "itertools 0.14.0",
+ "libm",
+ "monostate",
+ "mtl-rs",
+ "ndarray",
+ "num-traits",
+ "obfstr",
+ "objc2",
+ "parking_lot",
+ "prettyplease",
+ "proc-macro2",
+ "proptest",
+ "quote",
+ "rand 0.10.2",
+ "rand_distr",
+ "rangemap",
+ "rhai",
+ "rstest",
+ "schemars 1.2.1",
+ "serde",
+ "serde_json",
+ "shoji",
+ "syn 2.0.118",
+ "tempfile",
+ "test-runner",
+ "test-tag",
+ "thiserror 2.0.18",
+ "tokenizers",
+ "tokio",
+ "uzu-engine-macros",
+ "walkdir",
+ "xgrammar-rs",
+ "xxhash-rust",
+ "zstd",
+]
+
+[[package]]
+name = "uzu-engine-macros"
+version = "0.5.19"
+dependencies = [
+ "quote",
+ "syn 2.0.118",
+]
+
[[package]]
name = "v_frame"
version = "0.3.9"
diff --git a/Cargo.toml b/Cargo.toml
index b0fcceba9..a0ce38454 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
[workspace]
members = [
- "crates/backend-uzu",
- "crates/backend-uzu-macros",
+ "crates/uzu-engine",
+ "crates/uzu-engine-macros",
# --- to be rewritten
"crates/legacy/bindings-types",
"crates/legacy/bindings",
@@ -50,8 +50,8 @@ test-runner = { path = "crates/legacy/test-runner" }
bindings-types = { path = "crates/legacy/bindings-types", default-features = false }
bindings = { path = "crates/legacy/bindings", default-features = false }
shoji = { path = "crates/legacy/shoji", default-features = false }
-backend-uzu = { path = "crates/backend-uzu", default-features = false }
-backend-uzu-macros = { path = "crates/backend-uzu-macros" }
+uzu-engine = { path = "crates/uzu-engine", default-features = false }
+uzu-engine-macros = { path = "crates/uzu-engine-macros" }
backend-remote = { path = "crates/legacy/backend-remote", default-features = false }
json-transform = { path = "crates/legacy/json-transform", default-features = false }
token-stream-parser = { path = "crates/legacy/token-stream-parser", default-features = false }
diff --git a/crates/backend-uzu/src/backends/mod.rs b/crates/backend-uzu/src/backends/mod.rs
deleted file mode 100644
index 3abd2f766..000000000
--- a/crates/backend-uzu/src/backends/mod.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-pub mod common;
-
-#[cfg(backend = "cpu")]
-pub mod cpu;
-#[cfg(backend = "metal")]
-pub mod metal;
-
-macro_rules! select_backend {
- ($expr:expr, $unk:expr) => {{
- let default = if cfg!(backend = "metal") {
- "metal"
- } 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(backend = "metal")]
- "metal" => {
- type B = crate::backends::metal::Metal;
- $expr
- },
- _ => Err($unk),
- }
- }};
-}
-pub(crate) use select_backend;
diff --git a/crates/backend-uzu/src/bridge/model_metadata.rs b/crates/backend-uzu/src/bridge/model_metadata.rs
deleted file mode 100644
index 2430e715b..000000000
--- a/crates/backend-uzu/src/bridge/model_metadata.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use std::{fs::File, io::BufReader, path::Path};
-
-use shoji::types::model::ModelSpecialization;
-
-use crate::config::model::AnyModelConfig;
-
-#[derive(Debug, thiserror::Error)]
-pub enum ModelMetadataError {
- #[error("Unable to open model configuration: {0}")]
- UnableToOpenConfig(#[from] std::io::Error),
- #[error("Unable to deserialize model configuration: {0}")]
- UnableToDeserializeConfig(#[from] serde_json::Error),
-}
-
-pub fn resolve_model_specialization(model_path: &Path) -> Result<ModelSpecialization, ModelMetadataError> {
- let config_path = model_path.join("config.json");
- let file = File::open(&config_path)?;
- let config: AnyModelConfig = serde_json::from_reader(BufReader::new(file))?;
- Ok(match config {
- AnyModelConfig::LanguageModelConfig(_) => ModelSpecialization::Chat {},
- AnyModelConfig::ClassifierModelConfig(_) => ModelSpecialization::Classification {},
- })
-}
diff --git a/crates/backend-uzu/src/utils/fs.rs b/crates/backend-uzu/src/utils/fs.rs
deleted file mode 100644
index dc5a30ab5..000000000
--- a/crates/backend-uzu/src/utils/fs.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use std::{fs::File, io};
-
-/// Positional `read_exact` built on `rustix::io::pread`, so the same code
-/// path works on Unix and WASI without pulling in `std::os::*::fs::FileExt`.
-pub fn file_read_exact_at(
- file: &File,
- mut buf: &mut [u8],
- mut offset: u64,
-) -> io::Result<()> {
- while !buf.is_empty() {
- match rustix::io::pread(file, &mut *buf, offset) {
- Ok(0) => return Err(io::ErrorKind::UnexpectedEof.into()),
- Ok(n) => {
- buf = &mut buf[n..];
- offset += n as u64;
- },
- Err(rustix::io::Errno::INTR) => continue,
- Err(e) => return Err(e.into()),
- }
- }
- Ok(())
-}
diff --git a/crates/legacy/cli/Cargo.toml b/crates/legacy/cli/Cargo.toml
index a621c2526..81c96858c 100644
--- a/crates/legacy/cli/Cargo.toml
+++ b/crates/legacy/cli/Cargo.toml
@@ -20,7 +20,7 @@ capability-grammar = ["uzu/capability-grammar"]
[dependencies]
anyhow.workspace = true
-backend-uzu.workspace = true
+uzu-engine.workspace = true
chrono.workspace = true
clap.workspace = true
comfy-table.workspace = true
diff --git a/crates/legacy/cli/src/bench/model.rs b/crates/legacy/cli/src/bench/model.rs
index 6c79a73a8..3c499b661 100644
--- a/crates/legacy/cli/src/bench/model.rs
+++ b/crates/legacy/cli/src/bench/model.rs
@@ -1,6 +1,6 @@
-use backend_uzu::data_type::DataType;
use rocket::serde::{Deserialize, Serialize};
use uzu::types::session::chat::{ChatMessage, ChatReplyPowerStats, ChatRole};
+use uzu_engine::data_type::DataType;
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct BenchTask {
diff --git a/crates/legacy/cli/src/bench/runner.rs b/crates/legacy/cli/src/bench/runner.rs
index e571ea9ec..b9f16c48c 100644
--- a/crates/legacy/cli/src/bench/runner.rs
+++ b/crates/legacy/cli/src/bench/runner.rs
@@ -4,7 +4,6 @@ use std::{
};
use anyhow::{Context, Result};
-use backend_uzu::{VERSION, data_type::DataType};
use shoji::types::model::{ModelFamily, ModelReference};
use sysinfo::System;
use uzu::{
@@ -15,6 +14,7 @@ use uzu::{
session::chat::{ChatConfig, ChatMessage, ChatReplyConfig, ChatReplyPowerStats},
},
};
+use uzu_engine::{VERSION, data_type::DataType};
use crate::bench::{
model::{BenchDevice, BenchResult, BenchTask},
diff --git a/crates/legacy/cli/src/interactive/components/logo.rs b/crates/legacy/cli/src/interactive/components/logo.rs
index d40ba36e0..867259e0d 100644
--- a/crates/legacy/cli/src/interactive/components/logo.rs
+++ b/crates/legacy/cli/src/interactive/components/logo.rs
@@ -1,6 +1,6 @@
-use backend_uzu::VERSION;
use indoc::indoc;
use iocraft::prelude::*;
+use uzu_engine::VERSION;
use crate::interactive::components::ApplicationState;
diff --git a/crates/legacy/uzu/Cargo.toml b/crates/legacy/uzu/Cargo.toml
index f96e879a4..f927a9f14 100644
--- a/crates/legacy/uzu/Cargo.toml
+++ b/crates/legacy/uzu/Cargo.toml
@@ -13,9 +13,9 @@ crate-type = ["lib", "cdylib", "staticlib"]
[features]
default = ["backend-cpu", "backend-metal", "capability-grammar"]
-backend-cpu = ["backend-uzu/cpu"]
-backend-metal = ["backend-uzu/metal"]
-capability-grammar = ["backend-uzu/grammar"]
+backend-cpu = ["uzu-engine/cpu"]
+backend-metal = ["uzu-engine/metal"]
+capability-grammar = ["uzu-engine/grammar"]
bindings = [
"bindings-uniffi",
"bindings-napi",
@@ -59,7 +59,7 @@ bindings-wasm = [
[dependencies]
bindings-types.workspace = true
bindings.workspace = true
-backend-uzu.workspace = true
+uzu-engine.workspace = true
kiban.workspace = true
shoji.workspace = true
anyhow.workspace = true
@@ -87,6 +87,10 @@ thiserror.workspace = true
futures.workspace = true
tokio = { workspace = true, features = ["full"] }
tokio-stream = { workspace = true, features = ["full"] }
+tokio-util.workspace = true
+parking_lot = { workspace = true, features = ["send_guard"] }
+tokenizers.workspace = true
+rand.workspace = true
dirs.workspace = true
sysinfo.workspace = true
reqwest.workspace = true
diff --git a/crates/backend-uzu/src/bridge/backend.rs b/crates/legacy/uzu/src/engine/bridge/backend.rs
similarity index 54%
rename from crates/backend-uzu/src/bridge/backend.rs
rename to crates/legacy/uzu/src/engine/bridge/backend.rs
index 607e3c361..2a79e874f 100644
--- a/crates/backend-uzu/src/bridge/backend.rs
+++ b/crates/legacy/uzu/src/engine/bridge/backend.rs
@@ -11,15 +11,44 @@ use shoji::{
},
types::session::chat::ChatConfig,
};
-
-use crate::{
+use uzu_engine::{
TOOLCHAIN_VERSION,
- backends::select_backend,
- bridge::{
- chat_token_backend::UzuChatTokenBackendInstance, classification_backend::UzuClassificationBackendInstance,
- },
+ backends::{BackendSelection, common::Backend, select_backend},
+};
+
+use crate::engine::bridge::{
+ chat_token_backend::UzuChatTokenBackendInstance, classification_backend::UzuClassificationBackendInstance,
};
+struct ChatTokenInstanceSelection {
+ reference: String,
+ config: ChatConfig,
+}
+
+impl BackendSelection for ChatTokenInstanceSelection {
+ type Output = Box<dyn ChatTokenInstance>;
+ type Error = BackendError;
+
+ fn select<B: Backend>(self) -> Result<Self::Output, Self::Error> {
+ UzuChatTokenBackendInstance::<B>::new(self.reference, self.config)
+ .map(|instance| Box::new(instance) as Box<dyn ChatTokenInstance>)
+ }
+}
+
+struct ClassificationInstanceSelection {
+ reference: String,
+}
+
+impl BackendSelection for ClassificationInstanceSelection {
+ type Output = Box<dyn ClassificationInstance>;
+ type Error = BackendError;
+
+ fn select<B: Backend>(self) -> Result<Self::Output, Self::Error> {
+ UzuClassificationBackendInstance::<B>::new(self.reference)
+ .map(|instance| Box::new(instance) as Box<dyn ClassificationInstance>)
+ }
+}
+
pub struct UzuLlmBackend;
impl UzuLlmBackend {
@@ -53,10 +82,12 @@ impl ChatTokenBackend for UzuLlmBackend {
config: ChatConfig,
) -> Pin<Box<dyn Future<Output = Result<Box<dyn ChatTokenInstance>, BackendError>> + Send + 'a>> {
Box::pin(async move {
- let instance = select_backend!(
- UzuChatTokenBackendInstance::<B>::new(reference, config)
- .map(|i| Box::new(i) as Box<dyn ChatTokenInstance>),
- BackendError::from("Unable to open any backend")
+ let instance = select_backend(
+ ChatTokenInstanceSelection {
+ reference,
+ config,
+ },
+ BackendError::from("Unable to open any backend"),
)?;
Ok(instance)
})
@@ -70,10 +101,11 @@ impl ClassificationBackend for UzuLlmBackend {
_config: Config,
) -> Pin<Box<dyn Future<Output = Result<Box<dyn ClassificationInstance>, BackendError>> + Send + '_>> {
Box::pin(async move {
- let instance = select_backend!(
- UzuClassificationBackendInstance::<B>::new(reference)
- .map(|i| Box::new(i) as Box<dyn ClassificationInstance>),
- BackendError::from("Unable to open any backend")
+ let instance = select_backend(
+ ClassificationInstanceSelection {
+ reference,
+ },
+ BackendError::from("Unable to open any backend"),
)?;
Ok(instance)
})
diff --git a/crates/backend-uzu/src/bridge/chat_token_backend.rs b/crates/legacy/uzu/src/engine/bridge/chat_token_backend.rs
similarity index 90%
rename from crates/backend-uzu/src/bridge/chat_token_backend.rs
rename to crates/legacy/uzu/src/engine/bridge/chat_token_backend.rs
index c25f56714..21a324eb8 100644
--- a/crates/backend-uzu/src/bridge/chat_token_backend.rs
+++ b/crates/legacy/uzu/src/engine/bridge/chat_token_backend.rs
@@ -26,25 +26,21 @@ use shoji::{
};
use tokenizers::Tokenizer;
use tokio_util::sync::CancellationToken;
-
-#[cfg(grammar)]
-use crate::bridge::helpers::get_grammar;
-use crate::{
+use uzu_engine::{
backends::common::Backend,
- bridge::{
- chat_token_state::UzuChatTokenBackendInstanceState,
- helpers::{error_stream, get_max_context_length, get_sampling_method},
- },
engine::{
Engine,
- language_model::{
- LanguageModel,
- state::LanguageModelState,
- stream::{LanguageModelStream, LanguageModelStreamOptions},
- },
+ language_model::{LanguageModel, state::LanguageModelState, stream::LanguageModelStream},
},
};
+#[cfg(feature = "capability-grammar")]
+use crate::engine::bridge::helpers::get_grammar;
+use crate::engine::bridge::{
+ chat_token_state::UzuChatTokenBackendInstanceState,
+ helpers::{error_stream, get_max_context_length, get_sampling_method},
+};
+
pub struct UzuChatTokenBackendInstance<B: Backend> {
engine: Arc<Engine<B>>,
model: Arc<LanguageModel<B>>,
@@ -118,7 +114,7 @@ impl<B: Backend> BackendInstance for UzuChatTokenBackendInstance<B> {
let token_limit = config.token_limit.map(|count| count as usize);
- #[cfg(grammar)]
+ #[cfg(feature = "capability-grammar")]
let grammar = if let Some(grammar_config) = config.grammar {
match get_grammar(grammar_config, self.model.tokenizer(), &self.stop_token_ids) {
Ok(grammar) => Some(grammar),
@@ -129,16 +125,17 @@ impl<B: Backend> BackendInstance for UzuChatTokenBackendInstance<B> {
} else {
None
};
- #[cfg(not(grammar))]
+ #[cfg(not(feature = "capability-grammar"))]
if config.grammar.is_some() {
return Box::pin(NoMetricsStream::new(error_stream("Grammar is not supported by this build".to_string())));
}
- let options = LanguageModelStreamOptions {
- sampling_method: get_sampling_method::<B>(&self.model, &config.sampling_policy),
- #[cfg(grammar)]
- grammar,
- };
+ let mut options = self.model.default_stream_options();
+ options.sampling_method = get_sampling_method::<B>(&self.model, &config.sampling_policy);
+ #[cfg(feature = "capability-grammar")]
+ {
+ options.grammar = grammar;
+ }
let stream = match self.model.stream(input, &mut state_guard, options) {
Ok(iter) => iter,
diff --git a/crates/backend-uzu/src/bridge/chat_token_state.rs b/crates/legacy/uzu/src/engine/bridge/chat_token_state.rs
similarity index 83%
rename from crates/backend-uzu/src/bridge/chat_token_state.rs
rename to crates/legacy/uzu/src/engine/bridge/chat_token_state.rs
index 855d35a29..7cc46b4b7 100644
--- a/crates/backend-uzu/src/bridge/chat_token_state.rs
+++ b/crates/legacy/uzu/src/engine/bridge/chat_token_state.rs
@@ -2,8 +2,7 @@ use std::sync::Arc;
use parking_lot::Mutex;
use shoji::traits::State as LlmInstanceState;
-
-use crate::{backends::common::Backend, engine::language_model::state::LanguageModelState};
+use uzu_engine::{backends::common::Backend, engine::language_model::state::LanguageModelState};
pub struct UzuChatTokenBackendInstanceState<B: Backend> {
pub value: Arc<Mutex<LanguageModelState<B>>>,
diff --git a/crates/backend-uzu/src/bridge/classification_backend.rs b/crates/legacy/uzu/src/engine/bridge/classification_backend.rs
similarity index 74%
rename from crates/backend-uzu/src/bridge/classification_backend.rs
rename to crates/legacy/uzu/src/engine/bridge/classification_backend.rs
index b837caefb..febd04bbd 100644
--- a/crates/backend-uzu/src/bridge/classification_backend.rs
+++ b/crates/legacy/uzu/src/engine/bridge/classification_backend.rs
@@ -14,14 +14,12 @@ use shoji::{
},
},
},
- types::session::classification::{ChatTokenCodecConfig, TokenCodecConfig},
+ types::session::classification::TokenCodecConfig,
};
use tokenizers::Tokenizer;
use tokio_util::sync::CancellationToken;
-
-use crate::{
+use uzu_engine::{
backends::common::Backend,
- config::token_codec::AnyTokenCodecConfig,
engine::{Engine, classifier_model::ClassifierModel},
};
@@ -83,20 +81,7 @@ impl<B: Backend> ClassificationInstance for UzuClassificationBackendInstance<B>
}
fn token_codec_config(&self) -> TokenCodecConfig {
- match self.model.lock().token_codec_config() {
- AnyTokenCodecConfig::ChatCodecConfig(config) => TokenCodecConfig::Chat(ChatTokenCodecConfig {
- prompt_template: config.prompt_template.clone(),
- output_parser_regex: config.output_parser_regex.clone(),
- system_role_name: config.system_role_name.clone(),
- user_role_name: config.user_role_name.clone(),
- assistant_role_name: config.assistant_role_name.clone(),
- eos_token: config.eos_token.clone(),
- bos_token: config.bos_token.clone(),
- end_of_thinking_tag: config.end_of_thinking_tag.clone(),
- default_system_prompt: config.default_system_prompt.clone(),
- }),
- AnyTokenCodecConfig::RawTextCodecConfig(_) => TokenCodecConfig::RawText,
- }
+ self.model.lock().token_codec_config()
}
}
diff --git a/crates/backend-uzu/src/bridge/helpers.rs b/crates/legacy/uzu/src/engine/bridge/helpers.rs
similarity index 87%
rename from crates/backend-uzu/src/bridge/helpers.rs
rename to crates/legacy/uzu/src/engine/bridge/helpers.rs
index 36eb42de9..1fc4e61bb 100644
--- a/crates/backend-uzu/src/bridge/helpers.rs
+++ b/crates/legacy/uzu/src/engine/bridge/helpers.rs
@@ -1,20 +1,19 @@
use std::pin::Pin;
use futures::{Stream, stream};
-#[cfg(grammar)]
+#[cfg(feature = "capability-grammar")]
use shoji::types::basic::Grammar as ShojiGrammar;
use shoji::{
traits::backend::{Error as BackendError, chat_token::StreamOutput as ChatTokenStreamOutput},
types::basic::{ContextLength, SamplingMethod as ShojiSamplingMethod, SamplingPolicy as ShojiSamplingPolicy},
};
-#[cfg(grammar)]
+#[cfg(feature = "capability-grammar")]
use tokenizers::Tokenizer;
-
-#[cfg(grammar)]
-use crate::engine::language_model::grammar::{Grammar as UzuGrammar, GrammarConfig, GrammarError};
-use crate::{
- backends::common::Backend, encodable_block::sampling::SamplingMethod as UzuSamplingMethod,
- engine::language_model::LanguageModel,
+#[cfg(feature = "capability-grammar")]
+use uzu_engine::engine::language_model::grammar::{Grammar as UzuGrammar, GrammarConfig, GrammarError};
+use uzu_engine::{
+ backends::common::Backend,
+ engine::language_model::{LanguageModel, stream::SamplingMethod as UzuSamplingMethod},
};
pub fn error_stream<'a>(
@@ -25,7 +24,7 @@ pub fn error_stream<'a>(
}))
}
-#[cfg(grammar)]
+#[cfg(feature = "capability-grammar")]
pub fn get_grammar(
grammar: ShojiGrammar,
tokenizer: &Tokenizer,
diff --git a/crates/backend-uzu/src/bridge/mod.rs b/crates/legacy/uzu/src/engine/bridge/mod.rs
similarity index 64%
rename from crates/backend-uzu/src/bridge/mod.rs
rename to crates/legacy/uzu/src/engine/bridge/mod.rs
index 3bcbc87e5..0989192da 100644
--- a/crates/backend-uzu/src/bridge/mod.rs
+++ b/crates/legacy/uzu/src/engine/bridge/mod.rs
@@ -3,7 +3,5 @@ mod chat_token_backend;
mod chat_token_state;
mod classification_backend;
mod helpers;
-mod model_metadata;
pub use backend::UzuLlmBackend;
-pub use model_metadata::resolve_model_specialization;
diff --git a/crates/legacy/uzu/src/engine/mod.rs b/crates/legacy/uzu/src/engine/mod.rs
index 4b96f6182..ea53ea698 100644
--- a/crates/legacy/uzu/src/engine/mod.rs
+++ b/crates/legacy/uzu/src/engine/mod.rs
@@ -1,3 +1,4 @@
+pub mod bridge;
mod callback;
pub mod config;
mod download_manager;
@@ -7,7 +8,6 @@ mod error;
use std::{collections::HashMap, sync::Arc, time::Duration};
use backend_remote::openai::Backend as OpenAIBackend;
-use backend_uzu::bridge::UzuLlmBackend;
pub use callback::{EngineCallback, EngineCallbackType};
pub use config::EngineConfig;
pub use download_manager::DownloadManagerType;
@@ -33,6 +33,7 @@ use tokio_stream::{StreamExt, wrappers::BroadcastStream};
use crate::{
device::Device,
+ engine::bridge::UzuLlmBackend,
helpers::{SharedAccess, is_endpoint_reachable},
logs,
registry::{
@@ -85,7 +86,7 @@ impl Engine {
);
let context = TelemetryContext::new(
env!("CARGO_PKG_VERSION").to_string(),
- backend_uzu::TOOLCHAIN_VERSION.to_string(),
+ uzu_engine::TOOLCHAIN_VERSION.to_string(),
TelemetryDevice {
os_name: device.os_name.clone(),
cpu_name: device.cpu_name.clone(),
diff --git a/crates/legacy/uzu/src/registry/local/config.rs b/crates/legacy/uzu/src/registry/local/config.rs
index 7fd9380a9..b6c189a6a 100644
--- a/crates/legacy/uzu/src/registry/local/config.rs
+++ b/crates/legacy/uzu/src/registry/local/config.rs
@@ -1,7 +1,10 @@
-use std::{path::PathBuf, sync::Arc};
+use std::{
+ path::{Path, PathBuf},
+ sync::Arc,
+};
-use backend_uzu::bridge::resolve_model_specialization;
-use shoji::types::model::Model;
+use shoji::types::model::{Model, ModelSpecialization};
+use uzu_engine::engine::{ModelType, resolve_model_type};
use crate::registry::RegistryError;
@@ -62,15 +65,23 @@ impl Config {
Self::new("local".to_string(), backend_identifier, backend_version, "Local".to_string(), path, Some(resolver))
}
+ fn resolve_model_specialization(model_path: &Path) -> Result<ModelSpecialization, RegistryError> {
+ resolve_model_type(model_path)
+ .map(|model_type| match model_type {
+ ModelType::LanguageModel => ModelSpecialization::Chat {},
+ ModelType::Classifier => ModelSpecialization::Classification {},
+ })
+ .map_err(|error| RegistryError::UnableToGetModels {
+ message: format!("Unable to resolve specialization for {}: {error}", model_path.display()),
+ })
+ }
+
fn resolve_model(mut model: Model) -> Result<Model, RegistryError> {
let model_path = model.local_external_path().ok_or_else(|| RegistryError::UnableToGetModels {
message: format!("Local model {} has no local path", model.identifier),
})?;
let model_path = PathBuf::from(model_path);
- let specialization =
- resolve_model_specialization(&model_path).map_err(|error| RegistryError::UnableToGetModels {
- message: format!("Unable to resolve specialization for {}: {error}", model_path.display()),
- })?;
+ let specialization = Self::resolve_model_specialization(&model_path)?;
model.specializations = vec![specialization];
Ok(model)
}
diff --git a/crates/backend-uzu-macros/Cargo.toml b/crates/uzu-engine-macros/Cargo.toml
similarity index 91%
rename from crates/backend-uzu-macros/Cargo.toml
rename to crates/uzu-engine-macros/Cargo.toml
index 09c283f09..1268544db 100644
--- a/crates/backend-uzu-macros/Cargo.toml
+++ b/crates/uzu-engine-macros/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "backend-uzu-macros"
+name = "uzu-engine-macros"
edition.workspace = true
rust-version.workspace = true
version.workspace = true
diff --git a/crates/backend-uzu-macros/src/dsl.rs b/crates/uzu-engine-macros/src/dsl.rs
similarity index 100%
rename from crates/backend-uzu-macros/src/dsl.rs
rename to crates/uzu-engine-macros/src/dsl.rs
diff --git a/crates/backend-uzu-macros/src/lib.rs b/crates/uzu-engine-macros/src/lib.rs
similarity index 100%
rename from crates/backend-uzu-macros/src/lib.rs
rename to crates/uzu-engine-macros/src/lib.rs
diff --git a/crates/backend-uzu-macros/src/uzu_config.rs b/crates/uzu-engine-macros/src/uzu_config.rs
similarity index 98%
rename from crates/backend-uzu-macros/src/uzu_config.rs
rename to crates/uzu-engine-macros/src/uzu_config.rs
index b50fce499..032e150f0 100644
--- a/crates/backend-uzu-macros/src/uzu_config.rs
+++ b/crates/uzu-engine-macros/src/uzu_config.rs
@@ -79,7 +79,7 @@ pub fn uzu_config_abstract(
use #struct_ident;
- #[backend_uzu_macros::uzu_config]
+ #[uzu_engine_macros::uzu_config]
#[serde(untagged)]
#input_vis enum #enum_ident {
#(#enum_variants,)*
@@ -146,7 +146,7 @@ pub fn uzu_config(
return quote! {
macro_rules! #callback_ident {
($($super_fields:tt)*) => {
- #[backend_uzu_macros::uzu_config]
+ #[uzu_engine_macros::uzu_config]
#(#input_attrs)*
#input_vis struct #input_ident #input_generics {
#[serde(rename = "type")]
diff --git a/crates/backend-uzu-macros/src/uzu_test.rs b/crates/uzu-engine-macros/src/uzu_test.rs
similarity index 100%
rename from crates/backend-uzu-macros/src/uzu_test.rs
rename to crates/uzu-engine-macros/src/uzu_test.rs
diff --git a/crates/backend-uzu/BENCHMARKS.md b/crates/uzu-engine/BENCHMARKS.md
similarity index 95%
rename from crates/backend-uzu/BENCHMARKS.md
rename to crates/uzu-engine/BENCHMARKS.md
index 6dafd3545..06662faca 100644
--- a/crates/backend-uzu/BENCHMARKS.md
+++ b/crates/uzu-engine/BENCHMARKS.md
@@ -23,8 +23,8 @@ so you can compare baselines side by side.
## Available benchmark groups
-Benchmarks live inside the `backend-uzu` library test target (registered with `#[uzu_bench]` under
-`crates/backend-uzu/unit/`), so the Cargo target is `--lib`.
+Benchmarks live inside the `uzu-engine` library test target (registered with `#[uzu_bench]` under
+`crates/uzu-engine/unit/`), so the Cargo target is `--lib`.
| Group id | Filter |
|-----------------------------------------|-------------------------------------|
@@ -53,7 +53,7 @@ From the repo root. Use an **absolute** `CRITERION_HOME` so it doesn't resolve r
```bash
CRITERION_HOME="$PWD/target/criterion/m2_max" cargo bench \
- -p backend-uzu \
+ -p uzu-engine \
--lib -- "Metal/Kernel/Matmul" \
--save-baseline matmul_baseline_m2_max
```
@@ -89,7 +89,7 @@ IPHONEOS_DEPLOYMENT_TARGET=26.4 cargo dinghy \
-d "$DEVICE" \
-e CRITERION_HOME=criterion/a19 \
--sync-dirs "$(pwd)/target/criterion=Documents/criterion" \
- bench -p backend-uzu --lib -- \
+ bench -p uzu-engine --lib -- \
"Metal/Kernel/Matmul" \
--save-baseline matmul_baseline_a19
```
diff --git a/crates/backend-uzu/Cargo.toml b/crates/uzu-engine/Cargo.toml
similarity index 92%
rename from crates/backend-uzu/Cargo.toml
rename to crates/uzu-engine/Cargo.toml
index d5ccdb8a1..1e0bbcbda 100644
--- a/crates/backend-uzu/Cargo.toml
+++ b/crates/uzu-engine/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "backend-uzu"
+name = "uzu-engine"
edition.workspace = true
rust-version.workspace = true
version.workspace = true
@@ -15,7 +15,7 @@ workspace = true
[features]
default = ["cpu", "metal", "grammar"]
-cpu = []
+cpu = [] # TODO: move libm here
metal = [
"dep:clang-ast",
@@ -56,7 +56,7 @@ xxhash-rust = { workspace = true, features = ["xxh3"], optional = true }
zstd = { workspace = true, optional = true }
[dependencies]
-backend-uzu-macros.workspace = true
+uzu-engine-macros.workspace = true
bitflags.workspace = true
derive_more.workspace = true
shoji.workspace = true
@@ -68,15 +68,10 @@ thiserror.workspace = true
tokenizers.workspace = true
rangemap.workspace = true
bytemuck = { workspace = true, features = ["derive"] }
-memmap2.workspace = true
num-traits.workspace = true
libm.workspace = true
-rand.workspace = true
itertools.workspace = true
-rustix.workspace = true
-futures.workspace = true
-parking_lot = { workspace = true, features = ["send_guard"] }
-tokio-util.workspace = true
+parking_lot.workspace = true
[target.'cfg(any(target_os = "macos", target_os = "ios", target_os = "tvos", target_os = "visionos"))'.dependencies]
objc2 = { workspace = true, optional = true }
@@ -94,6 +89,7 @@ test-tag.workspace = true
test-runner = { workspace = true, features = ["nightly-harness"] }
proptest.workspace = true
criterion.workspace = true
+rand.workspace = true
rand_distr.workspace = true
is_close.workspace = true
ndarray.workspace = true
diff --git a/crates/backend-uzu/build/common/caching.rs b/crates/uzu-engine/build/common/caching.rs
similarity index 100%
rename from crates/backend-uzu/build/common/caching.rs
rename to crates/uzu-engine/build/common/caching.rs
diff --git a/crates/backend-uzu/build/common/codegen.rs b/crates/uzu-engine/build/common/codegen.rs
similarity index 100%
rename from crates/backend-uzu/build/common/codegen.rs
rename to crates/uzu-engine/build/common/codegen.rs
diff --git a/crates/backend-uzu/build/common/compiler.rs b/crates/uzu-engine/build/common/compiler.rs
similarity index 100%
rename from crates/backend-uzu/build/common/compiler.rs
rename to crates/uzu-engine/build/common/compiler.rs
diff --git a/crates/backend-uzu/build/common/constraints.rs b/crates/uzu-engine/build/common/constraints.rs
similarity index 100%
rename from crates/backend-uzu/build/common/constraints.rs
rename to crates/uzu-engine/build/common/constraints.rs
diff --git a/crates/backend-uzu/build/common/enum_paths.rs b/crates/uzu-engine/build/common/enum_paths.rs
similarity index 100%
rename from crates/backend-uzu/build/common/enum_paths.rs
rename to crates/uzu-engine/build/common/enum_paths.rs
diff --git a/crates/backend-uzu/build/common/envs.rs b/crates/uzu-engine/build/common/envs.rs
similarity index 100%
rename from crates/backend-uzu/build/common/envs.rs
rename to crates/uzu-engine/build/common/envs.rs
diff --git a/crates/backend-uzu/build/common/expr_rewrite.rs b/crates/uzu-engine/build/common/expr_rewrite.rs
similarity index 100%
rename from crates/backend-uzu/build/common/expr_rewrite.rs
rename to crates/uzu-engine/build/common/expr_rewrite.rs
diff --git a/crates/backend-uzu/build/common/gpu_types/item_constant.rs b/crates/uzu-engine/build/common/gpu_types/item_constant.rs
similarity index 100%
rename from crates/backend-uzu/build/common/gpu_types/item_constant.rs
rename to crates/uzu-engine/build/common/gpu_types/item_constant.rs
diff --git a/crates/backend-uzu/build/common/gpu_types/item_enum.rs b/crates/uzu-engine/build/common/gpu_types/item_enum.rs
similarity index 100%
rename from crates/backend-uzu/build/common/gpu_types/item_enum.rs
rename to crates/uzu-engine/build/common/gpu_types/item_enum.rs
diff --git a/crates/backend-uzu/build/common/gpu_types/item_option_set.rs b/crates/uzu-engine/build/common/gpu_types/item_option_set.rs
similarity index 100%
rename from crates/backend-uzu/build/common/gpu_types/item_option_set.rs
rename to crates/uzu-engine/build/common/gpu_types/item_option_set.rs
diff --git a/crates/backend-uzu/build/common/gpu_types/item_struct.rs b/crates/uzu-engine/build/common/gpu_types/item_struct.rs
similarity index 100%
rename from crates/backend-uzu/build/common/gpu_types/item_struct.rs
rename to crates/uzu-engine/build/common/gpu_types/item_struct.rs
diff --git a/crates/backend-uzu/build/common/gpu_types/mod.rs b/crates/uzu-engine/build/common/gpu_types/mod.rs
similarity index 100%
rename from crates/backend-uzu/build/common/gpu_types/mod.rs
rename to crates/uzu-engine/build/common/gpu_types/mod.rs
diff --git a/crates/backend-uzu/build/common/identifiers.rs b/crates/uzu-engine/build/common/identifiers.rs
similarity index 100%
rename from crates/backend-uzu/build/common/identifiers.rs
rename to crates/uzu-engine/build/common/identifiers.rs
diff --git a/crates/backend-uzu/build/common/kernel.rs b/crates/uzu-engine/build/common/kernel.rs
similarity index 100%
rename from crates/backend-uzu/build/common/kernel.rs
rename to crates/uzu-engine/build/common/kernel.rs
diff --git a/crates/backend-uzu/build/common/logging.rs b/crates/uzu-engine/build/common/logging.rs
similarity index 100%
rename from crates/backend-uzu/build/common/logging.rs
rename to crates/uzu-engine/build/common/logging.rs
diff --git a/crates/backend-uzu/build/common/mangling.rs b/crates/uzu-engine/build/common/mangling.rs
similarity index 100%
rename from crates/backend-uzu/build/common/mangling.rs
rename to crates/uzu-engine/build/common/mangling.rs
diff --git a/crates/backend-uzu/build/common/mod.rs b/crates/uzu-engine/build/common/mod.rs
similarity index 100%
rename from crates/backend-uzu/build/common/mod.rs
rename to crates/uzu-engine/build/common/mod.rs
diff --git a/crates/backend-uzu/build/common/traitgen.rs b/crates/uzu-engine/build/common/traitgen.rs
similarity index 100%
rename from crates/backend-uzu/build/common/traitgen.rs
rename to crates/uzu-engine/build/common/traitgen.rs
diff --git a/crates/backend-uzu/build/cpu/compiler.rs b/crates/uzu-engine/build/cpu/compiler.rs
similarity index 100%
rename from crates/backend-uzu/build/cpu/compiler.rs
rename to crates/uzu-engine/build/cpu/compiler.rs
diff --git a/crates/backend-uzu/build/cpu/mod.rs b/crates/uzu-engine/build/cpu/mod.rs
similarity index 100%
rename from crates/backend-uzu/build/cpu/mod.rs
rename to crates/uzu-engine/build/cpu/mod.rs
diff --git a/crates/backend-uzu/build/main.rs b/crates/uzu-engine/build/main.rs
similarity index 100%
rename from crates/backend-uzu/build/main.rs
rename to crates/uzu-engine/build/main.rs
diff --git a/crates/backend-uzu/build/metal/ast.rs b/crates/uzu-engine/build/metal/ast.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/ast.rs
rename to crates/uzu-engine/build/metal/ast.rs
diff --git a/crates/backend-uzu/build/metal/bindgen/arguments.rs b/crates/uzu-engine/build/metal/bindgen/arguments.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/bindgen/arguments.rs
rename to crates/uzu-engine/build/metal/bindgen/arguments.rs
diff --git a/crates/backend-uzu/build/metal/bindgen/dispatch.rs b/crates/uzu-engine/build/metal/bindgen/dispatch.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/bindgen/dispatch.rs
rename to crates/uzu-engine/build/metal/bindgen/dispatch.rs
diff --git a/crates/backend-uzu/build/metal/bindgen/host_expression_rewriter.rs b/crates/uzu-engine/build/metal/bindgen/host_expression_rewriter.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/bindgen/host_expression_rewriter.rs
rename to crates/uzu-engine/build/metal/bindgen/host_expression_rewriter.rs
diff --git a/crates/backend-uzu/build/metal/bindgen/mod.rs b/crates/uzu-engine/build/metal/bindgen/mod.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/bindgen/mod.rs
rename to crates/uzu-engine/build/metal/bindgen/mod.rs
diff --git a/crates/backend-uzu/build/metal/bindgen/specialize.rs b/crates/uzu-engine/build/metal/bindgen/specialize.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/bindgen/specialize.rs
rename to crates/uzu-engine/build/metal/bindgen/specialize.rs
diff --git a/crates/backend-uzu/build/metal/bindgen/trait_wiring.rs b/crates/uzu-engine/build/metal/bindgen/trait_wiring.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/bindgen/trait_wiring.rs
rename to crates/uzu-engine/build/metal/bindgen/trait_wiring.rs
diff --git a/crates/backend-uzu/build/metal/bindgen/variants.rs b/crates/uzu-engine/build/metal/bindgen/variants.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/bindgen/variants.rs
rename to crates/uzu-engine/build/metal/bindgen/variants.rs
diff --git a/crates/backend-uzu/build/metal/compiler.rs b/crates/uzu-engine/build/metal/compiler.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/compiler.rs
rename to crates/uzu-engine/build/metal/compiler.rs
diff --git a/crates/backend-uzu/build/metal/enum_path_rewrite.rs b/crates/uzu-engine/build/metal/enum_path_rewrite.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/enum_path_rewrite.rs
rename to crates/uzu-engine/build/metal/enum_path_rewrite.rs
diff --git a/crates/backend-uzu/build/metal/gpu_types/gpu_type_constant.rs b/crates/uzu-engine/build/metal/gpu_types/gpu_type_constant.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/gpu_types/gpu_type_constant.rs
rename to crates/uzu-engine/build/metal/gpu_types/gpu_type_constant.rs
diff --git a/crates/backend-uzu/build/metal/gpu_types/gpu_type_enum.rs b/crates/uzu-engine/build/metal/gpu_types/gpu_type_enum.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/gpu_types/gpu_type_enum.rs
rename to crates/uzu-engine/build/metal/gpu_types/gpu_type_enum.rs
diff --git a/crates/backend-uzu/build/metal/gpu_types/gpu_type_option_set.rs b/crates/uzu-engine/build/metal/gpu_types/gpu_type_option_set.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/gpu_types/gpu_type_option_set.rs
rename to crates/uzu-engine/build/metal/gpu_types/gpu_type_option_set.rs
diff --git a/crates/backend-uzu/build/metal/gpu_types/gpu_type_struct.rs b/crates/uzu-engine/build/metal/gpu_types/gpu_type_struct.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/gpu_types/gpu_type_struct.rs
rename to crates/uzu-engine/build/metal/gpu_types/gpu_type_struct.rs
diff --git a/crates/backend-uzu/build/metal/gpu_types/mod.rs b/crates/uzu-engine/build/metal/gpu_types/mod.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/gpu_types/mod.rs
rename to crates/uzu-engine/build/metal/gpu_types/mod.rs
diff --git a/crates/backend-uzu/build/metal/gpu_types/template.ht b/crates/uzu-engine/build/metal/gpu_types/template.ht
similarity index 100%
rename from crates/backend-uzu/build/metal/gpu_types/template.ht
rename to crates/uzu-engine/build/metal/gpu_types/template.ht
diff --git a/crates/backend-uzu/build/metal/mod.rs b/crates/uzu-engine/build/metal/mod.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/mod.rs
rename to crates/uzu-engine/build/metal/mod.rs
diff --git a/crates/backend-uzu/build/metal/toolchain.rs b/crates/uzu-engine/build/metal/toolchain.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/toolchain.rs
rename to crates/uzu-engine/build/metal/toolchain.rs
diff --git a/crates/backend-uzu/build/metal/wrapper.rs b/crates/uzu-engine/build/metal/wrapper.rs
similarity index 100%
rename from crates/backend-uzu/build/metal/wrapper.rs
rename to crates/uzu-engine/build/metal/wrapper.rs
diff --git a/crates/backend-uzu/src/array/element.rs b/crates/uzu-engine/src/array/element.rs
similarity index 100%
rename from crates/backend-uzu/src/array/element.rs
rename to crates/uzu-engine/src/array/element.rs
diff --git a/crates/backend-uzu/src/array/mod.rs b/crates/uzu-engine/src/array/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/array/mod.rs
rename to crates/uzu-engine/src/array/mod.rs
diff --git a/crates/backend-uzu/src/array/util.rs b/crates/uzu-engine/src/array/util.rs
similarity index 100%
rename from crates/backend-uzu/src/array/util.rs
rename to crates/uzu-engine/src/array/util.rs
diff --git a/crates/backend-uzu/src/backends/common/allocator/allocator.rs b/crates/uzu-engine/src/backends/common/allocator/allocator.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/allocator/allocator.rs
rename to crates/uzu-engine/src/backends/common/allocator/allocator.rs
diff --git a/crates/backend-uzu/src/backends/common/allocator/mod.rs b/crates/uzu-engine/src/backends/common/allocator/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/allocator/mod.rs
rename to crates/uzu-engine/src/backends/common/allocator/mod.rs
diff --git a/crates/backend-uzu/src/backends/common/allocator/range_allocator.rs b/crates/uzu-engine/src/backends/common/allocator/range_allocator.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/allocator/range_allocator.rs
rename to crates/uzu-engine/src/backends/common/allocator/range_allocator.rs
diff --git a/crates/backend-uzu/src/backends/common/backend.rs b/crates/uzu-engine/src/backends/common/backend.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/backend.rs
rename to crates/uzu-engine/src/backends/common/backend.rs
diff --git a/crates/backend-uzu/src/backends/common/buffer/arg.rs b/crates/uzu-engine/src/backends/common/buffer/arg.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/buffer/arg.rs
rename to crates/uzu-engine/src/backends/common/buffer/arg.rs
diff --git a/crates/backend-uzu/src/backends/common/buffer/dense.rs b/crates/uzu-engine/src/backends/common/buffer/dense.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/buffer/dense.rs
rename to crates/uzu-engine/src/backends/common/buffer/dense.rs
diff --git a/crates/backend-uzu/src/backends/common/buffer/mod.rs b/crates/uzu-engine/src/backends/common/buffer/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/buffer/mod.rs
rename to crates/uzu-engine/src/backends/common/buffer/mod.rs
diff --git a/crates/backend-uzu/src/backends/common/buffer/range.rs b/crates/uzu-engine/src/backends/common/buffer/range.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/buffer/range.rs
rename to crates/uzu-engine/src/backends/common/buffer/range.rs
diff --git a/crates/backend-uzu/src/backends/common/buffer/sparse.rs b/crates/uzu-engine/src/backends/common/buffer/sparse.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/buffer/sparse.rs
rename to crates/uzu-engine/src/backends/common/buffer/sparse.rs
diff --git a/crates/backend-uzu/src/backends/common/command_buffer.rs b/crates/uzu-engine/src/backends/common/command_buffer.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/command_buffer.rs
rename to crates/uzu-engine/src/backends/common/command_buffer.rs
diff --git a/crates/backend-uzu/src/backends/common/context.rs b/crates/uzu-engine/src/backends/common/context.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/context.rs
rename to crates/uzu-engine/src/backends/common/context.rs
diff --git a/crates/backend-uzu/src/backends/common/device_capabilities.rs b/crates/uzu-engine/src/backends/common/device_capabilities.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/device_capabilities.rs
rename to crates/uzu-engine/src/backends/common/device_capabilities.rs
diff --git a/crates/backend-uzu/src/backends/common/encoder.rs b/crates/uzu-engine/src/backends/common/encoder.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/encoder.rs
rename to crates/uzu-engine/src/backends/common/encoder.rs
diff --git a/crates/backend-uzu/src/backends/common/gpu_types/activation_transform.rs b/crates/uzu-engine/src/backends/common/gpu_types/activation_transform.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/gpu_types/activation_transform.rs
rename to crates/uzu-engine/src/backends/common/gpu_types/activation_transform.rs
diff --git a/crates/backend-uzu/src/backends/common/gpu_types/activation_type.rs b/crates/uzu-engine/src/backends/common/gpu_types/activation_type.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/gpu_types/activation_type.rs
rename to crates/uzu-engine/src/backends/common/gpu_types/activation_type.rs
diff --git a/crates/backend-uzu/src/backends/common/gpu_types/attention.rs b/crates/uzu-engine/src/backends/common/gpu_types/attention.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/gpu_types/attention.rs
rename to crates/uzu-engine/src/backends/common/gpu_types/attention.rs
diff --git a/crates/backend-uzu/src/backends/common/gpu_types/gated_act_mul.rs b/crates/uzu-engine/src/backends/common/gpu_types/gated_act_mul.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/gpu_types/gated_act_mul.rs
rename to crates/uzu-engine/src/backends/common/gpu_types/gated_act_mul.rs
diff --git a/crates/backend-uzu/src/backends/common/gpu_types/gemm.rs b/crates/uzu-engine/src/backends/common/gpu_types/gemm.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/gpu_types/gemm.rs
rename to crates/uzu-engine/src/backends/common/gpu_types/gemm.rs
diff --git a/crates/backend-uzu/src/backends/common/gpu_types/hadamard_order.rs b/crates/uzu-engine/src/backends/common/gpu_types/hadamard_order.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/gpu_types/hadamard_order.rs
rename to crates/uzu-engine/src/backends/common/gpu_types/hadamard_order.rs
diff --git a/crates/backend-uzu/src/backends/common/gpu_types/kv_cache_update.rs b/crates/uzu-engine/src/backends/common/gpu_types/kv_cache_update.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/gpu_types/kv_cache_update.rs
rename to crates/uzu-engine/src/backends/common/gpu_types/kv_cache_update.rs
diff --git a/crates/backend-uzu/src/backends/common/gpu_types/matmul.rs b/crates/uzu-engine/src/backends/common/gpu_types/matmul.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/gpu_types/matmul.rs
rename to crates/uzu-engine/src/backends/common/gpu_types/matmul.rs
diff --git a/crates/backend-uzu/src/backends/common/gpu_types/mod.rs b/crates/uzu-engine/src/backends/common/gpu_types/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/gpu_types/mod.rs
rename to crates/uzu-engine/src/backends/common/gpu_types/mod.rs
diff --git a/crates/backend-uzu/src/backends/common/gpu_types/quantization.rs b/crates/uzu-engine/src/backends/common/gpu_types/quantization.rs
similarity index 97%
rename from crates/backend-uzu/src/backends/common/gpu_types/quantization.rs
rename to crates/uzu-engine/src/backends/common/gpu_types/quantization.rs
index 579528e1d..be0cce87c 100644
--- a/crates/backend-uzu/src/backends/common/gpu_types/quantization.rs
+++ b/crates/uzu-engine/src/backends/common/gpu_types/quantization.rs
@@ -1,5 +1,5 @@
-use backend_uzu_macros::uzu_config;
use derive_more::Display;
+use uzu_engine_macros::uzu_config;
use crate::data_type::DataType;
diff --git a/crates/backend-uzu/src/backends/common/gpu_types/quantization_method.rs b/crates/uzu-engine/src/backends/common/gpu_types/quantization_method.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/gpu_types/quantization_method.rs
rename to crates/uzu-engine/src/backends/common/gpu_types/quantization_method.rs
diff --git a/crates/backend-uzu/src/backends/common/gpu_types/ring.rs b/crates/uzu-engine/src/backends/common/gpu_types/ring.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/gpu_types/ring.rs
rename to crates/uzu-engine/src/backends/common/gpu_types/ring.rs
diff --git a/crates/backend-uzu/src/backends/common/gpu_types/trie.rs b/crates/uzu-engine/src/backends/common/gpu_types/trie.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/gpu_types/trie.rs
rename to crates/uzu-engine/src/backends/common/gpu_types/trie.rs
diff --git a/crates/backend-uzu/src/backends/common/gpu_types/weaver.rs b/crates/uzu-engine/src/backends/common/gpu_types/weaver.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/gpu_types/weaver.rs
rename to crates/uzu-engine/src/backends/common/gpu_types/weaver.rs
diff --git a/crates/backend-uzu/src/backends/common/hazard_tracker.rs b/crates/uzu-engine/src/backends/common/hazard_tracker.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/hazard_tracker.rs
rename to crates/uzu-engine/src/backends/common/hazard_tracker.rs
diff --git a/crates/backend-uzu/src/backends/common/kernel/activation_transform.rs b/crates/uzu-engine/src/backends/common/kernel/activation_transform.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/kernel/activation_transform.rs
rename to crates/uzu-engine/src/backends/common/kernel/activation_transform.rs
diff --git a/crates/backend-uzu/src/backends/common/kernel/attention_gemm/kernel.rs b/crates/uzu-engine/src/backends/common/kernel/attention_gemm/kernel.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/kernel/attention_gemm/kernel.rs
rename to crates/uzu-engine/src/backends/common/kernel/attention_gemm/kernel.rs
diff --git a/crates/backend-uzu/src/backends/common/kernel/attention_gemm/mod.rs b/crates/uzu-engine/src/backends/common/kernel/attention_gemm/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/kernel/attention_gemm/mod.rs
rename to crates/uzu-engine/src/backends/common/kernel/attention_gemm/mod.rs
diff --git a/crates/backend-uzu/src/backends/common/kernel/delta_net_chunked_prefill.rs b/crates/uzu-engine/src/backends/common/kernel/delta_net_chunked_prefill.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/kernel/delta_net_chunked_prefill.rs
rename to crates/uzu-engine/src/backends/common/kernel/delta_net_chunked_prefill.rs
diff --git a/crates/backend-uzu/src/backends/common/kernel/delta_net_tree_verify.rs b/crates/uzu-engine/src/backends/common/kernel/delta_net_tree_verify.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/kernel/delta_net_tree_verify.rs
rename to crates/uzu-engine/src/backends/common/kernel/delta_net_tree_verify.rs
diff --git a/crates/backend-uzu/src/backends/common/kernel/gated_act_mul.rs b/crates/uzu-engine/src/backends/common/kernel/gated_act_mul.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/kernel/gated_act_mul.rs
rename to crates/uzu-engine/src/backends/common/kernel/gated_act_mul.rs
diff --git a/crates/backend-uzu/src/backends/common/kernel/matmul/arguments.rs b/crates/uzu-engine/src/backends/common/kernel/matmul/arguments.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/kernel/matmul/arguments.rs
rename to crates/uzu-engine/src/backends/common/kernel/matmul/arguments.rs
diff --git a/crates/backend-uzu/src/backends/common/kernel/matmul/d_ops.rs b/crates/uzu-engine/src/backends/common/kernel/matmul/d_ops.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/kernel/matmul/d_ops.rs
rename to crates/uzu-engine/src/backends/common/kernel/matmul/d_ops.rs
diff --git a/crates/backend-uzu/src/backends/common/kernel/matmul/error.rs b/crates/uzu-engine/src/backends/common/kernel/matmul/error.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/kernel/matmul/error.rs
rename to crates/uzu-engine/src/backends/common/kernel/matmul/error.rs
diff --git a/crates/backend-uzu/src/backends/common/kernel/matmul/kernel.rs b/crates/uzu-engine/src/backends/common/kernel/matmul/kernel.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/kernel/matmul/kernel.rs
rename to crates/uzu-engine/src/backends/common/kernel/matmul/kernel.rs
diff --git a/crates/backend-uzu/src/backends/common/kernel/matmul/matmul_a.rs b/crates/uzu-engine/src/backends/common/kernel/matmul/matmul_a.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/kernel/matmul/matmul_a.rs
rename to crates/uzu-engine/src/backends/common/kernel/matmul/matmul_a.rs
diff --git a/crates/backend-uzu/src/backends/common/kernel/matmul/matmul_b.rs b/crates/uzu-engine/src/backends/common/kernel/matmul/matmul_b.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/kernel/matmul/matmul_b.rs
rename to crates/uzu-engine/src/backends/common/kernel/matmul/matmul_b.rs
diff --git a/crates/backend-uzu/src/backends/common/kernel/matmul/mod.rs b/crates/uzu-engine/src/backends/common/kernel/matmul/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/kernel/matmul/mod.rs
rename to crates/uzu-engine/src/backends/common/kernel/matmul/mod.rs
diff --git a/crates/backend-uzu/src/backends/common/kernel/matmul/routing.rs b/crates/uzu-engine/src/backends/common/kernel/matmul/routing.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/kernel/matmul/routing.rs
rename to crates/uzu-engine/src/backends/common/kernel/matmul/routing.rs
diff --git a/crates/backend-uzu/src/backends/common/kernel/mod.rs b/crates/uzu-engine/src/backends/common/kernel/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/kernel/mod.rs
rename to crates/uzu-engine/src/backends/common/kernel/mod.rs
diff --git a/crates/backend-uzu/src/backends/common/kernel/radix_top_k_small.rs b/crates/uzu-engine/src/backends/common/kernel/radix_top_k_small.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/kernel/radix_top_k_small.rs
rename to crates/uzu-engine/src/backends/common/kernel/radix_top_k_small.rs
diff --git a/crates/backend-uzu/src/backends/common/mod.rs b/crates/uzu-engine/src/backends/common/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/common/mod.rs
rename to crates/uzu-engine/src/backends/common/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/backend.rs b/crates/uzu-engine/src/backends/cpu/backend.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/backend.rs
rename to crates/uzu-engine/src/backends/cpu/backend.rs
diff --git a/crates/backend-uzu/src/backends/cpu/buffer.rs b/crates/uzu-engine/src/backends/cpu/buffer.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/buffer.rs
rename to crates/uzu-engine/src/backends/cpu/buffer.rs
diff --git a/crates/backend-uzu/src/backends/cpu/command_buffer.rs b/crates/uzu-engine/src/backends/cpu/command_buffer.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/command_buffer.rs
rename to crates/uzu-engine/src/backends/cpu/command_buffer.rs
diff --git a/crates/backend-uzu/src/backends/cpu/context.rs b/crates/uzu-engine/src/backends/cpu/context.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/context.rs
rename to crates/uzu-engine/src/backends/cpu/context.rs
diff --git a/crates/backend-uzu/src/backends/cpu/dense_buffer.rs b/crates/uzu-engine/src/backends/cpu/dense_buffer.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/dense_buffer.rs
rename to crates/uzu-engine/src/backends/cpu/dense_buffer.rs
diff --git a/crates/backend-uzu/src/backends/cpu/error.rs b/crates/uzu-engine/src/backends/cpu/error.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/error.rs
rename to crates/uzu-engine/src/backends/cpu/error.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/activation/activation.rs b/crates/uzu-engine/src/backends/cpu/kernel/activation/activation.rs
similarity index 94%
rename from crates/backend-uzu/src/backends/cpu/kernel/activation/activation.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/activation/activation.rs
index b9dbca2d8..190adffc9 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/activation/activation.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/activation/activation.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/activation/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/activation/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/activation/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/activation/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/activation_transform/activation_transform.rs b/crates/uzu-engine/src/backends/cpu/kernel/activation_transform/activation_transform.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/activation_transform/activation_transform.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/activation_transform/activation_transform.rs
index 57f35e0c6..67ae30e6d 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/activation_transform/activation_transform.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/activation_transform/activation_transform.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::{Float, NumCast};
+use uzu_engine_macros::kernel;
use super::{hadamard_transform, min_max_symmetric_divisor, quantize_symmetric_i8};
use crate::{
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/activation_transform/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/activation_transform/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/activation_transform/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/activation_transform/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/ancestor_attention.rs b/crates/uzu-engine/src/backends/cpu/kernel/attention/ancestor_attention.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/attention/ancestor_attention.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/attention/ancestor_attention.rs
index 274646cc0..4b83aaf08 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/attention/ancestor_attention.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/attention/ancestor_attention.rs
@@ -1,5 +1,5 @@
-use backend_uzu_macros::kernel;
use half::bf16;
+use uzu_engine_macros::kernel;
use super::attention_single_pass::attention_single_pass;
use crate::backends::common::gpu_types::weaver::MetadataIdx;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_fallback.rs b/crates/uzu-engine/src/backends/cpu/kernel/attention/attention_fallback.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/attention/attention_fallback.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/attention/attention_fallback.rs
index c5a27f0ae..842e3b020 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_fallback.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/attention/attention_fallback.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_prepare.rs b/crates/uzu-engine/src/backends/cpu/kernel/attention/attention_prepare.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/attention/attention_prepare.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/attention/attention_prepare.rs
index 1a866c769..05726edd0 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_prepare.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/attention/attention_prepare.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_single_pass.rs b/crates/uzu-engine/src/backends/cpu/kernel/attention/attention_single_pass.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/attention/attention_single_pass.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/attention/attention_single_pass.rs
index b90a6caf8..75eb1a955 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_single_pass.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/attention/attention_single_pass.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_two_pass.rs b/crates/uzu-engine/src/backends/cpu/kernel/attention/attention_two_pass.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/attention/attention_two_pass.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/attention/attention_two_pass.rs
index a92d6e1be..e696d7cdc 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_two_pass.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/attention/attention_two_pass.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/kv_cache_update.rs b/crates/uzu-engine/src/backends/cpu/kernel/attention/kv_cache_update.rs
similarity index 96%
rename from crates/backend-uzu/src/backends/cpu/kernel/attention/kv_cache_update.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/attention/kv_cache_update.rs
index c172ef9a7..026a4486b 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/attention/kv_cache_update.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/attention/kv_cache_update.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/mask.rs b/crates/uzu-engine/src/backends/cpu/kernel/attention/mask.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/attention/mask.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/attention/mask.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/attention/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/attention/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/attention/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/qkv_norm.rs b/crates/uzu-engine/src/backends/cpu/kernel/attention/qkv_norm.rs
similarity index 98%
rename from crates/backend-uzu/src/backends/cpu/kernel/attention/qkv_norm.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/attention/qkv_norm.rs
index 15ba45d5d..4a37c2061 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/attention/qkv_norm.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/attention/qkv_norm.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/sigmoid_gate.rs b/crates/uzu-engine/src/backends/cpu/kernel/attention/sigmoid_gate.rs
similarity index 94%
rename from crates/backend-uzu/src/backends/cpu/kernel/attention/sigmoid_gate.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/attention/sigmoid_gate.rs
index 9c2274d5b..6bf4883fc 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/attention/sigmoid_gate.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/attention/sigmoid_gate.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/embedding/full_precision_embedding.rs b/crates/uzu-engine/src/backends/cpu/kernel/embedding/full_precision_embedding.rs
similarity index 96%
rename from crates/backend-uzu/src/backends/cpu/kernel/embedding/full_precision_embedding.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/embedding/full_precision_embedding.rs
index a6c139818..8b1da99e1 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/embedding/full_precision_embedding.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/embedding/full_precision_embedding.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/embedding/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/embedding/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/embedding/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/embedding/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/embedding/quant_embedding.rs b/crates/uzu-engine/src/backends/cpu/kernel/embedding/quant_embedding.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/embedding/quant_embedding.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/embedding/quant_embedding.rs
index f01cbb9b3..16a31203b 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/embedding/quant_embedding.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/embedding/quant_embedding.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/gated_act_mul/gated_act_mul.rs b/crates/uzu-engine/src/backends/cpu/kernel/gated_act_mul/gated_act_mul.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/gated_act_mul/gated_act_mul.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/gated_act_mul/gated_act_mul.rs
index 5a843e7a7..740952329 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/gated_act_mul/gated_act_mul.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/gated_act_mul/gated_act_mul.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/gated_act_mul/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/gated_act_mul/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/gated_act_mul/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/gated_act_mul/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/gdn/conv_scan.rs b/crates/uzu-engine/src/backends/cpu/kernel/gdn/conv_scan.rs
similarity index 98%
rename from crates/backend-uzu/src/backends/cpu/kernel/gdn/conv_scan.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/gdn/conv_scan.rs
index 277fb5688..e45782663 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/gdn/conv_scan.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/gdn/conv_scan.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::{array::ArrayElement, backends::common::gpu_types::ActivationType};
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/gdn/conv_update.rs b/crates/uzu-engine/src/backends/cpu/kernel/gdn/conv_update.rs
similarity index 98%
rename from crates/backend-uzu/src/backends/cpu/kernel/gdn/conv_update.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/gdn/conv_update.rs
index 7392ee74d..8f5b56711 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/gdn/conv_update.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/gdn/conv_update.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::{array::ArrayElement, backends::common::gpu_types::ActivationType};
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/gdn/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/gdn/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/gdn/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/gdn/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/gdn/norm_gate.rs b/crates/uzu-engine/src/backends/cpu/kernel/gdn/norm_gate.rs
similarity index 98%
rename from crates/backend-uzu/src/backends/cpu/kernel/gdn/norm_gate.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/gdn/norm_gate.rs
index 0d466a4a7..3bc9bde35 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/gdn/norm_gate.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/gdn/norm_gate.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::{array::ArrayElement, backends::common::gpu_types::ActivationType};
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/gdn/prefill.rs b/crates/uzu-engine/src/backends/cpu/kernel/gdn/prefill.rs
similarity index 98%
rename from crates/backend-uzu/src/backends/cpu/kernel/gdn/prefill.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/gdn/prefill.rs
index cf6834be0..78001b7bd 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/gdn/prefill.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/gdn/prefill.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/gdn/prefill_prep.rs b/crates/uzu-engine/src/backends/cpu/kernel/gdn/prefill_prep.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/gdn/prefill_prep.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/gdn/prefill_prep.rs
index 019848316..ace6ffbe0 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/gdn/prefill_prep.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/gdn/prefill_prep.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/conv_scan.rs b/crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/conv_scan.rs
similarity index 98%
rename from crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/conv_scan.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/conv_scan.rs
index a42e44fc2..3295349b6 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/conv_scan.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/conv_scan.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::{array::ArrayElement, backends::common::gpu_types::ActivationType};
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/out.rs b/crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/out.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/out.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/out.rs
index 33d73be87..1ab67c34f 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/out.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/out.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/prefix.rs b/crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/prefix.rs
similarity index 97%
rename from crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/prefix.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/prefix.rs
index ddcbc5541..37c2b0332 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/prefix.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/prefix.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::kernel;
+use uzu_engine_macros::kernel;
use crate::backends::common::gpu_types::trie::TrieNode;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/state_advance.rs b/crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/state_advance.rs
similarity index 98%
rename from crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/state_advance.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/state_advance.rs
index 1d80e9302..b382fec31 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/state_advance.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/state_advance.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/tree_gram.rs b/crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/tree_gram.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/tree_gram.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/tree_gram.rs
index 05b0f595d..548cb3c8d 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/tree_gram.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/tree_gram.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::{array::ArrayElement, backends::common::gpu_types::trie::TrieNode};
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/tree_update_solve.rs b/crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/tree_update_solve.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/tree_update_solve.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/tree_update_solve.rs
index 51526f058..ccb5f011e 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/gdn/tree_verify/tree_update_solve.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/gdn/tree_verify/tree_update_solve.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/gdn/update.rs b/crates/uzu-engine/src/backends/cpu/kernel/gdn/update.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/gdn/update.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/gdn/update.rs
index 548731d28..d8d2a29e5 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/gdn/update.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/gdn/update.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::{array::ArrayElement, backends::common::gpu_types::ActivationType};
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/logit_transform/logit_transform.rs b/crates/uzu-engine/src/backends/cpu/kernel/logit_transform/logit_transform.rs
similarity index 95%
rename from crates/backend-uzu/src/backends/cpu/kernel/logit_transform/logit_transform.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/logit_transform/logit_transform.rs
index 86166a7a5..4343822e2 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/logit_transform/logit_transform.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/logit_transform/logit_transform.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/logit_transform/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/logit_transform/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/logit_transform/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/logit_transform/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/matmul/kernel.rs b/crates/uzu-engine/src/backends/cpu/kernel/matmul/kernel.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/matmul/kernel.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/matmul/kernel.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/matmul/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/matmul/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/matmul/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/matmul/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/matmul/reference.rs b/crates/uzu-engine/src/backends/cpu/kernel/matmul/reference.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/matmul/reference.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/matmul/reference.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/counts_offsets_fused.rs b/crates/uzu-engine/src/backends/cpu/kernel/moe/counts_offsets_fused.rs
similarity index 97%
rename from crates/backend-uzu/src/backends/cpu/kernel/moe/counts_offsets_fused.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/moe/counts_offsets_fused.rs
index 3cdd2c047..fb718c3dd 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/counts_offsets_fused.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/moe/counts_offsets_fused.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::kernel;
+use uzu_engine_macros::kernel;
#[kernel(MoeCountsOffsetsFused)]
pub fn moe_counts_offsets_fused(
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/experts_two_pass_decode.rs b/crates/uzu-engine/src/backends/cpu/kernel/moe/experts_two_pass_decode.rs
similarity index 98%
rename from crates/backend-uzu/src/backends/cpu/kernel/moe/experts_two_pass_decode.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/moe/experts_two_pass_decode.rs
index 251f2a5c9..96f6b1503 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/experts_two_pass_decode.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/moe/experts_two_pass_decode.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/experts_two_pass_prefill.rs b/crates/uzu-engine/src/backends/cpu/kernel/moe/experts_two_pass_prefill.rs
similarity index 97%
rename from crates/backend-uzu/src/backends/cpu/kernel/moe/experts_two_pass_prefill.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/moe/experts_two_pass_prefill.rs
index 693eb1a37..629e7bfaa 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/experts_two_pass_prefill.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/moe/experts_two_pass_prefill.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/finalize.rs b/crates/uzu-engine/src/backends/cpu/kernel/moe/finalize.rs
similarity index 97%
rename from crates/backend-uzu/src/backends/cpu/kernel/moe/finalize.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/moe/finalize.rs
index 1fde5f317..aa239d6ce 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/finalize.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/moe/finalize.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/gather.rs b/crates/uzu-engine/src/backends/cpu/kernel/moe/gather.rs
similarity index 98%
rename from crates/backend-uzu/src/backends/cpu/kernel/moe/gather.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/moe/gather.rs
index 446057b1b..8e5045a0f 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/gather.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/moe/gather.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/moe/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/moe/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/moe/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/router_topk.rs b/crates/uzu-engine/src/backends/cpu/kernel/moe/router_topk.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/moe/router_topk.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/moe/router_topk.rs
index 54b6425b2..448095fbe 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/router_topk.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/moe/router_topk.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/scatter_buckets.rs b/crates/uzu-engine/src/backends/cpu/kernel/moe/scatter_buckets.rs
similarity index 97%
rename from crates/backend-uzu/src/backends/cpu/kernel/moe/scatter_buckets.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/moe/scatter_buckets.rs
index 0b25fc643..d9d15d6aa 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/scatter_buckets.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/moe/scatter_buckets.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/tiles_map.rs b/crates/uzu-engine/src/backends/cpu/kernel/moe/tiles_map.rs
similarity index 96%
rename from crates/backend-uzu/src/backends/cpu/kernel/moe/tiles_map.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/moe/tiles_map.rs
index b4e1170b7..0d7348ea2 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/tiles_map.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/moe/tiles_map.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::kernel;
+use uzu_engine_macros::kernel;
#[kernel(MoeTileCounts)]
pub fn moe_tile_counts(
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/tiles_pass_a.rs b/crates/uzu-engine/src/backends/cpu/kernel/moe/tiles_pass_a.rs
similarity index 97%
rename from crates/backend-uzu/src/backends/cpu/kernel/moe/tiles_pass_a.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/moe/tiles_pass_a.rs
index a421b1b21..81cb00205 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/tiles_pass_a.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/moe/tiles_pass_a.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::kernel;
+use uzu_engine_macros::kernel;
#[kernel(MoePassATileCounts)]
pub fn moe_pass_a_tile_counts(
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/normalization/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/normalization/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/normalization/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/normalization/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/normalization/normalization.rs b/crates/uzu-engine/src/backends/cpu/kernel/normalization/normalization.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/normalization/normalization.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/normalization/normalization.rs
index 2715a816a..0a7c8ffe3 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/normalization/normalization.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/normalization/normalization.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/pooling/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/pooling/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/pooling/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/pooling/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/pooling/pooling.rs b/crates/uzu-engine/src/backends/cpu/kernel/pooling/pooling.rs
similarity index 96%
rename from crates/backend-uzu/src/backends/cpu/kernel/pooling/pooling.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/pooling/pooling.rs
index 9d4b379a7..80845c5af 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/pooling/pooling.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/pooling/pooling.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::{Float, ToPrimitive};
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/radix_top_k_small.rs b/crates/uzu-engine/src/backends/cpu/kernel/radix_top_k_small.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/radix_top_k_small.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/radix_top_k_small.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/sampling/context_ring_update.rs b/crates/uzu-engine/src/backends/cpu/kernel/sampling/context_ring_update.rs
similarity index 96%
rename from crates/backend-uzu/src/backends/cpu/kernel/sampling/context_ring_update.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/sampling/context_ring_update.rs
index eaf92b3a0..8d4b11169 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/sampling/context_ring_update.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/sampling/context_ring_update.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::kernel;
+use uzu_engine_macros::kernel;
use crate::backends::common::gpu_types::ring::RingParams;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/sampling/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/sampling/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/sampling/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/sampling/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/sampling/repetition_penalty.rs b/crates/uzu-engine/src/backends/cpu/kernel/sampling/repetition_penalty.rs
similarity index 98%
rename from crates/backend-uzu/src/backends/cpu/kernel/sampling/repetition_penalty.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/sampling/repetition_penalty.rs
index 04bb8f3be..c406e4e16 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/sampling/repetition_penalty.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/sampling/repetition_penalty.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::{Float, NumCast};
+use uzu_engine_macros::kernel;
use crate::{array::ArrayElement, backends::common::gpu_types::ring::RingParams};
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/sampling/unified_sampling.rs b/crates/uzu-engine/src/backends/cpu/kernel/sampling/unified_sampling.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/sampling/unified_sampling.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/sampling/unified_sampling.rs
index 9cc299226..b0e7711f2 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/sampling/unified_sampling.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/sampling/unified_sampling.rs
@@ -1,8 +1,8 @@
use std::cmp::Ordering;
-use backend_uzu_macros::kernel;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/short_conv/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/short_conv/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/short_conv/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/short_conv/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/short_conv/short_conv.rs b/crates/uzu-engine/src/backends/cpu/kernel/short_conv/short_conv.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/short_conv/short_conv.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/short_conv/short_conv.rs
index 4a6a61fcb..4fce0ea94 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/short_conv/short_conv.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/short_conv/short_conv.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::{Float, ToPrimitive};
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/softmax/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/softmax/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/softmax/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/softmax/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/softmax/softmax.rs b/crates/uzu-engine/src/backends/cpu/kernel/softmax/softmax.rs
similarity index 98%
rename from crates/backend-uzu/src/backends/cpu/kernel/softmax/softmax.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/softmax/softmax.rs
index 8c5f41708..295315768 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/softmax/softmax.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/softmax/softmax.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/ssm/conv1d.rs b/crates/uzu-engine/src/backends/cpu/kernel/ssm/conv1d.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/ssm/conv1d.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/ssm/conv1d.rs
index 5fa5fa412..a45ea849c 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/ssm/conv1d.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/ssm/conv1d.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/ssm/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/ssm/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/ssm/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/ssm/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/ssm/split_inproj.rs b/crates/uzu-engine/src/backends/cpu/kernel/ssm/split_inproj.rs
similarity index 97%
rename from crates/backend-uzu/src/backends/cpu/kernel/ssm/split_inproj.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/ssm/split_inproj.rs
index 9f9d1e6b4..54d2bbe3d 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/ssm/split_inproj.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/ssm/split_inproj.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/ssm/ssd_prefill.rs b/crates/uzu-engine/src/backends/cpu/kernel/ssm/ssd_prefill.rs
similarity index 98%
rename from crates/backend-uzu/src/backends/cpu/kernel/ssm/ssd_prefill.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/ssm/ssd_prefill.rs
index 0daf4657b..8fd765754 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/ssm/ssd_prefill.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/ssm/ssd_prefill.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/ssm/ssd_update.rs b/crates/uzu-engine/src/backends/cpu/kernel/ssm/ssd_update.rs
similarity index 98%
rename from crates/backend-uzu/src/backends/cpu/kernel/ssm/ssd_update.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/ssm/ssd_update.rs
index 1db0a2cfa..1b151e3cd 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/ssm/ssd_update.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/ssm/ssd_update.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::{array::ArrayElement, backends::common::gpu_types::ActivationType};
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_bias/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/tensor_add_bias/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/tensor_add_bias/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/tensor_add_bias/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_bias/tensor_add_bias.rs b/crates/uzu-engine/src/backends/cpu/kernel/tensor_add_bias/tensor_add_bias.rs
similarity index 96%
rename from crates/backend-uzu/src/backends/cpu/kernel/tensor_add_bias/tensor_add_bias.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/tensor_add_bias/tensor_add_bias.rs
index 0b68aff39..6c68f1e82 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_bias/tensor_add_bias.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/tensor_add_bias/tensor_add_bias.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_scale/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/tensor_add_scale/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/tensor_add_scale/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/tensor_add_scale/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_scale/tensor_add_scale.rs b/crates/uzu-engine/src/backends/cpu/kernel/tensor_add_scale/tensor_add_scale.rs
similarity index 96%
rename from crates/backend-uzu/src/backends/cpu/kernel/tensor_add_scale/tensor_add_scale.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/tensor_add_scale/tensor_add_scale.rs
index 8309a3ea4..48e946c8d 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_scale/tensor_add_scale.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/tensor_add_scale/tensor_add_scale.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_swap/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/tensor_add_swap/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/tensor_add_swap/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/tensor_add_swap/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_swap/tensor_add_swap.rs b/crates/uzu-engine/src/backends/cpu/kernel/tensor_add_swap/tensor_add_swap.rs
similarity index 94%
rename from crates/backend-uzu/src/backends/cpu/kernel/tensor_add_swap/tensor_add_swap.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/tensor_add_swap/tensor_add_swap.rs
index edb1a6680..df0954921 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_swap/tensor_add_swap.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/tensor_add_swap/tensor_add_swap.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/tensor_copy/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/tensor_copy/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/tensor_copy/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/tensor_copy/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/tensor_copy/tensor_copy.rs b/crates/uzu-engine/src/backends/cpu/kernel/tensor_copy/tensor_copy.rs
similarity index 92%
rename from crates/backend-uzu/src/backends/cpu/kernel/tensor_copy/tensor_copy.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/tensor_copy/tensor_copy.rs
index ee3b7475e..e46e9bf72 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/tensor_copy/tensor_copy.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/tensor_copy/tensor_copy.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::kernel;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::kernel;
use crate::array::ArrayElement;
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/weaver/mod.rs b/crates/uzu-engine/src/backends/cpu/kernel/weaver/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/kernel/weaver/mod.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/weaver/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/weaver/weaver_frontier_insert_children.rs b/crates/uzu-engine/src/backends/cpu/kernel/weaver/weaver_frontier_insert_children.rs
similarity index 98%
rename from crates/backend-uzu/src/backends/cpu/kernel/weaver/weaver_frontier_insert_children.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/weaver/weaver_frontier_insert_children.rs
index 1b2de3c72..d9f53fc58 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/weaver/weaver_frontier_insert_children.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/weaver/weaver_frontier_insert_children.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::kernel;
+use uzu_engine_macros::kernel;
use crate::backends::common::gpu_types::weaver::{FrontierIdx, MetadataIdx, TreeIdx};
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/weaver/weaver_frontier_select.rs b/crates/uzu-engine/src/backends/cpu/kernel/weaver/weaver_frontier_select.rs
similarity index 99%
rename from crates/backend-uzu/src/backends/cpu/kernel/weaver/weaver_frontier_select.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/weaver/weaver_frontier_select.rs
index 1fbf7aaaf..4b9fc95a6 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/weaver/weaver_frontier_select.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/weaver/weaver_frontier_select.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::kernel;
+use uzu_engine_macros::kernel;
use crate::backends::common::gpu_types::weaver::{
FRONTIER_MAX_SLOTS, FRONTIER_MAX_WIDTH, FRONTIER_NO_WINNER, FrontierIdx, MetadataIdx, PADDING_DEPTH, TreeIdx,
diff --git a/crates/backend-uzu/src/backends/cpu/kernel/weaver/weaver_top_children.rs b/crates/uzu-engine/src/backends/cpu/kernel/weaver/weaver_top_children.rs
similarity index 98%
rename from crates/backend-uzu/src/backends/cpu/kernel/weaver/weaver_top_children.rs
rename to crates/uzu-engine/src/backends/cpu/kernel/weaver/weaver_top_children.rs
index 68e5e17eb..bfee25425 100644
--- a/crates/backend-uzu/src/backends/cpu/kernel/weaver/weaver_top_children.rs
+++ b/crates/uzu-engine/src/backends/cpu/kernel/weaver/weaver_top_children.rs
@@ -1,5 +1,5 @@
-use backend_uzu_macros::kernel;
use half::bf16;
+use uzu_engine_macros::kernel;
use crate::{
backends::common::gpu_types::weaver::{CANDIDATES_MAX, MetadataIdx},
diff --git a/crates/backend-uzu/src/backends/cpu/mod.rs b/crates/uzu-engine/src/backends/cpu/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/mod.rs
rename to crates/uzu-engine/src/backends/cpu/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/sparse/mod.rs b/crates/uzu-engine/src/backends/cpu/sparse/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/sparse/mod.rs
rename to crates/uzu-engine/src/backends/cpu/sparse/mod.rs
diff --git a/crates/backend-uzu/src/backends/cpu/sparse/sparse_buffer.rs b/crates/uzu-engine/src/backends/cpu/sparse/sparse_buffer.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/cpu/sparse/sparse_buffer.rs
rename to crates/uzu-engine/src/backends/cpu/sparse/sparse_buffer.rs
diff --git a/crates/backend-uzu/src/backends/metal/backend.rs b/crates/uzu-engine/src/backends/metal/backend.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/backend.rs
rename to crates/uzu-engine/src/backends/metal/backend.rs
diff --git a/crates/backend-uzu/src/backends/metal/buffer.rs b/crates/uzu-engine/src/backends/metal/buffer.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/buffer.rs
rename to crates/uzu-engine/src/backends/metal/buffer.rs
diff --git a/crates/backend-uzu/src/backends/metal/command_buffer.rs b/crates/uzu-engine/src/backends/metal/command_buffer.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/command_buffer.rs
rename to crates/uzu-engine/src/backends/metal/command_buffer.rs
diff --git a/crates/backend-uzu/src/backends/metal/context.rs b/crates/uzu-engine/src/backends/metal/context.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/context.rs
rename to crates/uzu-engine/src/backends/metal/context.rs
diff --git a/crates/backend-uzu/src/backends/metal/dense_buffer.rs b/crates/uzu-engine/src/backends/metal/dense_buffer.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/dense_buffer.rs
rename to crates/uzu-engine/src/backends/metal/dense_buffer.rs
diff --git a/crates/backend-uzu/src/backends/metal/device_profile.rs b/crates/uzu-engine/src/backends/metal/device_profile.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/device_profile.rs
rename to crates/uzu-engine/src/backends/metal/device_profile.rs
diff --git a/crates/backend-uzu/src/backends/metal/error.rs b/crates/uzu-engine/src/backends/metal/error.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/error.rs
rename to crates/uzu-engine/src/backends/metal/error.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/activation/activation.metal b/crates/uzu-engine/src/backends/metal/kernel/activation/activation.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/activation/activation.metal
rename to crates/uzu-engine/src/backends/metal/kernel/activation/activation.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/activation/activations.h b/crates/uzu-engine/src/backends/metal/kernel/activation/activations.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/activation/activations.h
rename to crates/uzu-engine/src/backends/metal/kernel/activation/activations.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/activation_transform/activation_transform.metal b/crates/uzu-engine/src/backends/metal/kernel/activation_transform/activation_transform.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/activation_transform/activation_transform.metal
rename to crates/uzu-engine/src/backends/metal/kernel/activation_transform/activation_transform.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/attention.rs b/crates/uzu-engine/src/backends/metal/kernel/attention.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/attention.rs
rename to crates/uzu-engine/src/backends/metal/kernel/attention.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/attention/ancestor_attention.metal b/crates/uzu-engine/src/backends/metal/kernel/attention/ancestor_attention.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/attention/ancestor_attention.metal
rename to crates/uzu-engine/src/backends/metal/kernel/attention/ancestor_attention.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/attention/attention_fallback.metal b/crates/uzu-engine/src/backends/metal/kernel/attention/attention_fallback.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/attention/attention_fallback.metal
rename to crates/uzu-engine/src/backends/metal/kernel/attention/attention_fallback.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/attention/attention_gemm.metal b/crates/uzu-engine/src/backends/metal/kernel/attention/attention_gemm.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/attention/attention_gemm.metal
rename to crates/uzu-engine/src/backends/metal/kernel/attention/attention_gemm.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/attention/attention_prepare.metal b/crates/uzu-engine/src/backends/metal/kernel/attention/attention_prepare.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/attention/attention_prepare.metal
rename to crates/uzu-engine/src/backends/metal/kernel/attention/attention_prepare.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/attention/attention_single_pass.metal b/crates/uzu-engine/src/backends/metal/kernel/attention/attention_single_pass.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/attention/attention_single_pass.metal
rename to crates/uzu-engine/src/backends/metal/kernel/attention/attention_single_pass.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/attention/attention_two_pass.metal b/crates/uzu-engine/src/backends/metal/kernel/attention/attention_two_pass.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/attention/attention_two_pass.metal
rename to crates/uzu-engine/src/backends/metal/kernel/attention/attention_two_pass.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/attention/kv_cache_update.metal b/crates/uzu-engine/src/backends/metal/kernel/attention/kv_cache_update.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/attention/kv_cache_update.metal
rename to crates/uzu-engine/src/backends/metal/kernel/attention/kv_cache_update.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/attention/mask.h b/crates/uzu-engine/src/backends/metal/kernel/attention/mask.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/attention/mask.h
rename to crates/uzu-engine/src/backends/metal/kernel/attention/mask.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/attention/qkv_norm.metal b/crates/uzu-engine/src/backends/metal/kernel/attention/qkv_norm.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/attention/qkv_norm.metal
rename to crates/uzu-engine/src/backends/metal/kernel/attention/qkv_norm.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/attention/sigmoid_gate.metal b/crates/uzu-engine/src/backends/metal/kernel/attention/sigmoid_gate.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/attention/sigmoid_gate.metal
rename to crates/uzu-engine/src/backends/metal/kernel/attention/sigmoid_gate.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/common/activation_quantization.h b/crates/uzu-engine/src/backends/metal/kernel/common/activation_quantization.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/common/activation_quantization.h
rename to crates/uzu-engine/src/backends/metal/kernel/common/activation_quantization.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/common/defines.h b/crates/uzu-engine/src/backends/metal/kernel/common/defines.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/common/defines.h
rename to crates/uzu-engine/src/backends/metal/kernel/common/defines.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/common/dsl.h b/crates/uzu-engine/src/backends/metal/kernel/common/dsl.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/common/dsl.h
rename to crates/uzu-engine/src/backends/metal/kernel/common/dsl.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/common/gated_act_mul.h b/crates/uzu-engine/src/backends/metal/kernel/common/gated_act_mul.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/common/gated_act_mul.h
rename to crates/uzu-engine/src/backends/metal/kernel/common/gated_act_mul.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/common/integral_constant.h b/crates/uzu-engine/src/backends/metal/kernel/common/integral_constant.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/common/integral_constant.h
rename to crates/uzu-engine/src/backends/metal/kernel/common/integral_constant.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/common/soft_cap.h b/crates/uzu-engine/src/backends/metal/kernel/common/soft_cap.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/common/soft_cap.h
rename to crates/uzu-engine/src/backends/metal/kernel/common/soft_cap.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/common/thread_context.h b/crates/uzu-engine/src/backends/metal/kernel/common/thread_context.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/common/thread_context.h
rename to crates/uzu-engine/src/backends/metal/kernel/common/thread_context.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/common/threadgroup_reduce.h b/crates/uzu-engine/src/backends/metal/kernel/common/threadgroup_reduce.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/common/threadgroup_reduce.h
rename to crates/uzu-engine/src/backends/metal/kernel/common/threadgroup_reduce.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/common/top_k.h b/crates/uzu-engine/src/backends/metal/kernel/common/top_k.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/common/top_k.h
rename to crates/uzu-engine/src/backends/metal/kernel/common/top_k.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/embedding/full_precision_embedding.metal b/crates/uzu-engine/src/backends/metal/kernel/embedding/full_precision_embedding.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/embedding/full_precision_embedding.metal
rename to crates/uzu-engine/src/backends/metal/kernel/embedding/full_precision_embedding.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/embedding/quant_embedding.metal b/crates/uzu-engine/src/backends/metal/kernel/embedding/quant_embedding.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/embedding/quant_embedding.metal
rename to crates/uzu-engine/src/backends/metal/kernel/embedding/quant_embedding.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gated_act_mul/gated_act_mul.metal b/crates/uzu-engine/src/backends/metal/kernel/gated_act_mul/gated_act_mul.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gated_act_mul/gated_act_mul.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gated_act_mul/gated_act_mul.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/chunked/a_diag_inv.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/chunked/a_diag_inv.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/chunked/a_diag_inv.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/chunked/a_diag_inv.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/chunked/causal_inv.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/chunked/causal_inv.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/chunked/causal_inv.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/chunked/causal_inv.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/chunked/cumsum.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/chunked/cumsum.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/chunked/cumsum.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/chunked/cumsum.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/chunked/gram.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/chunked/gram.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/chunked/gram.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/chunked/gram.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/chunked/mod.rs b/crates/uzu-engine/src/backends/metal/kernel/gdn/chunked/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/chunked/mod.rs
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/chunked/mod.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/chunked/output_and_state.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/chunked/output_and_state.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/chunked/output_and_state.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/chunked/output_and_state.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/common/gram.h b/crates/uzu-engine/src/backends/metal/kernel/gdn/common/gram.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/common/gram.h
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/common/gram.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/common/tri_inv.h b/crates/uzu-engine/src/backends/metal/kernel/gdn/common/tri_inv.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/common/tri_inv.h
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/common/tri_inv.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/conv_scan.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/conv_scan.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/conv_scan.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/conv_scan.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/conv_update.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/conv_update.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/conv_update.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/conv_update.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/mod.rs b/crates/uzu-engine/src/backends/metal/kernel/gdn/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/mod.rs
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/mod.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/norm_gate.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/norm_gate.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/norm_gate.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/norm_gate.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/prefill.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/prefill.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/prefill.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/prefill.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/prefill_prep.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/prefill_prep.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/prefill_prep.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/prefill_prep.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/tree_verify.rs b/crates/uzu-engine/src/backends/metal/kernel/gdn/tree_verify.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/tree_verify.rs
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/tree_verify.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/tree_verify/conv_scan.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/tree_verify/conv_scan.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/tree_verify/conv_scan.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/tree_verify/conv_scan.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/tree_verify/out.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/tree_verify/out.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/tree_verify/out.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/tree_verify/out.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/tree_verify/prefix.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/tree_verify/prefix.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/tree_verify/prefix.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/tree_verify/prefix.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/tree_verify/state_advance.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/tree_verify/state_advance.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/tree_verify/state_advance.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/tree_verify/state_advance.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/tree_verify/tree_gram.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/tree_verify/tree_gram.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/tree_verify/tree_gram.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/tree_verify/tree_gram.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/tree_verify/tree_update_solve.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/tree_verify/tree_update_solve.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/tree_verify/tree_update_solve.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/tree_verify/tree_update_solve.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/gdn/update.metal b/crates/uzu-engine/src/backends/metal/kernel/gdn/update.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/gdn/update.metal
rename to crates/uzu-engine/src/backends/metal/kernel/gdn/update.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/generated/activation_transform.h b/crates/uzu-engine/src/backends/metal/kernel/generated/activation_transform.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/generated/activation_transform.h
rename to crates/uzu-engine/src/backends/metal/kernel/generated/activation_transform.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/generated/activation_type.h b/crates/uzu-engine/src/backends/metal/kernel/generated/activation_type.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/generated/activation_type.h
rename to crates/uzu-engine/src/backends/metal/kernel/generated/activation_type.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/generated/attention.h b/crates/uzu-engine/src/backends/metal/kernel/generated/attention.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/generated/attention.h
rename to crates/uzu-engine/src/backends/metal/kernel/generated/attention.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/generated/gated_act_mul.h b/crates/uzu-engine/src/backends/metal/kernel/generated/gated_act_mul.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/generated/gated_act_mul.h
rename to crates/uzu-engine/src/backends/metal/kernel/generated/gated_act_mul.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/generated/gemm.h b/crates/uzu-engine/src/backends/metal/kernel/generated/gemm.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/generated/gemm.h
rename to crates/uzu-engine/src/backends/metal/kernel/generated/gemm.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/generated/hadamard_order.h b/crates/uzu-engine/src/backends/metal/kernel/generated/hadamard_order.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/generated/hadamard_order.h
rename to crates/uzu-engine/src/backends/metal/kernel/generated/hadamard_order.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/generated/kv_cache_update.h b/crates/uzu-engine/src/backends/metal/kernel/generated/kv_cache_update.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/generated/kv_cache_update.h
rename to crates/uzu-engine/src/backends/metal/kernel/generated/kv_cache_update.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/generated/matmul.h b/crates/uzu-engine/src/backends/metal/kernel/generated/matmul.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/generated/matmul.h
rename to crates/uzu-engine/src/backends/metal/kernel/generated/matmul.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/generated/quantization.h b/crates/uzu-engine/src/backends/metal/kernel/generated/quantization.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/generated/quantization.h
rename to crates/uzu-engine/src/backends/metal/kernel/generated/quantization.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/generated/quantization_method.h b/crates/uzu-engine/src/backends/metal/kernel/generated/quantization_method.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/generated/quantization_method.h
rename to crates/uzu-engine/src/backends/metal/kernel/generated/quantization_method.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/generated/ring.h b/crates/uzu-engine/src/backends/metal/kernel/generated/ring.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/generated/ring.h
rename to crates/uzu-engine/src/backends/metal/kernel/generated/ring.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/generated/trie.h b/crates/uzu-engine/src/backends/metal/kernel/generated/trie.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/generated/trie.h
rename to crates/uzu-engine/src/backends/metal/kernel/generated/trie.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/generated/weaver.h b/crates/uzu-engine/src/backends/metal/kernel/generated/weaver.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/generated/weaver.h
rename to crates/uzu-engine/src/backends/metal/kernel/generated/weaver.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/hadamard_transform/hadamard_transform.h b/crates/uzu-engine/src/backends/metal/kernel/hadamard_transform/hadamard_transform.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/hadamard_transform/hadamard_transform.h
rename to crates/uzu-engine/src/backends/metal/kernel/hadamard_transform/hadamard_transform.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/logit_transform/logit_transform.metal b/crates/uzu-engine/src/backends/metal/kernel/logit_transform/logit_transform.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/logit_transform/logit_transform.metal
rename to crates/uzu-engine/src/backends/metal/kernel/logit_transform/logit_transform.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/defines.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/defines.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/defines.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/defines.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/fragment.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/fragment.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/fragment.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/fragment.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/loader.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/loader.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/loader.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/loader.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/mxu_fragment/cooperative_vectors.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/mxu_fragment/cooperative_vectors.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/mxu_fragment/cooperative_vectors.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/mxu_fragment/cooperative_vectors.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/mxu_fragment/fragment_matmul.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/mxu_fragment/fragment_matmul.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/mxu_fragment/fragment_matmul.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/mxu_fragment/fragment_matmul.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/mxu_fragment/integer_formats.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/mxu_fragment/integer_formats.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/mxu_fragment/integer_formats.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/mxu_fragment/integer_formats.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/mxu_fragment/layout.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/mxu_fragment/layout.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/mxu_fragment/layout.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/mxu_fragment/layout.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/mxu_fragment/ops.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/mxu_fragment/ops.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/mxu_fragment/ops.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/mxu_fragment/ops.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/mxu_fragment/tensor_matmul.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/mxu_fragment/tensor_matmul.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/mxu_fragment/tensor_matmul.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/mxu_fragment/tensor_matmul.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/mxu_fragment/tensor_operand.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/mxu_fragment/tensor_operand.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/mxu_fragment/tensor_operand.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/mxu_fragment/tensor_operand.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/mxu_gemm_loop.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/mxu_gemm_loop.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/mxu_gemm_loop.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/mxu_gemm_loop.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/qdot.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/qdot.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/qdot.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/qdot.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/quant_pack.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/quant_pack.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/quant_pack.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/quant_pack.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/quant_unpack.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/quant_unpack.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/quant_unpack.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/quant_unpack.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/simdgroup_fragment_ops.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/simdgroup_fragment_ops.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/simdgroup_fragment_ops.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/simdgroup_fragment_ops.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/simdgroup_multiply_accumulate.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/simdgroup_multiply_accumulate.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/simdgroup_multiply_accumulate.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/simdgroup_multiply_accumulate.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/common/threadgroup_tile.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/common/threadgroup_tile.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/common/threadgroup_tile.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/common/threadgroup_tile.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/block_geometry.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/block_geometry.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/block_geometry.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/block_geometry.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/gemm_alignment.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/gemm_alignment.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/gemm_alignment.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/gemm_alignment.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/gemm_rht.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/gemm_rht.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/gemm_rht.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/gemm_rht.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/gemm_tiling.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/gemm_tiling.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/gemm_tiling.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/gemm_tiling.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/mxu_mma_core.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/mxu_mma_core.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/mxu_mma_core.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/mxu_mma_core.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/operands.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/operands.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/operands.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/operands.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/quant_scale_bias.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/quant_scale_bias.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/quant_scale_bias.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/quant_scale_bias.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/quant_scale_zero_point.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/quant_scale_zero_point.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/quant_scale_zero_point.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/quant_scale_zero_point.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/quantized/cache.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/quantized/cache.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/quantized/cache.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/quantized/cache.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/quantized/cursor.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/quantized/cursor.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/quantized/cursor.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/quantized/cursor.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/schedules/dense.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/schedules/dense.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/schedules/dense.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/schedules/dense.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/schedules/integer.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/schedules/integer.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/schedules/integer.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/schedules/integer.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/schedules/staged.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/schedules/staged.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/schedules/staged.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/schedules/staged.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/schedules/tile_context.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/schedules/tile_context.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/schedules/tile_context.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/schedules/tile_context.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/simdgroup_mma_core.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/simdgroup_mma_core.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/common/simdgroup_mma_core.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/common/simdgroup_mma_core.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/error.rs b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/error.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/error.rs
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/error.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/gemm.metal b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/gemm.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/gemm.metal
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/gemm.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/gemm_split_k_reduce.metal b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/gemm_split_k_reduce.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/gemm_split_k_reduce.metal
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/gemm_split_k_reduce.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/kernel.rs b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/kernel.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/kernel.rs
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/kernel.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/mod.rs b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/mod.rs
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/mod.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/policy.rs b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/policy.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/policy.rs
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/policy.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/selection.rs b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/selection.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/selection.rs
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/selection.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/specialization.rs b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/specialization.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemm/specialization.rs
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemm/specialization.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/common/b_source.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/common/b_source.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/common/b_source.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/common/b_source.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/common/epilogue.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/common/epilogue.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/common/epilogue.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/common/epilogue.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/common/full_precision_b_source.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/common/full_precision_b_source.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/common/full_precision_b_source.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/common/full_precision_b_source.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/common/output_tile.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/common/output_tile.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/common/output_tile.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/common/output_tile.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/common/quantized_b_source.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/common/quantized_b_source.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/common/quantized_b_source.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/common/quantized_b_source.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/common/quantized_row_state.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/common/quantized_row_state.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/common/quantized_row_state.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/common/quantized_row_state.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/common/reduce.h b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/common/reduce.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/common/reduce.h
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/common/reduce.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/gemv.metal b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/gemv.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/gemv.metal
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/gemv.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/kernel.rs b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/kernel.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/kernel.rs
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/kernel.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/mod.rs b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/mod.rs
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/mod.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/policy.rs b/crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/policy.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/gemv/policy.rs
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/gemv/policy.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/matmul/mod.rs b/crates/uzu-engine/src/backends/metal/kernel/matmul/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/matmul/mod.rs
rename to crates/uzu-engine/src/backends/metal/kernel/matmul/mod.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/mod.rs b/crates/uzu-engine/src/backends/metal/kernel/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/mod.rs
rename to crates/uzu-engine/src/backends/metal/kernel/mod.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/moe/counts_offsets_fused.metal b/crates/uzu-engine/src/backends/metal/kernel/moe/counts_offsets_fused.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/moe/counts_offsets_fused.metal
rename to crates/uzu-engine/src/backends/metal/kernel/moe/counts_offsets_fused.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/moe/experts_two_pass_decode.metal b/crates/uzu-engine/src/backends/metal/kernel/moe/experts_two_pass_decode.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/moe/experts_two_pass_decode.metal
rename to crates/uzu-engine/src/backends/metal/kernel/moe/experts_two_pass_decode.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/moe/experts_two_pass_prefill.metal b/crates/uzu-engine/src/backends/metal/kernel/moe/experts_two_pass_prefill.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/moe/experts_two_pass_prefill.metal
rename to crates/uzu-engine/src/backends/metal/kernel/moe/experts_two_pass_prefill.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/moe/finalize.metal b/crates/uzu-engine/src/backends/metal/kernel/moe/finalize.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/moe/finalize.metal
rename to crates/uzu-engine/src/backends/metal/kernel/moe/finalize.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/moe/gather.metal b/crates/uzu-engine/src/backends/metal/kernel/moe/gather.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/moe/gather.metal
rename to crates/uzu-engine/src/backends/metal/kernel/moe/gather.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/moe/router_topk.metal b/crates/uzu-engine/src/backends/metal/kernel/moe/router_topk.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/moe/router_topk.metal
rename to crates/uzu-engine/src/backends/metal/kernel/moe/router_topk.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/moe/scatter_buckets.metal b/crates/uzu-engine/src/backends/metal/kernel/moe/scatter_buckets.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/moe/scatter_buckets.metal
rename to crates/uzu-engine/src/backends/metal/kernel/moe/scatter_buckets.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/moe/tiles_map.metal b/crates/uzu-engine/src/backends/metal/kernel/moe/tiles_map.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/moe/tiles_map.metal
rename to crates/uzu-engine/src/backends/metal/kernel/moe/tiles_map.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/moe/tiles_pass_a.metal b/crates/uzu-engine/src/backends/metal/kernel/moe/tiles_pass_a.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/moe/tiles_pass_a.metal
rename to crates/uzu-engine/src/backends/metal/kernel/moe/tiles_pass_a.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/normalization/normalization.metal b/crates/uzu-engine/src/backends/metal/kernel/normalization/normalization.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/normalization/normalization.metal
rename to crates/uzu-engine/src/backends/metal/kernel/normalization/normalization.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/pooling/pooling.metal b/crates/uzu-engine/src/backends/metal/kernel/pooling/pooling.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/pooling/pooling.metal
rename to crates/uzu-engine/src/backends/metal/kernel/pooling/pooling.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/radix_top_k_small.metal b/crates/uzu-engine/src/backends/metal/kernel/radix_top_k_small.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/radix_top_k_small.metal
rename to crates/uzu-engine/src/backends/metal/kernel/radix_top_k_small.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/radix_top_k_small.rs b/crates/uzu-engine/src/backends/metal/kernel/radix_top_k_small.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/radix_top_k_small.rs
rename to crates/uzu-engine/src/backends/metal/kernel/radix_top_k_small.rs
diff --git a/crates/backend-uzu/src/backends/metal/kernel/rng.h b/crates/uzu-engine/src/backends/metal/kernel/rng.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/rng.h
rename to crates/uzu-engine/src/backends/metal/kernel/rng.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/sampling/context_ring_update.metal b/crates/uzu-engine/src/backends/metal/kernel/sampling/context_ring_update.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/sampling/context_ring_update.metal
rename to crates/uzu-engine/src/backends/metal/kernel/sampling/context_ring_update.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/sampling/repetition_penalty.metal b/crates/uzu-engine/src/backends/metal/kernel/sampling/repetition_penalty.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/sampling/repetition_penalty.metal
rename to crates/uzu-engine/src/backends/metal/kernel/sampling/repetition_penalty.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/sampling/unified_sampling.metal b/crates/uzu-engine/src/backends/metal/kernel/sampling/unified_sampling.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/sampling/unified_sampling.metal
rename to crates/uzu-engine/src/backends/metal/kernel/sampling/unified_sampling.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/short_conv/short_conv.metal b/crates/uzu-engine/src/backends/metal/kernel/short_conv/short_conv.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/short_conv/short_conv.metal
rename to crates/uzu-engine/src/backends/metal/kernel/short_conv/short_conv.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/softmax/softmax.metal b/crates/uzu-engine/src/backends/metal/kernel/softmax/softmax.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/softmax/softmax.metal
rename to crates/uzu-engine/src/backends/metal/kernel/softmax/softmax.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/ssm/conv1d.metal b/crates/uzu-engine/src/backends/metal/kernel/ssm/conv1d.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/ssm/conv1d.metal
rename to crates/uzu-engine/src/backends/metal/kernel/ssm/conv1d.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/ssm/split_inproj.metal b/crates/uzu-engine/src/backends/metal/kernel/ssm/split_inproj.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/ssm/split_inproj.metal
rename to crates/uzu-engine/src/backends/metal/kernel/ssm/split_inproj.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/ssm/ssd_prefill.metal b/crates/uzu-engine/src/backends/metal/kernel/ssm/ssd_prefill.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/ssm/ssd_prefill.metal
rename to crates/uzu-engine/src/backends/metal/kernel/ssm/ssd_prefill.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/ssm/ssd_update.metal b/crates/uzu-engine/src/backends/metal/kernel/ssm/ssd_update.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/ssm/ssd_update.metal
rename to crates/uzu-engine/src/backends/metal/kernel/ssm/ssd_update.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/tensor_add_bias/tensor_add_bias.metal b/crates/uzu-engine/src/backends/metal/kernel/tensor_add_bias/tensor_add_bias.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/tensor_add_bias/tensor_add_bias.metal
rename to crates/uzu-engine/src/backends/metal/kernel/tensor_add_bias/tensor_add_bias.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/tensor_add_scale/tensor_add_scale.metal b/crates/uzu-engine/src/backends/metal/kernel/tensor_add_scale/tensor_add_scale.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/tensor_add_scale/tensor_add_scale.metal
rename to crates/uzu-engine/src/backends/metal/kernel/tensor_add_scale/tensor_add_scale.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/tensor_add_swap/tensor_add_swap.metal b/crates/uzu-engine/src/backends/metal/kernel/tensor_add_swap/tensor_add_swap.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/tensor_add_swap/tensor_add_swap.metal
rename to crates/uzu-engine/src/backends/metal/kernel/tensor_add_swap/tensor_add_swap.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/tensor_copy/tensor_copy.metal b/crates/uzu-engine/src/backends/metal/kernel/tensor_copy/tensor_copy.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/tensor_copy/tensor_copy.metal
rename to crates/uzu-engine/src/backends/metal/kernel/tensor_copy/tensor_copy.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/weaver/weaver_frontier.h b/crates/uzu-engine/src/backends/metal/kernel/weaver/weaver_frontier.h
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/weaver/weaver_frontier.h
rename to crates/uzu-engine/src/backends/metal/kernel/weaver/weaver_frontier.h
diff --git a/crates/backend-uzu/src/backends/metal/kernel/weaver/weaver_frontier_insert_children.metal b/crates/uzu-engine/src/backends/metal/kernel/weaver/weaver_frontier_insert_children.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/weaver/weaver_frontier_insert_children.metal
rename to crates/uzu-engine/src/backends/metal/kernel/weaver/weaver_frontier_insert_children.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/weaver/weaver_frontier_select.metal b/crates/uzu-engine/src/backends/metal/kernel/weaver/weaver_frontier_select.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/weaver/weaver_frontier_select.metal
rename to crates/uzu-engine/src/backends/metal/kernel/weaver/weaver_frontier_select.metal
diff --git a/crates/backend-uzu/src/backends/metal/kernel/weaver/weaver_top_children.metal b/crates/uzu-engine/src/backends/metal/kernel/weaver/weaver_top_children.metal
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/kernel/weaver/weaver_top_children.metal
rename to crates/uzu-engine/src/backends/metal/kernel/weaver/weaver_top_children.metal
diff --git a/crates/backend-uzu/src/backends/metal/metal_extensions/compute_command_encoder_extensions_set_value.rs b/crates/uzu-engine/src/backends/metal/metal_extensions/compute_command_encoder_extensions_set_value.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/metal_extensions/compute_command_encoder_extensions_set_value.rs
rename to crates/uzu-engine/src/backends/metal/metal_extensions/compute_command_encoder_extensions_set_value.rs
diff --git a/crates/backend-uzu/src/backends/metal/metal_extensions/data_type.rs b/crates/uzu-engine/src/backends/metal/metal_extensions/data_type.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/metal_extensions/data_type.rs
rename to crates/uzu-engine/src/backends/metal/metal_extensions/data_type.rs
diff --git a/crates/backend-uzu/src/backends/metal/metal_extensions/device_extensions.rs b/crates/uzu-engine/src/backends/metal/metal_extensions/device_extensions.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/metal_extensions/device_extensions.rs
rename to crates/uzu-engine/src/backends/metal/metal_extensions/device_extensions.rs
diff --git a/crates/backend-uzu/src/backends/metal/metal_extensions/function_constant_values_extensions_set_value.rs b/crates/uzu-engine/src/backends/metal/metal_extensions/function_constant_values_extensions_set_value.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/metal_extensions/function_constant_values_extensions_set_value.rs
rename to crates/uzu-engine/src/backends/metal/metal_extensions/function_constant_values_extensions_set_value.rs
diff --git a/crates/backend-uzu/src/backends/metal/metal_extensions/library_extensions_pipeline.rs b/crates/uzu-engine/src/backends/metal/metal_extensions/library_extensions_pipeline.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/metal_extensions/library_extensions_pipeline.rs
rename to crates/uzu-engine/src/backends/metal/metal_extensions/library_extensions_pipeline.rs
diff --git a/crates/backend-uzu/src/backends/metal/metal_extensions/mod.rs b/crates/uzu-engine/src/backends/metal/metal_extensions/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/metal_extensions/mod.rs
rename to crates/uzu-engine/src/backends/metal/metal_extensions/mod.rs
diff --git a/crates/backend-uzu/src/backends/metal/metal_extensions/sparse_page_size_extensions.rs b/crates/uzu-engine/src/backends/metal/metal_extensions/sparse_page_size_extensions.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/metal_extensions/sparse_page_size_extensions.rs
rename to crates/uzu-engine/src/backends/metal/metal_extensions/sparse_page_size_extensions.rs
diff --git a/crates/backend-uzu/src/backends/metal/mod.rs b/crates/uzu-engine/src/backends/metal/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/mod.rs
rename to crates/uzu-engine/src/backends/metal/mod.rs
diff --git a/crates/backend-uzu/src/backends/metal/sparse/mod.rs b/crates/uzu-engine/src/backends/metal/sparse/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/sparse/mod.rs
rename to crates/uzu-engine/src/backends/metal/sparse/mod.rs
diff --git a/crates/backend-uzu/src/backends/metal/sparse/sparse_buffer.rs b/crates/uzu-engine/src/backends/metal/sparse/sparse_buffer.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/sparse/sparse_buffer.rs
rename to crates/uzu-engine/src/backends/metal/sparse/sparse_buffer.rs
diff --git a/crates/backend-uzu/src/backends/metal/sparse/sparse_heap.rs b/crates/uzu-engine/src/backends/metal/sparse/sparse_heap.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/sparse/sparse_heap.rs
rename to crates/uzu-engine/src/backends/metal/sparse/sparse_heap.rs
diff --git a/crates/backend-uzu/src/backends/metal/sparse/sparse_heap_pool.rs b/crates/uzu-engine/src/backends/metal/sparse/sparse_heap_pool.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/sparse/sparse_heap_pool.rs
rename to crates/uzu-engine/src/backends/metal/sparse/sparse_heap_pool.rs
diff --git a/crates/backend-uzu/src/backends/metal/sparse/sparse_utils.rs b/crates/uzu-engine/src/backends/metal/sparse/sparse_utils.rs
similarity index 100%
rename from crates/backend-uzu/src/backends/metal/sparse/sparse_utils.rs
rename to crates/uzu-engine/src/backends/metal/sparse/sparse_utils.rs
diff --git a/crates/uzu-engine/src/backends/mod.rs b/crates/uzu-engine/src/backends/mod.rs
new file mode 100644
index 000000000..c9e4b8f1d
--- /dev/null
+++ b/crates/uzu-engine/src/backends/mod.rs
@@ -0,0 +1,37 @@
+pub mod common;
+
+#[cfg(backend = "cpu")]
+pub mod cpu;
+#[cfg(backend = "metal")]
+pub mod metal;
+
+use crate::backends::common::Backend;
+
+pub trait BackendSelection {
+ type Output;
+ type Error;
+
+ fn select<B: Backend>(self) -> Result<Self::Output, Self::Error>;
+}
+
+pub fn select_backend<S: BackendSelection>(
+ selection: S,
+ unknown: S::Error,
+) -> Result<S::Output, S::Error> {
+ let default = if cfg!(backend = "metal") {
+ "metal"
+ } 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" => selection.select::<cpu::Cpu>(),
+ #[cfg(backend = "metal")]
+ "metal" => selection.select::<metal::Metal>(),
+ _ => Err(unknown),
+ }
+}
diff --git a/crates/backend-uzu/src/config/activation/gelu.rs b/crates/uzu-engine/src/config/activation/gelu.rs
similarity index 69%
rename from crates/backend-uzu/src/config/activation/gelu.rs
rename to crates/uzu-engine/src/config/activation/gelu.rs
index 70cbce9e2..a4819ba7f 100644
--- a/crates/backend-uzu/src/config/activation/gelu.rs
+++ b/crates/uzu-engine/src/config/activation/gelu.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config(super::Activation)]
pub struct GELU {
diff --git a/crates/backend-uzu/src/config/activation/identity.rs b/crates/uzu-engine/src/config/activation/identity.rs
similarity index 60%
rename from crates/backend-uzu/src/config/activation/identity.rs
rename to crates/uzu-engine/src/config/activation/identity.rs
index 7d99a9783..db5ff4bf8 100644
--- a/crates/backend-uzu/src/config/activation/identity.rs
+++ b/crates/uzu-engine/src/config/activation/identity.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config(super::Activation)]
pub struct Identity;
diff --git a/crates/backend-uzu/src/config/activation/mod.rs b/crates/uzu-engine/src/config/activation/mod.rs
similarity index 95%
rename from crates/backend-uzu/src/config/activation/mod.rs
rename to crates/uzu-engine/src/config/activation/mod.rs
index a29c41d7a..48e043b6f 100644
--- a/crates/backend-uzu/src/config/activation/mod.rs
+++ b/crates/uzu-engine/src/config/activation/mod.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config_abstract;
+use uzu_engine_macros::uzu_config_abstract;
use crate::backends::common::gpu_types::ActivationType;
diff --git a/crates/backend-uzu/src/config/activation/silu.rs b/crates/uzu-engine/src/config/activation/silu.rs
similarity index 85%
rename from crates/backend-uzu/src/config/activation/silu.rs
rename to crates/uzu-engine/src/config/activation/silu.rs
index ee841885b..509794bdb 100644
--- a/crates/backend-uzu/src/config/activation/silu.rs
+++ b/crates/uzu-engine/src/config/activation/silu.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config(super::Activation)]
pub struct SiLU {
diff --git a/crates/backend-uzu/src/config/classifier.rs b/crates/uzu-engine/src/config/classifier.rs
similarity index 96%
rename from crates/backend-uzu/src/config/classifier.rs
rename to crates/uzu-engine/src/config/classifier.rs
index 40ded4d8c..8f04f3fca 100644
--- a/crates/backend-uzu/src/config/classifier.rs
+++ b/crates/uzu-engine/src/config/classifier.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::{
activation::AnyActivation, embedding::AnyEmbeddingConfig, linear::LinearConfig, normalization::NormalizationConfig,
diff --git a/crates/backend-uzu/src/config/decoder.rs b/crates/uzu-engine/src/config/decoder.rs
similarity index 92%
rename from crates/backend-uzu/src/config/decoder.rs
rename to crates/uzu-engine/src/config/decoder.rs
index 5c64322a9..557b22eec 100644
--- a/crates/backend-uzu/src/config/decoder.rs
+++ b/crates/uzu-engine/src/config/decoder.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::{
embedding::AnyEmbeddingConfig, normalization::NormalizationConfig, per_layer_embedding::PLEModelConfig,
diff --git a/crates/backend-uzu/src/config/dflash.rs b/crates/uzu-engine/src/config/dflash.rs
similarity index 94%
rename from crates/backend-uzu/src/config/dflash.rs
rename to crates/uzu-engine/src/config/dflash.rs
index 66202c967..9945dc17c 100644
--- a/crates/backend-uzu/src/config/dflash.rs
+++ b/crates/uzu-engine/src/config/dflash.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::{
linear::LinearConfig, normalization::NormalizationConfig, rope::AnyRoPEConfig,
diff --git a/crates/backend-uzu/src/config/embedding/mod.rs b/crates/uzu-engine/src/config/embedding/mod.rs
similarity index 86%
rename from crates/backend-uzu/src/config/embedding/mod.rs
rename to crates/uzu-engine/src/config/embedding/mod.rs
index 4ec8e5c94..893c790ff 100644
--- a/crates/backend-uzu/src/config/embedding/mod.rs
+++ b/crates/uzu-engine/src/config/embedding/mod.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config_abstract;
+use uzu_engine_macros::uzu_config_abstract;
pub mod tied_embedding;
pub mod untied_embedding;
diff --git a/crates/backend-uzu/src/config/embedding/tied_embedding.rs b/crates/uzu-engine/src/config/embedding/tied_embedding.rs
similarity index 66%
rename from crates/backend-uzu/src/config/embedding/tied_embedding.rs
rename to crates/uzu-engine/src/config/embedding/tied_embedding.rs
index 9bd8219ec..9d81a6b49 100644
--- a/crates/backend-uzu/src/config/embedding/tied_embedding.rs
+++ b/crates/uzu-engine/src/config/embedding/tied_embedding.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config(super::EmbeddingConfig)]
pub struct TiedEmbeddingConfig;
diff --git a/crates/backend-uzu/src/config/embedding/untied_embedding.rs b/crates/uzu-engine/src/config/embedding/untied_embedding.rs
similarity index 66%
rename from crates/backend-uzu/src/config/embedding/untied_embedding.rs
rename to crates/uzu-engine/src/config/embedding/untied_embedding.rs
index 1881be17e..1de2cbe31 100644
--- a/crates/backend-uzu/src/config/embedding/untied_embedding.rs
+++ b/crates/uzu-engine/src/config/embedding/untied_embedding.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config(super::EmbeddingConfig)]
pub struct UntiedEmbeddingConfig;
diff --git a/crates/backend-uzu/src/config/linear.rs b/crates/uzu-engine/src/config/linear.rs
similarity index 53%
rename from crates/backend-uzu/src/config/linear.rs
rename to crates/uzu-engine/src/config/linear.rs
index 59b7f48fa..4e979b530 100644
--- a/crates/backend-uzu/src/config/linear.rs
+++ b/crates/uzu-engine/src/config/linear.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config]
pub struct LinearConfig {}
diff --git a/crates/backend-uzu/src/config/mlp/dense_mlp.rs b/crates/uzu-engine/src/config/mlp/dense_mlp.rs
similarity index 95%
rename from crates/backend-uzu/src/config/mlp/dense_mlp.rs
rename to crates/uzu-engine/src/config/mlp/dense_mlp.rs
index 090ddc4fa..8a74fd9f2 100644
--- a/crates/backend-uzu/src/config/mlp/dense_mlp.rs
+++ b/crates/uzu-engine/src/config/mlp/dense_mlp.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::{activation::AnyActivation, linear::LinearConfig};
diff --git a/crates/backend-uzu/src/config/mlp/mixture_of_experts.rs b/crates/uzu-engine/src/config/mlp/mixture_of_experts.rs
similarity index 93%
rename from crates/backend-uzu/src/config/mlp/mixture_of_experts.rs
rename to crates/uzu-engine/src/config/mlp/mixture_of_experts.rs
index 60b786e35..4fcbf4618 100644
--- a/crates/backend-uzu/src/config/mlp/mixture_of_experts.rs
+++ b/crates/uzu-engine/src/config/mlp/mixture_of_experts.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::{
linear::LinearConfig,
diff --git a/crates/backend-uzu/src/config/mlp/mod.rs b/crates/uzu-engine/src/config/mlp/mod.rs
similarity index 80%
rename from crates/backend-uzu/src/config/mlp/mod.rs
rename to crates/uzu-engine/src/config/mlp/mod.rs
index 168716199..190b67c88 100644
--- a/crates/backend-uzu/src/config/mlp/mod.rs
+++ b/crates/uzu-engine/src/config/mlp/mod.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config_abstract;
+use uzu_engine_macros::uzu_config_abstract;
pub mod dense_mlp;
pub mod mixture_of_experts;
diff --git a/crates/backend-uzu/src/config/mlp/routing_function/mod.rs b/crates/uzu-engine/src/config/mlp/routing_function/mod.rs
similarity index 71%
rename from crates/backend-uzu/src/config/mlp/routing_function/mod.rs
rename to crates/uzu-engine/src/config/mlp/routing_function/mod.rs
index f6709affa..29524741f 100644
--- a/crates/backend-uzu/src/config/mlp/routing_function/mod.rs
+++ b/crates/uzu-engine/src/config/mlp/routing_function/mod.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config_abstract;
+use uzu_engine_macros::uzu_config_abstract;
pub mod softmax_routing;
diff --git a/crates/backend-uzu/src/config/mlp/routing_function/softmax_routing.rs b/crates/uzu-engine/src/config/mlp/routing_function/softmax_routing.rs
similarity index 64%
rename from crates/backend-uzu/src/config/mlp/routing_function/softmax_routing.rs
rename to crates/uzu-engine/src/config/mlp/routing_function/softmax_routing.rs
index 5b6d06a32..f5029c3cc 100644
--- a/crates/backend-uzu/src/config/mlp/routing_function/softmax_routing.rs
+++ b/crates/uzu-engine/src/config/mlp/routing_function/softmax_routing.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config(super::RoutingFunction)]
pub struct SoftmaxRouting;
diff --git a/crates/backend-uzu/src/config/mod.rs b/crates/uzu-engine/src/config/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/config/mod.rs
rename to crates/uzu-engine/src/config/mod.rs
diff --git a/crates/backend-uzu/src/config/model/classifier_model.rs b/crates/uzu-engine/src/config/model/classifier_model.rs
similarity index 82%
rename from crates/backend-uzu/src/config/model/classifier_model.rs
rename to crates/uzu-engine/src/config/model/classifier_model.rs
index d53eadb0d..993172de5 100644
--- a/crates/backend-uzu/src/config/model/classifier_model.rs
+++ b/crates/uzu-engine/src/config/model/classifier_model.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::classifier::ClassifierConfig;
diff --git a/crates/backend-uzu/src/config/model/generation.rs b/crates/uzu-engine/src/config/model/generation.rs
similarity index 92%
rename from crates/backend-uzu/src/config/model/generation.rs
rename to crates/uzu-engine/src/config/model/generation.rs
index 03e9605b5..753be16c6 100644
--- a/crates/backend-uzu/src/config/model/generation.rs
+++ b/crates/uzu-engine/src/config/model/generation.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::utils::strict_serde::Unsupported;
diff --git a/crates/backend-uzu/src/config/model/language_model.rs b/crates/uzu-engine/src/config/model/language_model.rs
similarity index 86%
rename from crates/backend-uzu/src/config/model/language_model.rs
rename to crates/uzu-engine/src/config/model/language_model.rs
index 330508e69..8238f1383 100644
--- a/crates/backend-uzu/src/config/model/language_model.rs
+++ b/crates/uzu-engine/src/config/model/language_model.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::{decoder::DecoderConfig, model::generation::GenerationConfig};
diff --git a/crates/backend-uzu/src/config/model/mod.rs b/crates/uzu-engine/src/config/model/mod.rs
similarity index 87%
rename from crates/backend-uzu/src/config/model/mod.rs
rename to crates/uzu-engine/src/config/model/mod.rs
index 9be898b82..d30b030b3 100644
--- a/crates/backend-uzu/src/config/model/mod.rs
+++ b/crates/uzu-engine/src/config/model/mod.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config_abstract;
+use uzu_engine_macros::uzu_config_abstract;
use crate::config::token_codec::AnyTokenCodecConfig;
diff --git a/crates/backend-uzu/src/config/normalization.rs b/crates/uzu-engine/src/config/normalization.rs
similarity index 90%
rename from crates/backend-uzu/src/config/normalization.rs
rename to crates/uzu-engine/src/config/normalization.rs
index 6f39872d2..726707278 100644
--- a/crates/backend-uzu/src/config/normalization.rs
+++ b/crates/uzu-engine/src/config/normalization.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config]
#[serde(rename_all = "snake_case")]
diff --git a/crates/backend-uzu/src/config/per_layer_embedding.rs b/crates/uzu-engine/src/config/per_layer_embedding.rs
similarity index 94%
rename from crates/backend-uzu/src/config/per_layer_embedding.rs
rename to crates/uzu-engine/src/config/per_layer_embedding.rs
index ee4996f42..f97f5866b 100644
--- a/crates/backend-uzu/src/config/per_layer_embedding.rs
+++ b/crates/uzu-engine/src/config/per_layer_embedding.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use super::{activation::AnyActivation, linear::LinearConfig, normalization::NormalizationConfig};
diff --git a/crates/backend-uzu/src/config/rope/linear_scaling_rope.rs b/crates/uzu-engine/src/config/rope/linear_scaling_rope.rs
similarity index 73%
rename from crates/backend-uzu/src/config/rope/linear_scaling_rope.rs
rename to crates/uzu-engine/src/config/rope/linear_scaling_rope.rs
index 034ed7196..48c3d42bb 100644
--- a/crates/backend-uzu/src/config/rope/linear_scaling_rope.rs
+++ b/crates/uzu-engine/src/config/rope/linear_scaling_rope.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config(super::RoPEConfig)]
pub struct LinearScalingRoPEConfig {
diff --git a/crates/backend-uzu/src/config/rope/llama_rope.rs b/crates/uzu-engine/src/config/rope/llama_rope.rs
similarity index 84%
rename from crates/backend-uzu/src/config/rope/llama_rope.rs
rename to crates/uzu-engine/src/config/rope/llama_rope.rs
index 6722fe6f3..806e51dff 100644
--- a/crates/backend-uzu/src/config/rope/llama_rope.rs
+++ b/crates/uzu-engine/src/config/rope/llama_rope.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config(super::RoPEConfig)]
pub struct LlamaRoPEConfig {
diff --git a/crates/backend-uzu/src/config/rope/longrope.rs b/crates/uzu-engine/src/config/rope/longrope.rs
similarity index 84%
rename from crates/backend-uzu/src/config/rope/longrope.rs
rename to crates/uzu-engine/src/config/rope/longrope.rs
index 777383bd1..e658bc769 100644
--- a/crates/backend-uzu/src/config/rope/longrope.rs
+++ b/crates/uzu-engine/src/config/rope/longrope.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config(super::RoPEConfig)]
pub struct LongRoPEConfig {
diff --git a/crates/backend-uzu/src/config/rope/mod.rs b/crates/uzu-engine/src/config/rope/mod.rs
similarity index 90%
rename from crates/backend-uzu/src/config/rope/mod.rs
rename to crates/uzu-engine/src/config/rope/mod.rs
index 34efc9b4c..902773e44 100644
--- a/crates/backend-uzu/src/config/rope/mod.rs
+++ b/crates/uzu-engine/src/config/rope/mod.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config_abstract;
+use uzu_engine_macros::uzu_config_abstract;
pub mod linear_scaling_rope;
pub mod llama_rope;
diff --git a/crates/backend-uzu/src/config/rope/unscaled_rope.rs b/crates/uzu-engine/src/config/rope/unscaled_rope.rs
similarity index 64%
rename from crates/backend-uzu/src/config/rope/unscaled_rope.rs
rename to crates/uzu-engine/src/config/rope/unscaled_rope.rs
index 8ea7f3a3a..a9cb321e0 100644
--- a/crates/backend-uzu/src/config/rope/unscaled_rope.rs
+++ b/crates/uzu-engine/src/config/rope/unscaled_rope.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config(super::RoPEConfig)]
pub struct UnscaledRoPEConfig;
diff --git a/crates/backend-uzu/src/config/rope/yarn_rope.rs b/crates/uzu-engine/src/config/rope/yarn_rope.rs
similarity index 84%
rename from crates/backend-uzu/src/config/rope/yarn_rope.rs
rename to crates/uzu-engine/src/config/rope/yarn_rope.rs
index 8bf6dcb6d..2f1739702 100644
--- a/crates/backend-uzu/src/config/rope/yarn_rope.rs
+++ b/crates/uzu-engine/src/config/rope/yarn_rope.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config(super::RoPEConfig)]
pub struct YARNRoPEConfig {
diff --git a/crates/backend-uzu/src/config/speculator/dflash.rs b/crates/uzu-engine/src/config/speculator/dflash.rs
similarity index 86%
rename from crates/backend-uzu/src/config/speculator/dflash.rs
rename to crates/uzu-engine/src/config/speculator/dflash.rs
index 84d1e2a2e..833f7d476 100644
--- a/crates/backend-uzu/src/config/speculator/dflash.rs
+++ b/crates/uzu-engine/src/config/speculator/dflash.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::{dflash::DFlashDraftConfig, weaver::WeaverConfig};
diff --git a/crates/backend-uzu/src/config/speculator/mod.rs b/crates/uzu-engine/src/config/speculator/mod.rs
similarity index 72%
rename from crates/backend-uzu/src/config/speculator/mod.rs
rename to crates/uzu-engine/src/config/speculator/mod.rs
index 16da2bc70..e723adc14 100644
--- a/crates/backend-uzu/src/config/speculator/mod.rs
+++ b/crates/uzu-engine/src/config/speculator/mod.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config_abstract;
+use uzu_engine_macros::uzu_config_abstract;
pub mod dflash;
pub mod model;
diff --git a/crates/backend-uzu/src/config/speculator/model.rs b/crates/uzu-engine/src/config/speculator/model.rs
similarity index 83%
rename from crates/backend-uzu/src/config/speculator/model.rs
rename to crates/uzu-engine/src/config/speculator/model.rs
index 526693448..4aeddedb9 100644
--- a/crates/backend-uzu/src/config/speculator/model.rs
+++ b/crates/uzu-engine/src/config/speculator/model.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::speculator::AnySpeculatorConfig;
diff --git a/crates/backend-uzu/src/config/token_codec/chat_codec.rs b/crates/uzu-engine/src/config/token_codec/chat_codec.rs
similarity index 92%
rename from crates/backend-uzu/src/config/token_codec/chat_codec.rs
rename to crates/uzu-engine/src/config/token_codec/chat_codec.rs
index a38e385d9..63ee8a27f 100644
--- a/crates/backend-uzu/src/config/token_codec/chat_codec.rs
+++ b/crates/uzu-engine/src/config/token_codec/chat_codec.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config(super::TokenCodecConfig)]
pub struct ChatCodecConfig {
diff --git a/crates/backend-uzu/src/config/token_codec/mod.rs b/crates/uzu-engine/src/config/token_codec/mod.rs
similarity index 78%
rename from crates/backend-uzu/src/config/token_codec/mod.rs
rename to crates/uzu-engine/src/config/token_codec/mod.rs
index 3b07f12a7..b839add1e 100644
--- a/crates/backend-uzu/src/config/token_codec/mod.rs
+++ b/crates/uzu-engine/src/config/token_codec/mod.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config_abstract;
+use uzu_engine_macros::uzu_config_abstract;
pub mod chat_codec;
pub mod raw_text_codec;
diff --git a/crates/backend-uzu/src/config/token_codec/raw_text_codec.rs b/crates/uzu-engine/src/config/token_codec/raw_text_codec.rs
similarity index 66%
rename from crates/backend-uzu/src/config/token_codec/raw_text_codec.rs
rename to crates/uzu-engine/src/config/token_codec/raw_text_codec.rs
index 1cf8a9de1..1608fca9f 100644
--- a/crates/backend-uzu/src/config/token_codec/raw_text_codec.rs
+++ b/crates/uzu-engine/src/config/token_codec/raw_text_codec.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config(super::TokenCodecConfig)]
pub struct RawTextCodecConfig;
diff --git a/crates/backend-uzu/src/config/token_mixer/attention.rs b/crates/uzu-engine/src/config/token_mixer/attention.rs
similarity index 96%
rename from crates/backend-uzu/src/config/token_mixer/attention.rs
rename to crates/uzu-engine/src/config/token_mixer/attention.rs
index 22a9cb1d4..3cb4acad0 100644
--- a/crates/backend-uzu/src/config/token_mixer/attention.rs
+++ b/crates/uzu-engine/src/config/token_mixer/attention.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::{
linear::LinearConfig,
diff --git a/crates/backend-uzu/src/config/token_mixer/convolutions.rs b/crates/uzu-engine/src/config/token_mixer/convolutions.rs
similarity index 69%
rename from crates/backend-uzu/src/config/token_mixer/convolutions.rs
rename to crates/uzu-engine/src/config/token_mixer/convolutions.rs
index fe4a9bdf8..e6705f91d 100644
--- a/crates/backend-uzu/src/config/token_mixer/convolutions.rs
+++ b/crates/uzu-engine/src/config/token_mixer/convolutions.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config]
pub struct SeparableCausalConvConfig {
diff --git a/crates/backend-uzu/src/config/token_mixer/delta_net.rs b/crates/uzu-engine/src/config/token_mixer/delta_net.rs
similarity index 93%
rename from crates/backend-uzu/src/config/token_mixer/delta_net.rs
rename to crates/uzu-engine/src/config/token_mixer/delta_net.rs
index bb9de33d0..cddf1314f 100644
--- a/crates/backend-uzu/src/config/token_mixer/delta_net.rs
+++ b/crates/uzu-engine/src/config/token_mixer/delta_net.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::{
linear::LinearConfig, normalization::NormalizationConfig, token_mixer::convolutions::SeparableCausalConvConfig,
diff --git a/crates/backend-uzu/src/config/token_mixer/mamba2.rs b/crates/uzu-engine/src/config/token_mixer/mamba2.rs
similarity index 93%
rename from crates/backend-uzu/src/config/token_mixer/mamba2.rs
rename to crates/uzu-engine/src/config/token_mixer/mamba2.rs
index e674d1b3d..e20d3558a 100644
--- a/crates/backend-uzu/src/config/token_mixer/mamba2.rs
+++ b/crates/uzu-engine/src/config/token_mixer/mamba2.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::{
activation::AnyActivation, linear::LinearConfig, token_mixer::convolutions::SeparableCausalConvConfig,
diff --git a/crates/backend-uzu/src/config/token_mixer/mod.rs b/crates/uzu-engine/src/config/token_mixer/mod.rs
similarity index 85%
rename from crates/backend-uzu/src/config/token_mixer/mod.rs
rename to crates/uzu-engine/src/config/token_mixer/mod.rs
index 875a53bda..9faa3c20e 100644
--- a/crates/backend-uzu/src/config/token_mixer/mod.rs
+++ b/crates/uzu-engine/src/config/token_mixer/mod.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config_abstract;
+use uzu_engine_macros::uzu_config_abstract;
pub mod attention;
pub mod convolutions;
diff --git a/crates/backend-uzu/src/config/token_mixer/short_conv.rs b/crates/uzu-engine/src/config/token_mixer/short_conv.rs
similarity index 90%
rename from crates/backend-uzu/src/config/token_mixer/short_conv.rs
rename to crates/uzu-engine/src/config/token_mixer/short_conv.rs
index 5b6849a3f..3fd22ea43 100644
--- a/crates/backend-uzu/src/config/token_mixer/short_conv.rs
+++ b/crates/uzu-engine/src/config/token_mixer/short_conv.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::{linear::LinearConfig, token_mixer::convolutions::SeparableCausalConvConfig};
diff --git a/crates/backend-uzu/src/config/transformer.rs b/crates/uzu-engine/src/config/transformer.rs
similarity index 89%
rename from crates/backend-uzu/src/config/transformer.rs
rename to crates/uzu-engine/src/config/transformer.rs
index f60a6ccc8..205df98f9 100644
--- a/crates/backend-uzu/src/config/transformer.rs
+++ b/crates/uzu-engine/src/config/transformer.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::{normalization::NormalizationConfig, transformer_layer::TransformerLayerConfig};
diff --git a/crates/backend-uzu/src/config/transformer_layer.rs b/crates/uzu-engine/src/config/transformer_layer.rs
similarity index 95%
rename from crates/backend-uzu/src/config/transformer_layer.rs
rename to crates/uzu-engine/src/config/transformer_layer.rs
index c7a97ce8b..91cd71cb5 100644
--- a/crates/backend-uzu/src/config/transformer_layer.rs
+++ b/crates/uzu-engine/src/config/transformer_layer.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::{
mlp::AnyMLPConfig, normalization::NormalizationConfig, per_layer_embedding::PLELayerConfig, rope::AnyRoPEConfig,
diff --git a/crates/backend-uzu/src/config/weaver.rs b/crates/uzu-engine/src/config/weaver.rs
similarity index 93%
rename from crates/backend-uzu/src/config/weaver.rs
rename to crates/uzu-engine/src/config/weaver.rs
index 973c4a1ae..7e8017d3b 100644
--- a/crates/backend-uzu/src/config/weaver.rs
+++ b/crates/uzu-engine/src/config/weaver.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::{linear::LinearConfig, normalization::NormalizationConfig, rope::AnyRoPEConfig};
diff --git a/crates/backend-uzu/src/config/weight_matrix/full_precision_spec.rs b/crates/uzu-engine/src/config/weight_matrix/full_precision_spec.rs
similarity index 79%
rename from crates/backend-uzu/src/config/weight_matrix/full_precision_spec.rs
rename to crates/uzu-engine/src/config/weight_matrix/full_precision_spec.rs
index af08001f3..9c78f1c1f 100644
--- a/crates/backend-uzu/src/config/weight_matrix/full_precision_spec.rs
+++ b/crates/uzu-engine/src/config/weight_matrix/full_precision_spec.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::weight_matrix::Layout;
diff --git a/crates/backend-uzu/src/config/weight_matrix/hybrid_spec.rs b/crates/uzu-engine/src/config/weight_matrix/hybrid_spec.rs
similarity index 92%
rename from crates/backend-uzu/src/config/weight_matrix/hybrid_spec.rs
rename to crates/uzu-engine/src/config/weight_matrix/hybrid_spec.rs
index 7c3bbdb7a..8e578529e 100644
--- a/crates/backend-uzu/src/config/weight_matrix/hybrid_spec.rs
+++ b/crates/uzu-engine/src/config/weight_matrix/hybrid_spec.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::weight_matrix::AnyWeightMatrixSpec;
diff --git a/crates/backend-uzu/src/config/weight_matrix/int_spec.rs b/crates/uzu-engine/src/config/weight_matrix/int_spec.rs
similarity index 84%
rename from crates/backend-uzu/src/config/weight_matrix/int_spec.rs
rename to crates/uzu-engine/src/config/weight_matrix/int_spec.rs
index 0b3e980dd..4b4b0e8fc 100644
--- a/crates/backend-uzu/src/config/weight_matrix/int_spec.rs
+++ b/crates/uzu-engine/src/config/weight_matrix/int_spec.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::weight_matrix::Layout;
diff --git a/crates/backend-uzu/src/config/weight_matrix/low_rank_spec.rs b/crates/uzu-engine/src/config/weight_matrix/low_rank_spec.rs
similarity index 70%
rename from crates/backend-uzu/src/config/weight_matrix/low_rank_spec.rs
rename to crates/uzu-engine/src/config/weight_matrix/low_rank_spec.rs
index ad2672176..9ac41a646 100644
--- a/crates/backend-uzu/src/config/weight_matrix/low_rank_spec.rs
+++ b/crates/uzu-engine/src/config/weight_matrix/low_rank_spec.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[uzu_config(super::WeightMatrixSpec)]
pub struct LowRankSpec {
diff --git a/crates/backend-uzu/src/config/weight_matrix/mlx_spec.rs b/crates/uzu-engine/src/config/weight_matrix/mlx_spec.rs
similarity index 82%
rename from crates/backend-uzu/src/config/weight_matrix/mlx_spec.rs
rename to crates/uzu-engine/src/config/weight_matrix/mlx_spec.rs
index dd004d1ef..dc06668b0 100644
--- a/crates/backend-uzu/src/config/weight_matrix/mlx_spec.rs
+++ b/crates/uzu-engine/src/config/weight_matrix/mlx_spec.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
use crate::config::weight_matrix::Layout;
diff --git a/crates/backend-uzu/src/config/weight_matrix/mod.rs b/crates/uzu-engine/src/config/weight_matrix/mod.rs
similarity index 87%
rename from crates/backend-uzu/src/config/weight_matrix/mod.rs
rename to crates/uzu-engine/src/config/weight_matrix/mod.rs
index 492189a7f..5f10ee506 100644
--- a/crates/backend-uzu/src/config/weight_matrix/mod.rs
+++ b/crates/uzu-engine/src/config/weight_matrix/mod.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::{uzu_config, uzu_config_abstract};
+use uzu_engine_macros::{uzu_config, uzu_config_abstract};
pub mod full_precision_spec;
pub mod hybrid_spec;
diff --git a/crates/backend-uzu/src/data_type.rs b/crates/uzu-engine/src/data_type.rs
similarity index 97%
rename from crates/backend-uzu/src/data_type.rs
rename to crates/uzu-engine/src/data_type.rs
index 91838272e..5ee66baf0 100644
--- a/crates/backend-uzu/src/data_type.rs
+++ b/crates/uzu-engine/src/data_type.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_config;
+use uzu_engine_macros::uzu_config;
#[derive(Eq, PartialOrd, Ord, Copy, Hash)]
#[uzu_config]
diff --git a/crates/backend-uzu/src/encodable_block/batch_topology.rs b/crates/uzu-engine/src/encodable_block/batch_topology.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/batch_topology.rs
rename to crates/uzu-engine/src/encodable_block/batch_topology.rs
diff --git a/crates/backend-uzu/src/encodable_block/classifier.rs b/crates/uzu-engine/src/encodable_block/classifier.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/classifier.rs
rename to crates/uzu-engine/src/encodable_block/classifier.rs
diff --git a/crates/backend-uzu/src/encodable_block/decoder.rs b/crates/uzu-engine/src/encodable_block/decoder.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/decoder.rs
rename to crates/uzu-engine/src/encodable_block/decoder.rs
diff --git a/crates/backend-uzu/src/encodable_block/dflash.rs b/crates/uzu-engine/src/encodable_block/dflash.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/dflash.rs
rename to crates/uzu-engine/src/encodable_block/dflash.rs
diff --git a/crates/backend-uzu/src/encodable_block/embedding.rs b/crates/uzu-engine/src/encodable_block/embedding.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/embedding.rs
rename to crates/uzu-engine/src/encodable_block/embedding.rs
diff --git a/crates/backend-uzu/src/encodable_block/embedding_table.rs b/crates/uzu-engine/src/encodable_block/embedding_table.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/embedding_table.rs
rename to crates/uzu-engine/src/encodable_block/embedding_table.rs
diff --git a/crates/backend-uzu/src/encodable_block/linear/matmul.rs b/crates/uzu-engine/src/encodable_block/linear/matmul.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/linear/matmul.rs
rename to crates/uzu-engine/src/encodable_block/linear/matmul.rs
diff --git a/crates/backend-uzu/src/encodable_block/linear/mod.rs b/crates/uzu-engine/src/encodable_block/linear/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/linear/mod.rs
rename to crates/uzu-engine/src/encodable_block/linear/mod.rs
diff --git a/crates/backend-uzu/src/encodable_block/linear/qlora_wrapper.rs b/crates/uzu-engine/src/encodable_block/linear/qlora_wrapper.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/linear/qlora_wrapper.rs
rename to crates/uzu-engine/src/encodable_block/linear/qlora_wrapper.rs
diff --git a/crates/backend-uzu/src/encodable_block/linear/rht_wrapper.rs b/crates/uzu-engine/src/encodable_block/linear/rht_wrapper.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/linear/rht_wrapper.rs
rename to crates/uzu-engine/src/encodable_block/linear/rht_wrapper.rs
diff --git a/crates/backend-uzu/src/encodable_block/mixer/attention/core/fallback.rs b/crates/uzu-engine/src/encodable_block/mixer/attention/core/fallback.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mixer/attention/core/fallback.rs
rename to crates/uzu-engine/src/encodable_block/mixer/attention/core/fallback.rs
diff --git a/crates/backend-uzu/src/encodable_block/mixer/attention/core/mod.rs b/crates/uzu-engine/src/encodable_block/mixer/attention/core/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mixer/attention/core/mod.rs
rename to crates/uzu-engine/src/encodable_block/mixer/attention/core/mod.rs
diff --git a/crates/backend-uzu/src/encodable_block/mixer/attention/core/single_pass.rs b/crates/uzu-engine/src/encodable_block/mixer/attention/core/single_pass.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mixer/attention/core/single_pass.rs
rename to crates/uzu-engine/src/encodable_block/mixer/attention/core/single_pass.rs
diff --git a/crates/backend-uzu/src/encodable_block/mixer/attention/core/two_pass.rs b/crates/uzu-engine/src/encodable_block/mixer/attention/core/two_pass.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mixer/attention/core/two_pass.rs
rename to crates/uzu-engine/src/encodable_block/mixer/attention/core/two_pass.rs
diff --git a/crates/backend-uzu/src/encodable_block/mixer/attention/mod.rs b/crates/uzu-engine/src/encodable_block/mixer/attention/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mixer/attention/mod.rs
rename to crates/uzu-engine/src/encodable_block/mixer/attention/mod.rs
diff --git a/crates/backend-uzu/src/encodable_block/mixer/attention/mode.rs b/crates/uzu-engine/src/encodable_block/mixer/attention/mode.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mixer/attention/mode.rs
rename to crates/uzu-engine/src/encodable_block/mixer/attention/mode.rs
diff --git a/crates/backend-uzu/src/encodable_block/mixer/attention/qkv_norm.rs b/crates/uzu-engine/src/encodable_block/mixer/attention/qkv_norm.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mixer/attention/qkv_norm.rs
rename to crates/uzu-engine/src/encodable_block/mixer/attention/qkv_norm.rs
diff --git a/crates/backend-uzu/src/encodable_block/mixer/attention/rope.rs b/crates/uzu-engine/src/encodable_block/mixer/attention/rope.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mixer/attention/rope.rs
rename to crates/uzu-engine/src/encodable_block/mixer/attention/rope.rs
diff --git a/crates/backend-uzu/src/encodable_block/mixer/attention/state.rs b/crates/uzu-engine/src/encodable_block/mixer/attention/state.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mixer/attention/state.rs
rename to crates/uzu-engine/src/encodable_block/mixer/attention/state.rs
diff --git a/crates/backend-uzu/src/encodable_block/mixer/delta_net.rs b/crates/uzu-engine/src/encodable_block/mixer/delta_net.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mixer/delta_net.rs
rename to crates/uzu-engine/src/encodable_block/mixer/delta_net.rs
diff --git a/crates/backend-uzu/src/encodable_block/mixer/delta_net/tree_verify.rs b/crates/uzu-engine/src/encodable_block/mixer/delta_net/tree_verify.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mixer/delta_net/tree_verify.rs
rename to crates/uzu-engine/src/encodable_block/mixer/delta_net/tree_verify.rs
diff --git a/crates/backend-uzu/src/encodable_block/mixer/mamba2.rs b/crates/uzu-engine/src/encodable_block/mixer/mamba2.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mixer/mamba2.rs
rename to crates/uzu-engine/src/encodable_block/mixer/mamba2.rs
diff --git a/crates/backend-uzu/src/encodable_block/mixer/mod.rs b/crates/uzu-engine/src/encodable_block/mixer/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mixer/mod.rs
rename to crates/uzu-engine/src/encodable_block/mixer/mod.rs
diff --git a/crates/backend-uzu/src/encodable_block/mixer/short_conv.rs b/crates/uzu-engine/src/encodable_block/mixer/short_conv.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mixer/short_conv.rs
rename to crates/uzu-engine/src/encodable_block/mixer/short_conv.rs
diff --git a/crates/backend-uzu/src/encodable_block/mlp/dense.rs b/crates/uzu-engine/src/encodable_block/mlp/dense.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mlp/dense.rs
rename to crates/uzu-engine/src/encodable_block/mlp/dense.rs
diff --git a/crates/backend-uzu/src/encodable_block/mlp/gate_act_mul.rs b/crates/uzu-engine/src/encodable_block/mlp/gate_act_mul.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mlp/gate_act_mul.rs
rename to crates/uzu-engine/src/encodable_block/mlp/gate_act_mul.rs
diff --git a/crates/backend-uzu/src/encodable_block/mlp/mod.rs b/crates/uzu-engine/src/encodable_block/mlp/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mlp/mod.rs
rename to crates/uzu-engine/src/encodable_block/mlp/mod.rs
diff --git a/crates/backend-uzu/src/encodable_block/mlp/moe/experts_two_pass_decode.rs b/crates/uzu-engine/src/encodable_block/mlp/moe/experts_two_pass_decode.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mlp/moe/experts_two_pass_decode.rs
rename to crates/uzu-engine/src/encodable_block/mlp/moe/experts_two_pass_decode.rs
diff --git a/crates/backend-uzu/src/encodable_block/mlp/moe/experts_two_pass_prefill.rs b/crates/uzu-engine/src/encodable_block/mlp/moe/experts_two_pass_prefill.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mlp/moe/experts_two_pass_prefill.rs
rename to crates/uzu-engine/src/encodable_block/mlp/moe/experts_two_pass_prefill.rs
diff --git a/crates/backend-uzu/src/encodable_block/mlp/moe/gather.rs b/crates/uzu-engine/src/encodable_block/mlp/moe/gather.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mlp/moe/gather.rs
rename to crates/uzu-engine/src/encodable_block/mlp/moe/gather.rs
diff --git a/crates/backend-uzu/src/encodable_block/mlp/moe/mod.rs b/crates/uzu-engine/src/encodable_block/mlp/moe/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mlp/moe/mod.rs
rename to crates/uzu-engine/src/encodable_block/mlp/moe/mod.rs
diff --git a/crates/backend-uzu/src/encodable_block/mod.rs b/crates/uzu-engine/src/encodable_block/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/mod.rs
rename to crates/uzu-engine/src/encodable_block/mod.rs
diff --git a/crates/backend-uzu/src/encodable_block/normalization.rs b/crates/uzu-engine/src/encodable_block/normalization.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/normalization.rs
rename to crates/uzu-engine/src/encodable_block/normalization.rs
diff --git a/crates/backend-uzu/src/encodable_block/per_layer_embedding.rs b/crates/uzu-engine/src/encodable_block/per_layer_embedding.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/per_layer_embedding.rs
rename to crates/uzu-engine/src/encodable_block/per_layer_embedding.rs
diff --git a/crates/backend-uzu/src/encodable_block/prediction_head.rs b/crates/uzu-engine/src/encodable_block/prediction_head.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/prediction_head.rs
rename to crates/uzu-engine/src/encodable_block/prediction_head.rs
diff --git a/crates/backend-uzu/src/encodable_block/sampling/gumbel.rs b/crates/uzu-engine/src/encodable_block/sampling/gumbel.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/sampling/gumbel.rs
rename to crates/uzu-engine/src/encodable_block/sampling/gumbel.rs
diff --git a/crates/backend-uzu/src/encodable_block/sampling/mod.rs b/crates/uzu-engine/src/encodable_block/sampling/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/sampling/mod.rs
rename to crates/uzu-engine/src/encodable_block/sampling/mod.rs
diff --git a/crates/backend-uzu/src/encodable_block/sampling/prng.rs b/crates/uzu-engine/src/encodable_block/sampling/prng.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/sampling/prng.rs
rename to crates/uzu-engine/src/encodable_block/sampling/prng.rs
diff --git a/crates/backend-uzu/src/encodable_block/transformer.rs b/crates/uzu-engine/src/encodable_block/transformer.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/transformer.rs
rename to crates/uzu-engine/src/encodable_block/transformer.rs
diff --git a/crates/backend-uzu/src/encodable_block/transformer_layer.rs b/crates/uzu-engine/src/encodable_block/transformer_layer.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/transformer_layer.rs
rename to crates/uzu-engine/src/encodable_block/transformer_layer.rs
diff --git a/crates/backend-uzu/src/encodable_block/weaver.rs b/crates/uzu-engine/src/encodable_block/weaver.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/weaver.rs
rename to crates/uzu-engine/src/encodable_block/weaver.rs
diff --git a/crates/backend-uzu/src/encodable_block/weaver_layer.rs b/crates/uzu-engine/src/encodable_block/weaver_layer.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/weaver_layer.rs
rename to crates/uzu-engine/src/encodable_block/weaver_layer.rs
diff --git a/crates/backend-uzu/src/encodable_block/weight_matrix.rs b/crates/uzu-engine/src/encodable_block/weight_matrix.rs
similarity index 100%
rename from crates/backend-uzu/src/encodable_block/weight_matrix.rs
rename to crates/uzu-engine/src/encodable_block/weight_matrix.rs
diff --git a/crates/backend-uzu/src/engine/capture.rs b/crates/uzu-engine/src/engine/capture.rs
similarity index 100%
rename from crates/backend-uzu/src/engine/capture.rs
rename to crates/uzu-engine/src/engine/capture.rs
diff --git a/crates/backend-uzu/src/engine/classifier_model.rs b/crates/uzu-engine/src/engine/classifier_model.rs
similarity index 83%
rename from crates/backend-uzu/src/engine/classifier_model.rs
rename to crates/uzu-engine/src/engine/classifier_model.rs
index c89653f88..69c19a632 100644
--- a/crates/backend-uzu/src/engine/classifier_model.rs
+++ b/crates/uzu-engine/src/engine/classifier_model.rs
@@ -8,7 +8,10 @@ use std::{
};
use half::bf16;
-use shoji::traits::backend::classification::ClassifierOutput;
+use shoji::{
+ traits::backend::classification::ClassifierOutput,
+ types::session::classification::{ChatTokenCodecConfig, TokenCodecConfig},
+};
use thiserror::Error;
use tokenizers::Tokenizer;
@@ -108,8 +111,21 @@ impl<B: Backend> ClassifierModel<B> {
&self.tokenizer
}
- pub fn token_codec_config(&self) -> &AnyTokenCodecConfig {
- &self.token_codec_config
+ pub fn token_codec_config(&self) -> TokenCodecConfig {
+ match &self.token_codec_config {
+ AnyTokenCodecConfig::ChatCodecConfig(config) => TokenCodecConfig::Chat(ChatTokenCodecConfig {
+ prompt_template: config.prompt_template.clone(),
+ output_parser_regex: config.output_parser_regex.clone(),
+ system_role_name: config.system_role_name.clone(),
+ user_role_name: config.user_role_name.clone(),
+ assistant_role_name: config.assistant_role_name.clone(),
+ eos_token: config.eos_token.clone(),
+ bos_token: config.bos_token.clone(),
+ end_of_thinking_tag: config.end_of_thinking_tag.clone(),
+ default_system_prompt: config.default_system_prompt.clone(),
+ }),
+ AnyTokenCodecConfig::RawTextCodecConfig(_) => TokenCodecConfig::RawText,
+ }
}
pub fn classify(
diff --git a/crates/backend-uzu/src/engine/language_model/grammar/config.rs b/crates/uzu-engine/src/engine/language_model/grammar/config.rs
similarity index 100%
rename from crates/backend-uzu/src/engine/language_model/grammar/config.rs
rename to crates/uzu-engine/src/engine/language_model/grammar/config.rs
diff --git a/crates/backend-uzu/src/engine/language_model/grammar/data_type.rs b/crates/uzu-engine/src/engine/language_model/grammar/data_type.rs
similarity index 100%
rename from crates/backend-uzu/src/engine/language_model/grammar/data_type.rs
rename to crates/uzu-engine/src/engine/language_model/grammar/data_type.rs
diff --git a/crates/backend-uzu/src/engine/language_model/grammar/engagement.rs b/crates/uzu-engine/src/engine/language_model/grammar/engagement.rs
similarity index 100%
rename from crates/backend-uzu/src/engine/language_model/grammar/engagement.rs
rename to crates/uzu-engine/src/engine/language_model/grammar/engagement.rs
diff --git a/crates/backend-uzu/src/engine/language_model/grammar/mod.rs b/crates/uzu-engine/src/engine/language_model/grammar/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/engine/language_model/grammar/mod.rs
rename to crates/uzu-engine/src/engine/language_model/grammar/mod.rs
diff --git a/crates/backend-uzu/src/engine/language_model/mod.rs b/crates/uzu-engine/src/engine/language_model/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/engine/language_model/mod.rs
rename to crates/uzu-engine/src/engine/language_model/mod.rs
diff --git a/crates/backend-uzu/src/engine/language_model/state.rs b/crates/uzu-engine/src/engine/language_model/state.rs
similarity index 100%
rename from crates/backend-uzu/src/engine/language_model/state.rs
rename to crates/uzu-engine/src/engine/language_model/state.rs
diff --git a/crates/backend-uzu/src/engine/language_model/stream/mod.rs b/crates/uzu-engine/src/engine/language_model/stream/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/engine/language_model/stream/mod.rs
rename to crates/uzu-engine/src/engine/language_model/stream/mod.rs
diff --git a/crates/backend-uzu/src/engine/language_model/stream/stream.rs b/crates/uzu-engine/src/engine/language_model/stream/stream.rs
similarity index 100%
rename from crates/backend-uzu/src/engine/language_model/stream/stream.rs
rename to crates/uzu-engine/src/engine/language_model/stream/stream.rs
diff --git a/crates/backend-uzu/src/engine/mod.rs b/crates/uzu-engine/src/engine/mod.rs
similarity index 51%
rename from crates/backend-uzu/src/engine/mod.rs
rename to crates/uzu-engine/src/engine/mod.rs
index 4c8cb641b..90b5b9728 100644
--- a/crates/backend-uzu/src/engine/mod.rs
+++ b/crates/uzu-engine/src/engine/mod.rs
@@ -1,9 +1,10 @@
-use std::sync::Arc;
+use std::{fs::File, io::BufReader, path::Path, sync::Arc};
use thiserror::Error;
use crate::{
backends::common::{Backend, Context},
+ config::model::AnyModelConfig,
engine::capture::CaptureManager,
};
@@ -41,3 +42,27 @@ impl<B: Backend> Engine<B> {
self.context.peak_memory_usage()
}
}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ModelType {
+ LanguageModel,
+ Classifier,
+}
+
+#[derive(Debug, Error)]
+pub enum ResolveModelTypeError {
+ #[error("Unable to open model configuration: {0}")]
+ UnableToOpenConfig(#[from] std::io::Error),
+ #[error("Unable to deserialize model configuration: {0}")]
+ UnableToDeserializeConfig(#[from] serde_json::Error),
+}
+
+pub fn resolve_model_type(model_path: &Path) -> Result<ModelType, ResolveModelTypeError> {
+ let config_path = model_path.join("config.json");
+ let file = File::open(&config_path)?;
+ let config: AnyModelConfig = serde_json::from_reader(BufReader::new(file))?;
+ Ok(match config {
+ AnyModelConfig::LanguageModelConfig(_) => ModelType::LanguageModel,
+ AnyModelConfig::ClassifierModelConfig(_) => ModelType::Classifier,
+ })
+}
diff --git a/crates/backend-uzu/src/lib.rs b/crates/uzu-engine/src/lib.rs
similarity index 87%
rename from crates/backend-uzu/src/lib.rs
rename to crates/uzu-engine/src/lib.rs
index e3b2e2598..8f90a945f 100644
--- a/crates/backend-uzu/src/lib.rs
+++ b/crates/uzu-engine/src/lib.rs
@@ -1,5 +1,6 @@
#![cfg_attr(test, feature(custom_test_frameworks, test))]
#![cfg_attr(test, test_runner(test_runner::uzu_harness))]
+#![cfg_attr(target_family = "wasm", feature(wasi_ext))]
mod array;
mod config;
@@ -10,7 +11,6 @@ mod trie;
mod utils;
pub mod backends;
-pub mod bridge;
pub mod data_type;
pub mod engine;
diff --git a/crates/backend-uzu/src/parameters/loader.rs b/crates/uzu-engine/src/parameters/loader.rs
similarity index 96%
rename from crates/backend-uzu/src/parameters/loader.rs
rename to crates/uzu-engine/src/parameters/loader.rs
index 807c4ee1e..e950aef3f 100644
--- a/crates/backend-uzu/src/parameters/loader.rs
+++ b/crates/uzu-engine/src/parameters/loader.rs
@@ -1,3 +1,7 @@
+#[cfg(unix)]
+use std::os::unix::fs::FileExt;
+#[cfg(target_family = "wasm")]
+use std::os::wasi::fs::FileExt;
use std::{
cell::RefCell,
collections::{HashMap, HashSet},
@@ -11,7 +15,7 @@ use crate::{
array::{ArrayElement, size_for_shape},
backends::common::{Allocation, AllocationType, AsBufferRangeRef, Backend, Context, DenseBuffer},
data_type::DataType,
- utils::{fs::file_read_exact_at, strict_serde::DeserializeStrictOwned},
+ utils::strict_serde::DeserializeStrictOwned,
};
pub struct ParameterMetadata {
@@ -155,7 +159,7 @@ impl<'a, 'leaf, B: Backend> ParameterLeaf<'a, 'leaf, B, true> {
let element_count = self.metadata.size / std::mem::size_of::<T>();
let mut data = vec![T::zeroed(); element_count];
let destination = bytemuck::cast_slice_mut(&mut data);
- file_read_exact_at(self.loader.file, destination, self.metadata.offset as u64)?;
+ self.loader.file.read_exact_at(destination, self.metadata.offset as u64)?;
Ok(data.into_boxed_slice())
}
@@ -173,7 +177,7 @@ impl<'a, 'leaf, B: Backend> ParameterLeaf<'a, 'leaf, B, true> {
range.len(),
)
};
- file_read_exact_at(self.loader.file, destination, self.metadata.offset as u64)?;
+ self.loader.file.read_exact_at(destination, self.metadata.offset as u64)?;
Ok(allocation)
}
}
diff --git a/crates/backend-uzu/src/parameters/mod.rs b/crates/uzu-engine/src/parameters/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/parameters/mod.rs
rename to crates/uzu-engine/src/parameters/mod.rs
diff --git a/crates/backend-uzu/src/parameters/safetensors_metadata.rs b/crates/uzu-engine/src/parameters/safetensors_metadata.rs
similarity index 92%
rename from crates/backend-uzu/src/parameters/safetensors_metadata.rs
rename to crates/uzu-engine/src/parameters/safetensors_metadata.rs
index 2fd1bdee0..fdd3e74bb 100644
--- a/crates/backend-uzu/src/parameters/safetensors_metadata.rs
+++ b/crates/uzu-engine/src/parameters/safetensors_metadata.rs
@@ -1,11 +1,15 @@
// This code is based on the safetensors implementation: https://docs.rs/safetensors/latest/src/safetensors/tensor.rs.html
+#[cfg(unix)]
+use std::os::unix::fs::FileExt;
+#[cfg(target_family = "wasm")]
+use std::os::wasi::fs::FileExt;
use std::{collections::HashMap, fs::File, str::Utf8Error};
use serde::{Deserialize, Serialize};
use thiserror::Error;
-use crate::{data_type::DataType, utils::fs::file_read_exact_at};
+use crate::data_type::DataType;
#[derive(Debug, Error)]
pub enum HeaderLoadingError {
@@ -111,7 +115,7 @@ const MAX_HEADER_SIZE: usize = 100_000_000;
pub fn read_metadata(file: &File) -> Result<(usize, HashMetadata), HeaderLoadingError> {
let mut header_buffer = [0u8; size_of::<u64>()];
- file_read_exact_at(file, &mut header_buffer, 0).map_err(HeaderLoadingError::UnableToReadHeader)?;
+ file.read_exact_at(&mut header_buffer, 0).map_err(HeaderLoadingError::UnableToReadHeader)?;
let metadata_size: usize =
u64::from_le_bytes(header_buffer).try_into().map_err(|_| HeaderLoadingError::HeaderTooLarge)?;
if metadata_size > MAX_HEADER_SIZE {
@@ -120,7 +124,7 @@ pub fn read_metadata(file: &File) -> Result<(usize, HashMetadata), HeaderLoading
let stop = metadata_size.checked_add(8).ok_or(HeaderLoadingError::InvalidHeaderLength)?;
let mut json_buffer: Box<[u8]> = core::iter::repeat_n(0, stop - size_of::<u64>()).collect();
- file_read_exact_at(file, &mut json_buffer, 8).map_err(HeaderLoadingError::UnableToReadHeaderJson)?;
+ file.read_exact_at(&mut json_buffer, 8).map_err(HeaderLoadingError::UnableToReadHeaderJson)?;
let string = core::str::from_utf8(&json_buffer)?;
let metadata: HashMetadata = serde_json::from_str(string)?;
Ok((stop, metadata))
diff --git a/crates/backend-uzu/src/speculators/dflash_tfm.rs b/crates/uzu-engine/src/speculators/dflash_tfm.rs
similarity index 100%
rename from crates/backend-uzu/src/speculators/dflash_tfm.rs
rename to crates/uzu-engine/src/speculators/dflash_tfm.rs
diff --git a/crates/backend-uzu/src/speculators/mod.rs b/crates/uzu-engine/src/speculators/mod.rs
similarity index 100%
rename from crates/backend-uzu/src/speculators/mod.rs
rename to crates/uzu-engine/src/speculators/mod.rs
diff --git a/crates/backend-uzu/src/trie.rs b/crates/uzu-engine/src/trie.rs
similarity index 100%
rename from crates/backend-uzu/src/trie.rs
rename to crates/uzu-engine/src/trie.rs
diff --git a/crates/backend-uzu/src/utils/dispatch_dtype.rs b/crates/uzu-engine/src/utils/dispatch_dtype.rs
similarity index 100%
rename from crates/backend-uzu/src/utils/dispatch_dtype.rs
rename to crates/uzu-engine/src/utils/dispatch_dtype.rs
diff --git a/crates/backend-uzu/src/utils/maybe_mut.rs b/crates/uzu-engine/src/utils/maybe_mut.rs
similarity index 100%
rename from crates/backend-uzu/src/utils/maybe_mut.rs
rename to crates/uzu-engine/src/utils/maybe_mut.rs
diff --git a/crates/backend-uzu/src/utils/mod.rs b/crates/uzu-engine/src/utils/mod.rs
similarity index 91%
rename from crates/backend-uzu/src/utils/mod.rs
rename to crates/uzu-engine/src/utils/mod.rs
index 10458dcce..400fdec78 100644
--- a/crates/backend-uzu/src/utils/mod.rs
+++ b/crates/uzu-engine/src/utils/mod.rs
@@ -1,5 +1,4 @@
pub mod dispatch_dtype;
-pub mod fs;
pub mod maybe_mut;
#[cfg(backend = "cpu")]
pub mod pointers;
diff --git a/crates/backend-uzu/src/utils/pointers.rs b/crates/uzu-engine/src/utils/pointers.rs
similarity index 100%
rename from crates/backend-uzu/src/utils/pointers.rs
rename to crates/uzu-engine/src/utils/pointers.rs
diff --git a/crates/backend-uzu/src/utils/strict_serde.rs b/crates/uzu-engine/src/utils/strict_serde.rs
similarity index 100%
rename from crates/backend-uzu/src/utils/strict_serde.rs
rename to crates/uzu-engine/src/utils/strict_serde.rs
diff --git a/crates/backend-uzu/src/utils/version.rs b/crates/uzu-engine/src/utils/version.rs
similarity index 100%
rename from crates/backend-uzu/src/utils/version.rs
rename to crates/uzu-engine/src/utils/version.rs
diff --git a/crates/backend-uzu/unit/backends/common/allocator/allocator.rs b/crates/uzu-engine/unit/backends/common/allocator/allocator.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/allocator/allocator.rs
rename to crates/uzu-engine/unit/backends/common/allocator/allocator.rs
index ea97c6216..2f20530da 100644
--- a/crates/backend-uzu/unit/backends/common/allocator/allocator.rs
+++ b/crates/uzu-engine/unit/backends/common/allocator/allocator.rs
@@ -6,8 +6,8 @@ use std::{
time::Instant,
};
-use backend_uzu_macros::uzu_test;
use serde::{Deserialize, Serialize};
+use uzu_engine_macros::uzu_test;
use crate::backends::{
common::{
diff --git a/crates/backend-uzu/unit/backends/common/hazard_tracker_test.rs b/crates/uzu-engine/unit/backends/common/hazard_tracker_test.rs
similarity index 97%
rename from crates/backend-uzu/unit/backends/common/hazard_tracker_test.rs
rename to crates/uzu-engine/unit/backends/common/hazard_tracker_test.rs
index a416ff4fa..8a5312722 100644
--- a/crates/backend-uzu/unit/backends/common/hazard_tracker_test.rs
+++ b/crates/uzu-engine/unit/backends/common/hazard_tracker_test.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_test;
+use uzu_engine_macros::uzu_test;
use super::*;
diff --git a/crates/backend-uzu/unit/backends/common/kernel/activation_test.rs b/crates/uzu-engine/unit/backends/common/kernel/activation_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/activation_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/activation_test.rs
index c5a49ef59..d18182b42 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/activation_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/activation_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/activation_transform_test.rs b/crates/uzu-engine/unit/backends/common/kernel/activation_transform_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/activation_transform_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/activation_transform_test.rs
index af3ea38ca..b8b16e790 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/activation_transform_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/activation_transform_test.rs
@@ -1,8 +1,8 @@
use std::fmt::Debug;
-use backend_uzu_macros::uzu_test;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
@@ -104,8 +104,8 @@ fn input_and_output_rht_bf16() {
}
mod quantize {
- use backend_uzu_macros::uzu_test;
use rand::{RngExt, SeedableRng, rngs::SmallRng};
+ use uzu_engine_macros::uzu_test;
use super::BLOCK_SIZE;
use crate::{
diff --git a/crates/backend-uzu/unit/backends/common/kernel/attention/ancestor_attention_test.rs b/crates/uzu-engine/unit/backends/common/kernel/attention/ancestor_attention_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/attention/ancestor_attention_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/attention/ancestor_attention_test.rs
index 055d1aaae..f247f9755 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/attention/ancestor_attention_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/attention/ancestor_attention_test.rs
@@ -2,8 +2,8 @@
use std::{sync::Arc, time::Duration};
-use backend_uzu_macros::uzu_test;
use half::bf16;
+use uzu_engine_macros::uzu_test;
use crate::{
backends::{
diff --git a/crates/backend-uzu/unit/backends/common/kernel/attention/attention_fallback_test.rs b/crates/uzu-engine/unit/backends/common/kernel/attention/attention_fallback_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/attention/attention_fallback_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/attention/attention_fallback_test.rs
index deb8441ac..faf7d9789 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/attention/attention_fallback_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/attention/attention_fallback_test.rs
@@ -1,5 +1,5 @@
-use backend_uzu_macros::uzu_test;
use half::bf16;
+use uzu_engine_macros::uzu_test;
use crate::{
backends::{
diff --git a/crates/backend-uzu/unit/backends/common/kernel/attention/attention_single_pass_test.rs b/crates/uzu-engine/unit/backends/common/kernel/attention/attention_single_pass_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/attention/attention_single_pass_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/attention/attention_single_pass_test.rs
index e8e2494cc..bab360961 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/attention/attention_single_pass_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/attention/attention_single_pass_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/attention/attention_two_pass_test.rs b/crates/uzu-engine/unit/backends/common/kernel/attention/attention_two_pass_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/attention/attention_two_pass_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/attention/attention_two_pass_test.rs
index 2c54ddc27..193239007 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/attention/attention_two_pass_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/attention/attention_two_pass_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/attention/mod.rs b/crates/uzu-engine/unit/backends/common/kernel/attention/mod.rs
similarity index 100%
rename from crates/backend-uzu/unit/backends/common/kernel/attention/mod.rs
rename to crates/uzu-engine/unit/backends/common/kernel/attention/mod.rs
diff --git a/crates/backend-uzu/unit/backends/common/kernel/attention/sigmoid_gate_test.rs b/crates/uzu-engine/unit/backends/common/kernel/attention/sigmoid_gate_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/attention/sigmoid_gate_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/attention/sigmoid_gate_test.rs
index 1611ae85b..2f3e7c179 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/attention/sigmoid_gate_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/attention/sigmoid_gate_test.rs
@@ -1,8 +1,8 @@
use std::fmt::Debug;
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/embedding/full_precision_embedding_test.rs b/crates/uzu-engine/unit/backends/common/kernel/embedding/full_precision_embedding_test.rs
similarity index 98%
rename from crates/backend-uzu/unit/backends/common/kernel/embedding/full_precision_embedding_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/embedding/full_precision_embedding_test.rs
index bcec30cdb..8d913de64 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/embedding/full_precision_embedding_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/embedding/full_precision_embedding_test.rs
@@ -1,8 +1,8 @@
use std::fmt::Debug;
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/embedding/mod.rs b/crates/uzu-engine/unit/backends/common/kernel/embedding/mod.rs
similarity index 100%
rename from crates/backend-uzu/unit/backends/common/kernel/embedding/mod.rs
rename to crates/uzu-engine/unit/backends/common/kernel/embedding/mod.rs
diff --git a/crates/backend-uzu/unit/backends/common/kernel/embedding/quant_embedding_test.rs b/crates/uzu-engine/unit/backends/common/kernel/embedding/quant_embedding_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/embedding/quant_embedding_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/embedding/quant_embedding_test.rs
index 63eb72d84..c67e6c598 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/embedding/quant_embedding_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/embedding/quant_embedding_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/gated_act_mul_test.rs b/crates/uzu-engine/unit/backends/common/kernel/gated_act_mul_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/gated_act_mul_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/gated_act_mul_test.rs
index 73c170b1e..5ab6a5b23 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/gated_act_mul_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/gated_act_mul_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/gdn/delta_net_test.rs b/crates/uzu-engine/unit/backends/common/kernel/gdn/delta_net_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/gdn/delta_net_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/gdn/delta_net_test.rs
index 824427a7d..acbc0daa0 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/gdn/delta_net_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/gdn/delta_net_test.rs
@@ -1,7 +1,7 @@
#![cfg(backend = "metal")]
-use backend_uzu_macros::uzu_test;
use half::bf16;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/gdn/mod.rs b/crates/uzu-engine/unit/backends/common/kernel/gdn/mod.rs
similarity index 100%
rename from crates/backend-uzu/unit/backends/common/kernel/gdn/mod.rs
rename to crates/uzu-engine/unit/backends/common/kernel/gdn/mod.rs
diff --git a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/conv_scan_test.rs b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/conv_scan_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/conv_scan_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/conv_scan_test.rs
index cd02fe94c..d42c9c5ac 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/conv_scan_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/conv_scan_test.rs
@@ -1,13 +1,13 @@
#[cfg(backend = "metal")]
use std::{mem::size_of, time::Duration};
-#[cfg(backend = "metal")]
-use backend_uzu_macros::uzu_bench;
-use backend_uzu_macros::uzu_test;
#[cfg(backend = "metal")]
use criterion::Criterion;
#[cfg(backend = "metal")]
use half::bf16;
+#[cfg(backend = "metal")]
+use uzu_engine_macros::uzu_bench;
+use uzu_engine_macros::uzu_test;
#[cfg(backend = "metal")]
use crate::{
diff --git a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/gram.md b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/gram.md
similarity index 97%
rename from crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/gram.md
rename to crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/gram.md
index 2fa25709a..37d968de7 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/gram.md
+++ b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/gram.md
@@ -6,8 +6,8 @@ Local reference on M5 Max, `Hg=16 HV=48 K=128`, BF16 inputs, Criterion
Run through the existing `uzu_bench` lib harness:
```bash
-cargo bench -p backend-uzu --lib -- "BuildTreeGram/.*/B1_T64"
-cargo bench -p backend-uzu --lib -- "BuildTreeGram"
+cargo bench -p uzu-engine --lib -- "BuildTreeGram/.*/B1_T64"
+cargo bench -p uzu-engine --lib -- "BuildTreeGram"
```
The current bench uses the repo-standard `iter_encode_loop_named` GPU-time
diff --git a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/mod.rs b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/mod.rs
similarity index 100%
rename from crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/mod.rs
rename to crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/mod.rs
diff --git a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/out_bench.rs b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/out_bench.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/out_bench.rs
rename to crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/out_bench.rs
index de44e09a7..9a6b64456 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/out_bench.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/out_bench.rs
@@ -2,10 +2,10 @@
use std::time::Duration;
-use backend_uzu_macros::uzu_bench;
use criterion::{BenchmarkId, Criterion};
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::uzu_bench;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/out_test.rs b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/out_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/out_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/out_test.rs
index 802ae9ef2..256a1787e 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/out_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/out_test.rs
@@ -1,8 +1,8 @@
#![cfg(backend = "metal")]
-use backend_uzu_macros::uzu_test;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/prefix_bench.rs b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/prefix_bench.rs
similarity index 98%
rename from crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/prefix_bench.rs
rename to crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/prefix_bench.rs
index a07f44b97..d77037895 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/prefix_bench.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/prefix_bench.rs
@@ -2,8 +2,8 @@
use std::mem::size_of;
-use backend_uzu_macros::uzu_bench;
use criterion::{BenchmarkId, Criterion, Throughput};
+use uzu_engine_macros::uzu_bench;
use crate::{
backends::{
diff --git a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/prefix_test.rs b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/prefix_test.rs
similarity index 98%
rename from crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/prefix_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/prefix_test.rs
index 299830528..3288f91ce 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/prefix_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/prefix_test.rs
@@ -1,6 +1,6 @@
#![cfg(backend = "metal")]
-use backend_uzu_macros::uzu_test;
+use uzu_engine_macros::uzu_test;
use crate::{
backends::{
diff --git a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/state_advance_test.rs b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/state_advance_test.rs
similarity index 98%
rename from crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/state_advance_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/state_advance_test.rs
index 786a3a563..58eb71e40 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/state_advance_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/state_advance_test.rs
@@ -1,13 +1,13 @@
#[cfg(backend = "metal")]
use std::time::Duration;
-#[cfg(backend = "metal")]
-use backend_uzu_macros::uzu_bench;
-use backend_uzu_macros::uzu_test;
#[cfg(backend = "metal")]
use criterion::Criterion;
use half::bf16;
use num_traits::Float;
+#[cfg(backend = "metal")]
+use uzu_engine_macros::uzu_bench;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/tree_gram_bench.rs b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/tree_gram_bench.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/tree_gram_bench.rs
rename to crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/tree_gram_bench.rs
index 547c3a581..be3d7eaf0 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/tree_gram_bench.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/tree_gram_bench.rs
@@ -2,9 +2,9 @@
use std::{mem::size_of, time::Duration};
-use backend_uzu_macros::uzu_bench;
use criterion::{BenchmarkId, Criterion};
use half::bf16;
+use uzu_engine_macros::uzu_bench;
use crate::{
backends::{
diff --git a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/tree_gram_test.rs b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/tree_gram_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/tree_gram_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/tree_gram_test.rs
index 3e38a42e7..31cb98683 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/tree_gram_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/tree_gram_test.rs
@@ -1,8 +1,8 @@
#![cfg(backend = "metal")]
-use backend_uzu_macros::uzu_test;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_bench.rs b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_bench.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_bench.rs
rename to crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_bench.rs
index 2ffe54cc8..9df69e40d 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_bench.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_bench.rs
@@ -2,9 +2,9 @@
use std::{mem::size_of, time::Duration};
-use backend_uzu_macros::uzu_bench;
use criterion::{BenchmarkId, Criterion, Throughput};
use half::bf16;
+use uzu_engine_macros::uzu_bench;
use crate::{
backends::{
diff --git a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_test.rs b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_test.rs
index 46d261903..c3d55312d 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/gdn/tree_verify/tree_update_solve_test.rs
@@ -1,7 +1,7 @@
#![cfg(backend = "metal")]
-use backend_uzu_macros::uzu_test;
use half::bf16;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/kv_cache_update_test.rs b/crates/uzu-engine/unit/backends/common/kernel/kv_cache_update_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/kv_cache_update_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/kv_cache_update_test.rs
index f4a000b0c..72d8d047a 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/kv_cache_update_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/kv_cache_update_test.rs
@@ -1,10 +1,10 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
#[cfg(backend = "metal")]
use ndarray::{Array, Array3};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/logit_transform_test.rs b/crates/uzu-engine/unit/backends/common/kernel/logit_transform_test.rs
similarity index 98%
rename from crates/backend-uzu/unit/backends/common/kernel/logit_transform_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/logit_transform_test.rs
index c9a118228..8e196a627 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/logit_transform_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/logit_transform_test.rs
@@ -1,8 +1,8 @@
use std::fmt::Display;
-use backend_uzu_macros::uzu_test;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/matmul/a8w_bench.rs b/crates/uzu-engine/unit/backends/common/kernel/matmul/a8w_bench.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/matmul/a8w_bench.rs
rename to crates/uzu-engine/unit/backends/common/kernel/matmul/a8w_bench.rs
index e2597ab43..2c9d41e0c 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/matmul/a8w_bench.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/matmul/a8w_bench.rs
@@ -2,9 +2,9 @@
use std::time::Duration;
-use backend_uzu_macros::uzu_bench;
use criterion::{BenchmarkId, Criterion, Throughput};
use half::bf16;
+use uzu_engine_macros::uzu_bench;
use crate::{
backends::{
diff --git a/crates/backend-uzu/unit/backends/common/kernel/matmul/dispatch_paths_test.rs b/crates/uzu-engine/unit/backends/common/kernel/matmul/dispatch_paths_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/matmul/dispatch_paths_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/matmul/dispatch_paths_test.rs
index 5ab799ae7..ea357815a 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/matmul/dispatch_paths_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/matmul/dispatch_paths_test.rs
@@ -2,10 +2,10 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::bf16;
use num_traits::Float;
use rstest::rstest;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/matmul/gemm_bench.rs b/crates/uzu-engine/unit/backends/common/kernel/matmul/gemm_bench.rs
similarity index 98%
rename from crates/backend-uzu/unit/backends/common/kernel/matmul/gemm_bench.rs
rename to crates/uzu-engine/unit/backends/common/kernel/matmul/gemm_bench.rs
index 6698b715d..58ef6912b 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/matmul/gemm_bench.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/matmul/gemm_bench.rs
@@ -1,8 +1,8 @@
#![cfg(backend = "metal")]
-use backend_uzu_macros::uzu_bench;
use criterion::{BenchmarkId, Criterion, Throughput};
use half::bf16;
+use uzu_engine_macros::uzu_bench;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/matmul/gemv_test.rs b/crates/uzu-engine/unit/backends/common/kernel/matmul/gemv_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/matmul/gemv_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/matmul/gemv_test.rs
index 4e55255fd..3ffdf8234 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/matmul/gemv_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/matmul/gemv_test.rs
@@ -1,9 +1,9 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::bf16;
use num_traits::Float;
use rstest::rstest;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/matmul/mod.rs b/crates/uzu-engine/unit/backends/common/kernel/matmul/mod.rs
similarity index 100%
rename from crates/backend-uzu/unit/backends/common/kernel/matmul/mod.rs
rename to crates/uzu-engine/unit/backends/common/kernel/matmul/mod.rs
diff --git a/crates/backend-uzu/unit/backends/common/kernel/matmul/quant_dispatch_test.rs b/crates/uzu-engine/unit/backends/common/kernel/matmul/quant_dispatch_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/matmul/quant_dispatch_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/matmul/quant_dispatch_test.rs
index 4ed1ea61d..40e268fd9 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/matmul/quant_dispatch_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/matmul/quant_dispatch_test.rs
@@ -5,10 +5,10 @@ use std::{
fmt::{Debug, Display},
};
-use backend_uzu_macros::uzu_test;
use half::bf16;
use num_traits::Float;
use rstest::rstest;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/matmul/quant_gemm_bench.rs b/crates/uzu-engine/unit/backends/common/kernel/matmul/quant_gemm_bench.rs
similarity index 98%
rename from crates/backend-uzu/unit/backends/common/kernel/matmul/quant_gemm_bench.rs
rename to crates/uzu-engine/unit/backends/common/kernel/matmul/quant_gemm_bench.rs
index 7bf2beb46..e3f463551 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/matmul/quant_gemm_bench.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/matmul/quant_gemm_bench.rs
@@ -1,9 +1,9 @@
#![cfg(backend = "metal")]
-use backend_uzu_macros::uzu_bench;
use criterion::{BenchmarkId, Criterion, Throughput};
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::uzu_bench;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/matmul/quant_gemv_bench.rs b/crates/uzu-engine/unit/backends/common/kernel/matmul/quant_gemv_bench.rs
similarity index 98%
rename from crates/backend-uzu/unit/backends/common/kernel/matmul/quant_gemv_bench.rs
rename to crates/uzu-engine/unit/backends/common/kernel/matmul/quant_gemv_bench.rs
index 3a6ace77d..952c8a713 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/matmul/quant_gemv_bench.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/matmul/quant_gemv_bench.rs
@@ -1,7 +1,7 @@
-use backend_uzu_macros::uzu_bench;
use criterion::{BenchmarkId, Criterion, Throughput};
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::uzu_bench;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/matmul/qwen3_bench.rs b/crates/uzu-engine/unit/backends/common/kernel/matmul/qwen3_bench.rs
similarity index 98%
rename from crates/backend-uzu/unit/backends/common/kernel/matmul/qwen3_bench.rs
rename to crates/uzu-engine/unit/backends/common/kernel/matmul/qwen3_bench.rs
index 740f2aadd..0075a036d 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/matmul/qwen3_bench.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/matmul/qwen3_bench.rs
@@ -1,9 +1,9 @@
#![cfg(backend = "metal")]
-use backend_uzu_macros::uzu_bench;
use criterion::{BenchmarkId, Criterion, Throughput};
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::uzu_bench;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/mod.rs b/crates/uzu-engine/unit/backends/common/kernel/mod.rs
similarity index 100%
rename from crates/backend-uzu/unit/backends/common/kernel/mod.rs
rename to crates/uzu-engine/unit/backends/common/kernel/mod.rs
diff --git a/crates/backend-uzu/unit/backends/common/kernel/moe/mod.rs b/crates/uzu-engine/unit/backends/common/kernel/moe/mod.rs
similarity index 100%
rename from crates/backend-uzu/unit/backends/common/kernel/moe/mod.rs
rename to crates/uzu-engine/unit/backends/common/kernel/moe/mod.rs
diff --git a/crates/backend-uzu/unit/backends/common/kernel/moe/moe_counts_offsets_fused_test.rs b/crates/uzu-engine/unit/backends/common/kernel/moe/moe_counts_offsets_fused_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/moe/moe_counts_offsets_fused_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/moe/moe_counts_offsets_fused_test.rs
index 9844c6853..b82fc8885 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/moe/moe_counts_offsets_fused_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/moe/moe_counts_offsets_fused_test.rs
@@ -1,5 +1,5 @@
-use backend_uzu_macros::uzu_test;
use rand::{RngExt, SeedableRng, rngs::StdRng};
+use uzu_engine_macros::uzu_test;
use crate::{
backends::{
diff --git a/crates/backend-uzu/unit/backends/common/kernel/moe/moe_finalize_test.rs b/crates/uzu-engine/unit/backends/common/kernel/moe/moe_finalize_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/moe/moe_finalize_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/moe/moe_finalize_test.rs
index 6f50d83dd..df7c75efc 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/moe/moe_finalize_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/moe/moe_finalize_test.rs
@@ -1,7 +1,7 @@
-use backend_uzu_macros::uzu_test;
use half::bf16;
use num_traits::Float;
use rand::{RngExt, SeedableRng, rngs::StdRng};
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/moe/moe_router_topk_test.rs b/crates/uzu-engine/unit/backends/common/kernel/moe/moe_router_topk_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/moe/moe_router_topk_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/moe/moe_router_topk_test.rs
index d00fc7ac2..b868aa521 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/moe/moe_router_topk_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/moe/moe_router_topk_test.rs
@@ -1,9 +1,9 @@
use std::fmt::Debug;
-use backend_uzu_macros::uzu_test;
use half::bf16;
use num_traits::Float;
use rand::{RngExt, SeedableRng, rngs::StdRng};
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/normalization_test.rs b/crates/uzu-engine/unit/backends/common/kernel/normalization_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/normalization_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/normalization_test.rs
index 3e15a5b8f..0924e8a94 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/normalization_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/normalization_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/pooling/mod.rs b/crates/uzu-engine/unit/backends/common/kernel/pooling/mod.rs
similarity index 100%
rename from crates/backend-uzu/unit/backends/common/kernel/pooling/mod.rs
rename to crates/uzu-engine/unit/backends/common/kernel/pooling/mod.rs
diff --git a/crates/backend-uzu/unit/backends/common/kernel/pooling/pooling_mean_test.rs b/crates/uzu-engine/unit/backends/common/kernel/pooling/pooling_mean_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/pooling/pooling_mean_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/pooling/pooling_mean_test.rs
index aeaf4d800..0742e22b3 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/pooling/pooling_mean_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/pooling/pooling_mean_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/qkv_norm_test.rs b/crates/uzu-engine/unit/backends/common/kernel/qkv_norm_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/qkv_norm_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/qkv_norm_test.rs
index 23a4a5c0a..b4335f276 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/qkv_norm_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/qkv_norm_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/radix_top_k_small_test.rs b/crates/uzu-engine/unit/backends/common/kernel/radix_top_k_small_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/radix_top_k_small_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/radix_top_k_small_test.rs
index 58249e69c..a03713951 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/radix_top_k_small_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/radix_top_k_small_test.rs
@@ -1,7 +1,7 @@
#[cfg(backend = "metal")]
use std::time::Instant;
-use backend_uzu_macros::uzu_test;
+use uzu_engine_macros::uzu_test;
#[cfg(backend = "metal")]
use crate::backends::metal::Metal;
diff --git a/crates/backend-uzu/unit/backends/common/kernel/short_conv/mod.rs b/crates/uzu-engine/unit/backends/common/kernel/short_conv/mod.rs
similarity index 100%
rename from crates/backend-uzu/unit/backends/common/kernel/short_conv/mod.rs
rename to crates/uzu-engine/unit/backends/common/kernel/short_conv/mod.rs
diff --git a/crates/backend-uzu/unit/backends/common/kernel/short_conv/short_conv_decode_test.rs b/crates/uzu-engine/unit/backends/common/kernel/short_conv/short_conv_decode_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/short_conv/short_conv_decode_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/short_conv/short_conv_decode_test.rs
index 52250750f..db5a77e56 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/short_conv/short_conv_decode_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/short_conv/short_conv_decode_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/short_conv/short_conv_pack_test.rs b/crates/uzu-engine/unit/backends/common/kernel/short_conv/short_conv_pack_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/short_conv/short_conv_pack_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/short_conv/short_conv_pack_test.rs
index 90f27bf53..9d78a57ae 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/short_conv/short_conv_pack_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/short_conv/short_conv_pack_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/short_conv/short_conv_prefill_test.rs b/crates/uzu-engine/unit/backends/common/kernel/short_conv/short_conv_prefill_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/short_conv/short_conv_prefill_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/short_conv/short_conv_prefill_test.rs
index 29832eaf0..d7d4d7793 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/short_conv/short_conv_prefill_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/short_conv/short_conv_prefill_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/short_conv/short_conv_trie_test.rs b/crates/uzu-engine/unit/backends/common/kernel/short_conv/short_conv_trie_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/short_conv/short_conv_trie_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/short_conv/short_conv_trie_test.rs
index 33a26b65e..ffd0834ad 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/short_conv/short_conv_trie_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/short_conv/short_conv_trie_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/ssm/mod.rs b/crates/uzu-engine/unit/backends/common/kernel/ssm/mod.rs
similarity index 100%
rename from crates/backend-uzu/unit/backends/common/kernel/ssm/mod.rs
rename to crates/uzu-engine/unit/backends/common/kernel/ssm/mod.rs
diff --git a/crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_conv1d_decode_test.rs b/crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_conv1d_decode_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_conv1d_decode_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_conv1d_decode_test.rs
index 417c11e39..ce69cd691 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_conv1d_decode_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_conv1d_decode_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_conv1d_pack_test.rs b/crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_conv1d_pack_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_conv1d_pack_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_conv1d_pack_test.rs
index 3dc476169..f12a8b05f 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_conv1d_pack_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_conv1d_pack_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::bf16;
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_conv1d_scan_test.rs b/crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_conv1d_scan_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_conv1d_scan_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_conv1d_scan_test.rs
index c8c2c66ba..ae7e4a1b8 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_conv1d_scan_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_conv1d_scan_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_prefill_test.rs b/crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_prefill_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_prefill_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_prefill_test.rs
index ec02a9577..6f18303ec 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_prefill_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_prefill_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_split_inproj_test.rs b/crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_split_inproj_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_split_inproj_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_split_inproj_test.rs
index dbfff76e2..d4e95323c 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_split_inproj_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_split_inproj_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_update_test.rs b/crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_update_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_update_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_update_test.rs
index 3b39faee8..953ef55e9 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/ssm/ssm_update_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/ssm/ssm_update_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/tensor_add_bias_test.rs b/crates/uzu-engine/unit/backends/common/kernel/tensor_add_bias_test.rs
similarity index 98%
rename from crates/backend-uzu/unit/backends/common/kernel/tensor_add_bias_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/tensor_add_bias_test.rs
index aa70bb3a8..4f9bd0a19 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/tensor_add_bias_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/tensor_add_bias_test.rs
@@ -1,8 +1,8 @@
use std::fmt::Debug;
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/tensor_add_scale_test.rs b/crates/uzu-engine/unit/backends/common/kernel/tensor_add_scale_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/tensor_add_scale_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/tensor_add_scale_test.rs
index 174b450f0..b4c806e06 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/tensor_add_scale_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/tensor_add_scale_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/tensor_add_swap_test.rs b/crates/uzu-engine/unit/backends/common/kernel/tensor_add_swap_test.rs
similarity index 98%
rename from crates/backend-uzu/unit/backends/common/kernel/tensor_add_swap_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/tensor_add_swap_test.rs
index 48b86a017..3b9158310 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/tensor_add_swap_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/tensor_add_swap_test.rs
@@ -1,8 +1,8 @@
use std::fmt::Debug;
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/tensor_copy_test.rs b/crates/uzu-engine/unit/backends/common/kernel/tensor_copy_test.rs
similarity index 98%
rename from crates/backend-uzu/unit/backends/common/kernel/tensor_copy_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/tensor_copy_test.rs
index 049092219..aadc7806b 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/tensor_copy_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/tensor_copy_test.rs
@@ -1,8 +1,8 @@
use std::fmt::Debug;
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/backends/common/kernel/weaver/mod.rs b/crates/uzu-engine/unit/backends/common/kernel/weaver/mod.rs
similarity index 100%
rename from crates/backend-uzu/unit/backends/common/kernel/weaver/mod.rs
rename to crates/uzu-engine/unit/backends/common/kernel/weaver/mod.rs
diff --git a/crates/backend-uzu/unit/backends/common/kernel/weaver/weaver_frontier_test.rs b/crates/uzu-engine/unit/backends/common/kernel/weaver/weaver_frontier_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/common/kernel/weaver/weaver_frontier_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/weaver/weaver_frontier_test.rs
index 66d35e952..4136ebb2c 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/weaver/weaver_frontier_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/weaver/weaver_frontier_test.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_test;
+use uzu_engine_macros::uzu_test;
use crate::{
backends::{
diff --git a/crates/backend-uzu/unit/backends/common/kernel/weaver/weaver_top_children_test.rs b/crates/uzu-engine/unit/backends/common/kernel/weaver/weaver_top_children_test.rs
similarity index 98%
rename from crates/backend-uzu/unit/backends/common/kernel/weaver/weaver_top_children_test.rs
rename to crates/uzu-engine/unit/backends/common/kernel/weaver/weaver_top_children_test.rs
index dd34ab5e3..4ce4a33cd 100644
--- a/crates/backend-uzu/unit/backends/common/kernel/weaver/weaver_top_children_test.rs
+++ b/crates/uzu-engine/unit/backends/common/kernel/weaver/weaver_top_children_test.rs
@@ -1,5 +1,5 @@
-use backend_uzu_macros::uzu_test;
use half::bf16;
+use uzu_engine_macros::uzu_test;
use crate::{
backends::{
diff --git a/crates/backend-uzu/unit/backends/metal/device_profile_test.rs b/crates/uzu-engine/unit/backends/metal/device_profile_test.rs
similarity index 96%
rename from crates/backend-uzu/unit/backends/metal/device_profile_test.rs
rename to crates/uzu-engine/unit/backends/metal/device_profile_test.rs
index 430290674..5f59a9b15 100644
--- a/crates/backend-uzu/unit/backends/metal/device_profile_test.rs
+++ b/crates/uzu-engine/unit/backends/metal/device_profile_test.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_test;
+use uzu_engine_macros::uzu_test;
use super::*;
diff --git a/crates/backend-uzu/unit/backends/metal/kernel/gdn/chunked_test.rs b/crates/uzu-engine/unit/backends/metal/kernel/gdn/chunked_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/metal/kernel/gdn/chunked_test.rs
rename to crates/uzu-engine/unit/backends/metal/kernel/gdn/chunked_test.rs
index 356bd5179..32f7bff87 100644
--- a/crates/backend-uzu/unit/backends/metal/kernel/gdn/chunked_test.rs
+++ b/crates/uzu-engine/unit/backends/metal/kernel/gdn/chunked_test.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::uzu_test;
use half::bf16;
use num_traits::cast;
+use uzu_engine_macros::uzu_test;
use super::*;
use crate::{
diff --git a/crates/backend-uzu/unit/backends/metal/kernel/matmul/gemm/selection_test.rs b/crates/uzu-engine/unit/backends/metal/kernel/matmul/gemm/selection_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/metal/kernel/matmul/gemm/selection_test.rs
rename to crates/uzu-engine/unit/backends/metal/kernel/matmul/gemm/selection_test.rs
index c7262d8da..125aef215 100644
--- a/crates/backend-uzu/unit/backends/metal/kernel/matmul/gemm/selection_test.rs
+++ b/crates/uzu-engine/unit/backends/metal/kernel/matmul/gemm/selection_test.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_test;
+use uzu_engine_macros::uzu_test;
use super::{super::specialization::GemmSpecialization, *};
use crate::backends::{
diff --git a/crates/backend-uzu/unit/backends/metal/kernel/matmul/gemv/policy_test.rs b/crates/uzu-engine/unit/backends/metal/kernel/matmul/gemv/policy_test.rs
similarity index 98%
rename from crates/backend-uzu/unit/backends/metal/kernel/matmul/gemv/policy_test.rs
rename to crates/uzu-engine/unit/backends/metal/kernel/matmul/gemv/policy_test.rs
index 3c0d152cf..9118473c9 100644
--- a/crates/backend-uzu/unit/backends/metal/kernel/matmul/gemv/policy_test.rs
+++ b/crates/uzu-engine/unit/backends/metal/kernel/matmul/gemv/policy_test.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_test;
+use uzu_engine_macros::uzu_test;
use super::*;
use crate::backends::metal::device_profile::DeviceGeneration;
diff --git a/crates/backend-uzu/unit/backends/metal/sparse/sparse_buffer_test.rs b/crates/uzu-engine/unit/backends/metal/sparse/sparse_buffer_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/metal/sparse/sparse_buffer_test.rs
rename to crates/uzu-engine/unit/backends/metal/sparse/sparse_buffer_test.rs
index 6b5cad89d..f4e6feff0 100644
--- a/crates/backend-uzu/unit/backends/metal/sparse/sparse_buffer_test.rs
+++ b/crates/uzu-engine/unit/backends/metal/sparse/sparse_buffer_test.rs
@@ -1,6 +1,6 @@
use std::ops::Range;
-use backend_uzu_macros::uzu_test;
+use uzu_engine_macros::uzu_test;
use crate::{
backends::{
diff --git a/crates/backend-uzu/unit/backends/metal/sparse/sparse_heap_pool_test.rs b/crates/uzu-engine/unit/backends/metal/sparse/sparse_heap_pool_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/backends/metal/sparse/sparse_heap_pool_test.rs
rename to crates/uzu-engine/unit/backends/metal/sparse/sparse_heap_pool_test.rs
index aaf46e0e2..648581ae3 100644
--- a/crates/backend-uzu/unit/backends/metal/sparse/sparse_heap_pool_test.rs
+++ b/crates/uzu-engine/unit/backends/metal/sparse/sparse_heap_pool_test.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_test;
+use uzu_engine_macros::uzu_test;
use crate::{
backends::{
diff --git a/crates/backend-uzu/unit/bench_cold_pool_test.rs b/crates/uzu-engine/unit/bench_cold_pool_test.rs
similarity index 87%
rename from crates/backend-uzu/unit/bench_cold_pool_test.rs
rename to crates/uzu-engine/unit/bench_cold_pool_test.rs
index f9bc1980e..23392bde3 100644
--- a/crates/backend-uzu/unit/bench_cold_pool_test.rs
+++ b/crates/uzu-engine/unit/bench_cold_pool_test.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_test;
+use uzu_engine_macros::uzu_test;
use crate::tests::cold_pool::copy_count;
diff --git a/crates/backend-uzu/unit/common/assert.rs b/crates/uzu-engine/unit/common/assert.rs
similarity index 100%
rename from crates/backend-uzu/unit/common/assert.rs
rename to crates/uzu-engine/unit/common/assert.rs
diff --git a/crates/backend-uzu/unit/common/cold_pool.rs b/crates/uzu-engine/unit/common/cold_pool.rs
similarity index 100%
rename from crates/backend-uzu/unit/common/cold_pool.rs
rename to crates/uzu-engine/unit/common/cold_pool.rs
diff --git a/crates/backend-uzu/unit/common/helpers.rs b/crates/uzu-engine/unit/common/helpers.rs
similarity index 100%
rename from crates/backend-uzu/unit/common/helpers.rs
rename to crates/uzu-engine/unit/common/helpers.rs
diff --git a/crates/backend-uzu/unit/common/matmul/bench.rs b/crates/uzu-engine/unit/common/matmul/bench.rs
similarity index 100%
rename from crates/backend-uzu/unit/common/matmul/bench.rs
rename to crates/uzu-engine/unit/common/matmul/bench.rs
diff --git a/crates/backend-uzu/unit/common/matmul/harness.rs b/crates/uzu-engine/unit/common/matmul/harness.rs
similarity index 100%
rename from crates/backend-uzu/unit/common/matmul/harness.rs
rename to crates/uzu-engine/unit/common/matmul/harness.rs
diff --git a/crates/backend-uzu/unit/common/matmul/mod.rs b/crates/uzu-engine/unit/common/matmul/mod.rs
similarity index 100%
rename from crates/backend-uzu/unit/common/matmul/mod.rs
rename to crates/uzu-engine/unit/common/matmul/mod.rs
diff --git a/crates/backend-uzu/unit/common/matmul/quant.rs b/crates/uzu-engine/unit/common/matmul/quant.rs
similarity index 100%
rename from crates/backend-uzu/unit/common/matmul/quant.rs
rename to crates/uzu-engine/unit/common/matmul/quant.rs
diff --git a/crates/backend-uzu/unit/common/matmul/shape.rs b/crates/uzu-engine/unit/common/matmul/shape.rs
similarity index 100%
rename from crates/backend-uzu/unit/common/matmul/shape.rs
rename to crates/uzu-engine/unit/common/matmul/shape.rs
diff --git a/crates/backend-uzu/unit/common/mod.rs b/crates/uzu-engine/unit/common/mod.rs
similarity index 100%
rename from crates/backend-uzu/unit/common/mod.rs
rename to crates/uzu-engine/unit/common/mod.rs
diff --git a/crates/backend-uzu/unit/common/proptest.rs b/crates/uzu-engine/unit/common/proptest.rs
similarity index 100%
rename from crates/backend-uzu/unit/common/proptest.rs
rename to crates/uzu-engine/unit/common/proptest.rs
diff --git a/crates/backend-uzu/unit/common/util.rs b/crates/uzu-engine/unit/common/util.rs
similarity index 100%
rename from crates/backend-uzu/unit/common/util.rs
rename to crates/uzu-engine/unit/common/util.rs
diff --git a/crates/backend-uzu/unit/encodable_block/attention_gemm_test.rs b/crates/uzu-engine/unit/encodable_block/attention_gemm_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/encodable_block/attention_gemm_test.rs
rename to crates/uzu-engine/unit/encodable_block/attention_gemm_test.rs
index b72cad275..90de7b14f 100644
--- a/crates/backend-uzu/unit/encodable_block/attention_gemm_test.rs
+++ b/crates/uzu-engine/unit/encodable_block/attention_gemm_test.rs
@@ -1,8 +1,8 @@
use std::fmt::{Debug, Display};
-use backend_uzu_macros::uzu_test;
use half::{bf16, f16};
use num_traits::Float;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/encodable_block/attention_test.rs b/crates/uzu-engine/unit/encodable_block/attention_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/encodable_block/attention_test.rs
rename to crates/uzu-engine/unit/encodable_block/attention_test.rs
index 69a616605..7b7624dfa 100644
--- a/crates/backend-uzu/unit/encodable_block/attention_test.rs
+++ b/crates/uzu-engine/unit/encodable_block/attention_test.rs
@@ -1,8 +1,8 @@
#![cfg(backend = "metal")]
-use backend_uzu_macros::uzu_test;
use ndarray::{Array4, s};
use test_tag::tag;
+use uzu_engine_macros::uzu_test;
use crate::{
backends::{
diff --git a/crates/backend-uzu/unit/encodable_block/delta_net_tree_verify_bench.rs b/crates/uzu-engine/unit/encodable_block/delta_net_tree_verify_bench.rs
similarity index 98%
rename from crates/backend-uzu/unit/encodable_block/delta_net_tree_verify_bench.rs
rename to crates/uzu-engine/unit/encodable_block/delta_net_tree_verify_bench.rs
index c4680052a..cd479a9c2 100644
--- a/crates/backend-uzu/unit/encodable_block/delta_net_tree_verify_bench.rs
+++ b/crates/uzu-engine/unit/encodable_block/delta_net_tree_verify_bench.rs
@@ -2,9 +2,9 @@
use std::time::{Duration, Instant};
-use backend_uzu_macros::uzu_bench;
use criterion::Criterion;
use half::bf16;
+use uzu_engine_macros::uzu_bench;
use crate::{
backends::{
diff --git a/crates/backend-uzu/unit/encodable_block/mamba_mixer/ssd_prefill_test.rs b/crates/uzu-engine/unit/encodable_block/mamba_mixer/ssd_prefill_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/encodable_block/mamba_mixer/ssd_prefill_test.rs
rename to crates/uzu-engine/unit/encodable_block/mamba_mixer/ssd_prefill_test.rs
index 22ea23dea..754430e4f 100644
--- a/crates/backend-uzu/unit/encodable_block/mamba_mixer/ssd_prefill_test.rs
+++ b/crates/uzu-engine/unit/encodable_block/mamba_mixer/ssd_prefill_test.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_test;
+use uzu_engine_macros::uzu_test;
use crate::{
backends::common::{
diff --git a/crates/backend-uzu/unit/encodable_block/moe/mod.rs b/crates/uzu-engine/unit/encodable_block/moe/mod.rs
similarity index 100%
rename from crates/backend-uzu/unit/encodable_block/moe/mod.rs
rename to crates/uzu-engine/unit/encodable_block/moe/mod.rs
diff --git a/crates/backend-uzu/unit/encodable_block/moe/moe_block_e2e_test.rs b/crates/uzu-engine/unit/encodable_block/moe/moe_block_e2e_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/encodable_block/moe/moe_block_e2e_test.rs
rename to crates/uzu-engine/unit/encodable_block/moe/moe_block_e2e_test.rs
index 71c8e697a..8f540d37c 100644
--- a/crates/backend-uzu/unit/encodable_block/moe/moe_block_e2e_test.rs
+++ b/crates/uzu-engine/unit/encodable_block/moe/moe_block_e2e_test.rs
@@ -1,6 +1,6 @@
-use backend_uzu_macros::uzu_test;
use half::bf16;
use rand::{RngExt, SeedableRng, rngs::StdRng};
+use uzu_engine_macros::uzu_test;
use super::{MoeExpertsTwoPassArguments, MoeExpertsTwoPassPrefillBlock, MoeGather};
use crate::{
diff --git a/crates/backend-uzu/unit/encodable_block/moe/moe_experts_perf_test.rs b/crates/uzu-engine/unit/encodable_block/moe/moe_experts_perf_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/encodable_block/moe/moe_experts_perf_test.rs
rename to crates/uzu-engine/unit/encodable_block/moe/moe_experts_perf_test.rs
index 4bf17533e..79e04d660 100644
--- a/crates/backend-uzu/unit/encodable_block/moe/moe_experts_perf_test.rs
+++ b/crates/uzu-engine/unit/encodable_block/moe/moe_experts_perf_test.rs
@@ -1,8 +1,8 @@
use std::time::Instant;
-use backend_uzu_macros::uzu_test;
use half::bf16;
use rand::{RngExt, SeedableRng, rngs::StdRng};
+use uzu_engine_macros::uzu_test;
use super::{MoeExpertsTwoPassArguments, MoeExpertsTwoPassDecodeBlock, MoeExpertsTwoPassPrefillBlock};
use crate::{
diff --git a/crates/backend-uzu/unit/encodable_block/moe/moe_experts_test.rs b/crates/uzu-engine/unit/encodable_block/moe/moe_experts_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/encodable_block/moe/moe_experts_test.rs
rename to crates/uzu-engine/unit/encodable_block/moe/moe_experts_test.rs
index f9a1255d7..13af9e5d0 100644
--- a/crates/backend-uzu/unit/encodable_block/moe/moe_experts_test.rs
+++ b/crates/uzu-engine/unit/encodable_block/moe/moe_experts_test.rs
@@ -6,9 +6,9 @@
//! - Intermediate buffer correctness (row maps, tiles, dispatch args)
//! - Numerical correctness against CPU reference
-use backend_uzu_macros::uzu_test;
use half::bf16;
use rand::{RngExt, SeedableRng, rngs::StdRng};
+use uzu_engine_macros::uzu_test;
use super::{
MoeExpertsTwoPassArguments, MoeExpertsTwoPassDecodeBlock, MoeExpertsTwoPassPrefillBlock, cpu_tile_counts,
diff --git a/crates/backend-uzu/unit/encodable_block/moe/moe_gather_test.rs b/crates/uzu-engine/unit/encodable_block/moe/moe_gather_test.rs
similarity index 98%
rename from crates/backend-uzu/unit/encodable_block/moe/moe_gather_test.rs
rename to crates/uzu-engine/unit/encodable_block/moe/moe_gather_test.rs
index e5b8bd6c9..3d454a413 100644
--- a/crates/backend-uzu/unit/encodable_block/moe/moe_gather_test.rs
+++ b/crates/uzu-engine/unit/encodable_block/moe/moe_gather_test.rs
@@ -1,7 +1,7 @@
-use backend_uzu_macros::uzu_test;
use half::bf16;
use num_traits::Float;
use rand::{RngExt, SeedableRng, rngs::StdRng};
+use uzu_engine_macros::uzu_test;
use super::MoeGather;
use crate::{
diff --git a/crates/backend-uzu/unit/encodable_block/moe/moe_perf_test.rs b/crates/uzu-engine/unit/encodable_block/moe/moe_perf_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/encodable_block/moe/moe_perf_test.rs
rename to crates/uzu-engine/unit/encodable_block/moe/moe_perf_test.rs
index e920d6f58..c87133280 100644
--- a/crates/backend-uzu/unit/encodable_block/moe/moe_perf_test.rs
+++ b/crates/uzu-engine/unit/encodable_block/moe/moe_perf_test.rs
@@ -1,7 +1,7 @@
-use backend_uzu_macros::uzu_test;
use half::bf16;
use rand::{RngExt, SeedableRng, rngs::StdRng};
use test_runner::perf::run_perf_with_warmup;
+use uzu_engine_macros::uzu_test;
use super::{MoeExpertsTwoPassArguments, MoeExpertsTwoPassDecodeBlock, MoeGather};
use crate::{
diff --git a/crates/backend-uzu/unit/encodable_block/moe/moe_tiles_test.rs b/crates/uzu-engine/unit/encodable_block/moe/moe_tiles_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/encodable_block/moe/moe_tiles_test.rs
rename to crates/uzu-engine/unit/encodable_block/moe/moe_tiles_test.rs
index 3020ed4d0..689b5e201 100644
--- a/crates/backend-uzu/unit/encodable_block/moe/moe_tiles_test.rs
+++ b/crates/uzu-engine/unit/encodable_block/moe/moe_tiles_test.rs
@@ -1,5 +1,5 @@
-use backend_uzu_macros::uzu_test;
use rand::{RngExt, SeedableRng, rngs::StdRng};
+use uzu_engine_macros::uzu_test;
use crate::{
backends::common::{
diff --git a/crates/backend-uzu/unit/encodable_block/sampling/gumbel_test.rs b/crates/uzu-engine/unit/encodable_block/sampling/gumbel_test.rs
similarity index 92%
rename from crates/backend-uzu/unit/encodable_block/sampling/gumbel_test.rs
rename to crates/uzu-engine/unit/encodable_block/sampling/gumbel_test.rs
index c886983c2..d43a4027c 100644
--- a/crates/backend-uzu/unit/encodable_block/sampling/gumbel_test.rs
+++ b/crates/uzu-engine/unit/encodable_block/sampling/gumbel_test.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_test;
+use uzu_engine_macros::uzu_test;
use super::unit_interval;
diff --git a/crates/backend-uzu/unit/encodable_block/sampling_test.rs b/crates/uzu-engine/unit/encodable_block/sampling_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/encodable_block/sampling_test.rs
rename to crates/uzu-engine/unit/encodable_block/sampling_test.rs
index 99bf05d54..cb3e990b5 100644
--- a/crates/backend-uzu/unit/encodable_block/sampling_test.rs
+++ b/crates/uzu-engine/unit/encodable_block/sampling_test.rs
@@ -1,10 +1,10 @@
use std::{iter::repeat_with, mem::MaybeUninit};
-use backend_uzu_macros::uzu_test;
use num_traits::{Float, NumCast};
use proptest::prelude::*;
use rand::{RngExt, SeedableRng, rngs::SmallRng};
use rand_distr::Normal;
+use uzu_engine_macros::uzu_test;
use crate::{
array::ArrayElement,
diff --git a/crates/backend-uzu/unit/parameters/safetensors_metadata.rs b/crates/uzu-engine/unit/parameters/safetensors_metadata.rs
similarity index 92%
rename from crates/backend-uzu/unit/parameters/safetensors_metadata.rs
rename to crates/uzu-engine/unit/parameters/safetensors_metadata.rs
index e73ec7a9c..361fc53b5 100644
--- a/crates/backend-uzu/unit/parameters/safetensors_metadata.rs
+++ b/crates/uzu-engine/unit/parameters/safetensors_metadata.rs
@@ -1,7 +1,7 @@
use std::fs::File;
-use backend_uzu_macros::uzu_test;
use test_runner::path::get_test_weights_path;
+use uzu_engine_macros::uzu_test;
use crate::parameters::safetensors_metadata::read_metadata;
diff --git a/crates/backend-uzu/unit/session/model_loading_bench.rs b/crates/uzu-engine/unit/session/model_loading_bench.rs
similarity index 96%
rename from crates/backend-uzu/unit/session/model_loading_bench.rs
rename to crates/uzu-engine/unit/session/model_loading_bench.rs
index 048898436..925a439dc 100644
--- a/crates/backend-uzu/unit/session/model_loading_bench.rs
+++ b/crates/uzu-engine/unit/session/model_loading_bench.rs
@@ -1,8 +1,8 @@
use std::time::Duration;
-use backend_uzu_macros::uzu_bench;
use criterion::{BenchmarkId, Criterion};
use test_runner::path::get_test_model_path;
+use uzu_engine_macros::uzu_bench;
use crate::{engine::Engine, tests::helpers::for_each_non_cpu_backend};
diff --git a/crates/backend-uzu/unit/trie_test.rs b/crates/uzu-engine/unit/trie_test.rs
similarity index 99%
rename from crates/backend-uzu/unit/trie_test.rs
rename to crates/uzu-engine/unit/trie_test.rs
index 83241f872..cc35cff46 100644
--- a/crates/backend-uzu/unit/trie_test.rs
+++ b/crates/uzu-engine/unit/trie_test.rs
@@ -1,4 +1,4 @@
-use backend_uzu_macros::uzu_test;
+use uzu_engine_macros::uzu_test;
use crate::{encodable_block::sampling::PRng, trie::TrieNode};
diff --git a/scripts/check-rustfmt-discovery.sh b/scripts/check-rustfmt-discovery.sh
index 603f7ddde..ff01e3b73 100755
--- a/scripts/check-rustfmt-discovery.sh
+++ b/scripts/check-rustfmt-discovery.sh
@@ -4,8 +4,8 @@ set -euo pipefail
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)"
cd "$ROOT_DIR"
-PACKAGE="backend-uzu"
-CRATE_DIR="crates/backend-uzu"
+PACKAGE="uzu-engine"
+CRATE_DIR="crates/uzu-engine"
normalize_paths() {
perl -MCwd=abs_path -ne 'chomp; my $path = abs_path($_); print "$path\n" if defined $path'
diff --git a/tools/downloader/main.py b/tools/downloader/main.py
index c960f64cb..887703434 100644
--- a/tools/downloader/main.py
+++ b/tools/downloader/main.py
@@ -38,7 +38,7 @@ from .utils import download_file_with_resume
ROOT_PATH = Path(__file__).parent.parent.parent
CARGO_TOML_PATH = ROOT_PATH / "Cargo.toml"
-TOOLCHAIN_VERSION_PATH = ROOT_PATH / "crates" / "backend-uzu" / "src" / "utils" / "version.rs"
+TOOLCHAIN_VERSION_PATH = ROOT_PATH / "crates" / "uzu-engine" / "src" / "utils" / "version.rs"
WORKSPACE_PATH = ROOT_PATH / "workspace"
MODELS_PATH = WORKSPACE_PATH / "models"
MIRAI_API_URL = "https://sdk.trymirai.com/api/v1/fetch/models"