A high-performance inference engine for AI models
Rename dsl crate to proc-macros (because it's not just dsl now) (#421)
uuuvnb0ecbc10382f
diff --git a/Cargo.lock b/Cargo.lockindex 6d6d0b02b..4a5ffdf8d 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -569,7 +569,6 @@ dependencies = ["criterion-macro","depfile","derive_more",- "dsl","futures","half","indicatif",@@ -587,6 +586,7 @@ dependencies = ["objc2-foundation","prettyplease","proc-macro2",+ "proc-macros","proptest","quote","rand 0.10.1",@@ -1954,15 +1954,6 @@ dependencies = ["wiremock",]-[[package]]-name = "dsl"-version = "0.4.9"-dependencies = [- "proc-macro2",- "quote",- "syn 2.0.117",-]-[[package]]name = "dunce"version = "1.0.5"@@ -4818,6 +4809,15 @@ dependencies = ["unicode-ident",]+[[package]]+name = "proc-macros"+version = "0.4.9"+dependencies = [+ "proc-macro2",+ "quote",+ "syn 2.0.117",+]+[[package]]name = "profiling"version = "1.0.18"diff --git a/Cargo.toml b/Cargo.tomlindex 5c58dd115..100440f49 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -1,6 +1,6 @@[workspace]members = [- "crates/dsl",+ "crates/proc-macros","crates/bindings-types","crates/bindings","crates/shoji",@@ -42,7 +42,7 @@ keywords = [][workspace.dependencies]-dsl = { path = "crates/dsl" }+proc-macros = { path = "crates/proc-macros" }bindings-types = { path = "crates/bindings-types", default-features = false }bindings = { path = "crates/bindings", default-features = false }shoji = { path = "crates/shoji", default-features = false }diff --git a/crates/backend-uzu/Cargo.toml b/crates/backend-uzu/Cargo.tomlindex 4311f487b..02624b631 100644--- a/crates/backend-uzu/Cargo.toml+++ b/crates/backend-uzu/Cargo.toml@@ -10,7 +10,7 @@ license.workspace = truebuild = "build/main.rs"[dependencies]-dsl.workspace = true+proc-macros.workspace = trueshoji.workspace = truehalf.workspace = truendarray.workspace = truediff --git a/crates/backend-uzu/src/backends/cpu/kernel/activation/activation.rs b/crates/backend-uzu/src/backends/cpu/kernel/activation/activation.rsindex 58faee590..efaea4e00 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/activation/activation.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/activation/activation.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_fallback.rs b/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_fallback.rsindex bbb825465..755f5fe15 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_fallback.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_fallback.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement,diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_gemm.rs b/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_gemm.rsindex d7c096481..a6c599203 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_gemm.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_gemm.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement,diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_single_pass.rs b/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_single_pass.rsindex 90282d1e9..bf9af43be 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_single_pass.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_single_pass.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement,diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_two_pass.rs b/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_two_pass.rsindex da4a7695f..8ca28bf61 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_two_pass.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_two_pass.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement,diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_update_kv_cache.rs b/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_update_kv_cache.rsindex 1af3bc33f..dfd77951b 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_update_kv_cache.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/attention/attention_update_kv_cache.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/qk_unpack.rs b/crates/backend-uzu/src/backends/cpu/kernel/attention/qk_unpack.rsindex a37b04f85..4f92449ac 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/attention/qk_unpack.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/attention/qk_unpack.rs@@ -1,5 +1,5 @@-use dsl::kernel;use half::{bf16, f16};+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/attention/sigmoid_gate.rs b/crates/backend-uzu/src/backends/cpu/kernel/attention/sigmoid_gate.rsindex 6f5c8e49b..79fadf244 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/attention/sigmoid_gate.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/attention/sigmoid_gate.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/audio/add.rs b/crates/backend-uzu/src/backends/cpu/kernel/audio/add.rsindex 7e711eb22..fb7833ad2 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/audio/add.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/audio/add.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv1d.rs b/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv1d.rsindex a7725f357..1b82960d9 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv1d.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv1d.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv1d_grouped.rs b/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv1d_grouped.rsindex 26c6c521f..3826087ef 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv1d_grouped.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv1d_grouped.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv1d_grouped_residual.rs b/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv1d_grouped_residual.rsindex cc247a183..ce2f0961c 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv1d_grouped_residual.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv1d_grouped_residual.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv_transpose1d.rs b/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv_transpose1d.rsindex e143dc71b..020943040 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv_transpose1d.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv_transpose1d.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv_transpose1d_causal_pad.rs b/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv_transpose1d_causal_pad.rsindex d9f33326b..ff4fc8a1c 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv_transpose1d_causal_pad.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/audio/causal_conv_transpose1d_causal_pad.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/audio/conv1d.rs b/crates/backend-uzu/src/backends/cpu/kernel/audio/conv1d.rsindex 5096e3994..4a3b885ea 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/audio/conv1d.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/audio/conv1d.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/audio/fsq_decode.rs b/crates/backend-uzu/src/backends/cpu/kernel/audio/fsq_decode.rsindex 8da21f019..a68f7d048 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/audio/fsq_decode.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/audio/fsq_decode.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/audio/fsq_encode.rs b/crates/backend-uzu/src/backends/cpu/kernel/audio/fsq_encode.rsindex 580cabc38..d88bf11a2 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/audio/fsq_encode.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/audio/fsq_encode.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/audio/half_snake.rs b/crates/backend-uzu/src/backends/cpu/kernel/audio/half_snake.rsindex d3aaeace0..e016694dd 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/audio/half_snake.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/audio/half_snake.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/audio/norm_ncs.rs b/crates/backend-uzu/src/backends/cpu/kernel/audio/norm_ncs.rsindex 9830f981b..45bd5ca2c 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/audio/norm_ncs.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/audio/norm_ncs.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/audio/quantizer_decode.rs b/crates/backend-uzu/src/backends/cpu/kernel/audio/quantizer_decode.rsindex 7bb16000e..5a666e771 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/audio/quantizer_decode.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/audio/quantizer_decode.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/delta_net/conv_scan.rs b/crates/backend-uzu/src/backends/cpu/kernel/delta_net/conv_scan.rsindex 6dfde8ba1..492efe81d 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/delta_net/conv_scan.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/delta_net/conv_scan.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement, backends::common::gpu_types::ActivationType};diff --git a/crates/backend-uzu/src/backends/cpu/kernel/delta_net/conv_update.rs b/crates/backend-uzu/src/backends/cpu/kernel/delta_net/conv_update.rsindex a4cb8313d..628a11c74 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/delta_net/conv_update.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/delta_net/conv_update.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement, backends::common::gpu_types::ActivationType};diff --git a/crates/backend-uzu/src/backends/cpu/kernel/delta_net/norm_gate.rs b/crates/backend-uzu/src/backends/cpu/kernel/delta_net/norm_gate.rsindex 6edf80099..34916fae7 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/delta_net/norm_gate.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/delta_net/norm_gate.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement, backends::common::gpu_types::ActivationType};diff --git a/crates/backend-uzu/src/backends/cpu/kernel/delta_net/prefill.rs b/crates/backend-uzu/src/backends/cpu/kernel/delta_net/prefill.rsindex a3fed8274..249c8600c 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/delta_net/prefill.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/delta_net/prefill.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/delta_net/prefill_prep.rs b/crates/backend-uzu/src/backends/cpu/kernel/delta_net/prefill_prep.rsindex a05fcf911..e835864a5 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/delta_net/prefill_prep.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/delta_net/prefill_prep.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/delta_net/update.rs b/crates/backend-uzu/src/backends/cpu/kernel/delta_net/update.rsindex 87b070023..94953705d 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/delta_net/update.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/delta_net/update.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement, backends::common::gpu_types::ActivationType};diff --git a/crates/backend-uzu/src/backends/cpu/kernel/embedding/embedding_rows_sum.rs b/crates/backend-uzu/src/backends/cpu/kernel/embedding/embedding_rows_sum.rsindex 24c7db766..5b5fc4f62 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/embedding/embedding_rows_sum.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/embedding/embedding_rows_sum.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/embedding/full_precision_embedding.rs b/crates/backend-uzu/src/backends/cpu/kernel/embedding/full_precision_embedding.rsindex 9bbde8d67..48880c404 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/embedding/full_precision_embedding.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/embedding/full_precision_embedding.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/embedding/quant_embedding.rs b/crates/backend-uzu/src/backends/cpu/kernel/embedding/quant_embedding.rsindex 363d9f644..44be4fa5e 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/embedding/quant_embedding.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/embedding/quant_embedding.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement, backends::common::gpu_types::QuantizationMode};diff --git a/crates/backend-uzu/src/backends/cpu/kernel/hadamard_transform/hadamard_transform.rs b/crates/backend-uzu/src/backends/cpu/kernel/hadamard_transform/hadamard_transform.rsindex 3343c848a..53a0f82d1 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/hadamard_transform/hadamard_transform.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/hadamard_transform/hadamard_transform.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/kv_cache_update/kv_cache_update.rs b/crates/backend-uzu/src/backends/cpu/kernel/kv_cache_update/kv_cache_update.rsindex c09dbe2e8..1c8bf2d5c 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/kv_cache_update/kv_cache_update.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/kv_cache_update/kv_cache_update.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/layer_norm/layer_norm.rs b/crates/backend-uzu/src/backends/cpu/kernel/layer_norm/layer_norm.rsindex 79bd8a719..42ff0638c 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/layer_norm/layer_norm.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/layer_norm/layer_norm.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/mlp/activation_mul.rs b/crates/backend-uzu/src/backends/cpu/kernel/mlp/activation_mul.rsindex 51c8609bf..b24331f07 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/mlp/activation_mul.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/mlp/activation_mul.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/counts_offsets_fused.rs b/crates/backend-uzu/src/backends/cpu/kernel/moe/counts_offsets_fused.rsindex 0a4813592..a4b4de032 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/counts_offsets_fused.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/moe/counts_offsets_fused.rs@@ -1,5 +1,5 @@-use dsl::kernel;use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/experts_single.rs b/crates/backend-uzu/src/backends/cpu/kernel/moe/experts_single.rsindex ba0b2ebf3..40948e2f9 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/experts_single.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/moe/experts_single.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement,diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/experts_two_pass_decode.rs b/crates/backend-uzu/src/backends/cpu/kernel/moe/experts_two_pass_decode.rsindex 86563243f..7774496cd 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/experts_two_pass_decode.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/moe/experts_two_pass_decode.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/experts_two_pass_prefill.rs b/crates/backend-uzu/src/backends/cpu/kernel/moe/experts_two_pass_prefill.rsindex 119f4d585..c0354676e 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/experts_two_pass_prefill.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/moe/experts_two_pass_prefill.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/finalize.rs b/crates/backend-uzu/src/backends/cpu/kernel/moe/finalize.rsindex 67c86075d..576b38624 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/finalize.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/moe/finalize.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/gather.rs b/crates/backend-uzu/src/backends/cpu/kernel/moe/gather.rsindex 072a60458..658c1116c 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/gather.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/moe/gather.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/router_topk.rs b/crates/backend-uzu/src/backends/cpu/kernel/moe/router_topk.rsindex 3edc92556..2072a4780 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/router_topk.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/moe/router_topk.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/scatter_buckets.rs b/crates/backend-uzu/src/backends/cpu/kernel/moe/scatter_buckets.rsindex e0b521345..7942c6a14 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/scatter_buckets.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/moe/scatter_buckets.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/tiles_map.rs b/crates/backend-uzu/src/backends/cpu/kernel/moe/tiles_map.rsindex 2314c6cbb..a4ba8bf14 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/tiles_map.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/moe/tiles_map.rs@@ -1,5 +1,5 @@-use dsl::kernel;use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/moe/tiles_pass_a.rs b/crates/backend-uzu/src/backends/cpu/kernel/moe/tiles_pass_a.rsindex 7a165441c..3038f43da 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/moe/tiles_pass_a.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/moe/tiles_pass_a.rs@@ -1,5 +1,5 @@-use dsl::kernel;use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/pooling/pooling.rs b/crates/backend-uzu/src/backends/cpu/kernel/pooling/pooling.rsindex 90191d6c9..96cab05cd 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/pooling/pooling.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/pooling/pooling.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::{Float, ToPrimitive};+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/quant_matmul/qmm_transposed.rs b/crates/backend-uzu/src/backends/cpu/kernel/quant_matmul/qmm_transposed.rsindex 1f6b51b55..1c7e730cb 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/quant_matmul/qmm_transposed.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/quant_matmul/qmm_transposed.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement, backends::common::gpu_types::QuantizationMethod};diff --git a/crates/backend-uzu/src/backends/cpu/kernel/quant_matmul/qmv.rs b/crates/backend-uzu/src/backends/cpu/kernel/quant_matmul/qmv.rsindex a638e8d98..63b3cf00b 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/quant_matmul/qmv.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/quant_matmul/qmv.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement, backends::common::gpu_types::QuantizationMethod};diff --git a/crates/backend-uzu/src/backends/cpu/kernel/quant_matmul/qmv_fast.rs b/crates/backend-uzu/src/backends/cpu/kernel/quant_matmul/qmv_fast.rsindex ec1802fc5..da39ebe32 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/quant_matmul/qmv_fast.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/quant_matmul/qmv_fast.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement,diff --git a/crates/backend-uzu/src/backends/cpu/kernel/rms_norm/qk_norm.rs b/crates/backend-uzu/src/backends/cpu/kernel/rms_norm/qk_norm.rsindex 6d8ad04cc..2aa7d3354 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/rms_norm/qk_norm.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/rms_norm/qk_norm.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/rms_norm/rms_norm.rs b/crates/backend-uzu/src/backends/cpu/kernel/rms_norm/rms_norm.rsindex db26073fa..c60ed2065 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/rms_norm/rms_norm.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/rms_norm/rms_norm.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::{Float, ToPrimitive};+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/rope/rope.rs b/crates/backend-uzu/src/backends/cpu/kernel/rope/rope.rsindex 3603a5307..a57068d9f 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/rope/rope.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/rope/rope.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/sampling/argmax.rs b/crates/backend-uzu/src/backends/cpu/kernel/sampling/argmax.rsindex 014896016..51c8f77e0 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/sampling/argmax.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/sampling/argmax.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement, backends::common::gpu_types::argmax::ArgmaxPair};diff --git a/crates/backend-uzu/src/backends/cpu/kernel/sampling/bitmask.rs b/crates/backend-uzu/src/backends/cpu/kernel/sampling/bitmask.rsindex 4fac35672..ba22a3604 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/sampling/bitmask.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/sampling/bitmask.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/sampling/gumbel.rs b/crates/backend-uzu/src/backends/cpu/kernel/sampling/gumbel.rsindex 3e7c6ac12..8ad168559 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/sampling/gumbel.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/sampling/gumbel.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement,diff --git a/crates/backend-uzu/src/backends/cpu/kernel/sampling/min_p.rs b/crates/backend-uzu/src/backends/cpu/kernel/sampling/min_p.rsindex 71af24405..bfe1f056d 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/sampling/min_p.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/sampling/min_p.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/sampling/temperature.rs b/crates/backend-uzu/src/backends/cpu/kernel/sampling/temperature.rsindex f27f3c96b..151c23d50 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/sampling/temperature.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/sampling/temperature.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/sampling/top_k.rs b/crates/backend-uzu/src/backends/cpu/kernel/sampling/top_k.rsindex 56b0e42d3..40ccee4ae 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/sampling/top_k.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/sampling/top_k.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/sampling/top_p.rs b/crates/backend-uzu/src/backends/cpu/kernel/sampling/top_p.rsindex 578333047..ffc7105fd 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/sampling/top_p.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/sampling/top_p.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/short_conv/short_conv.rs b/crates/backend-uzu/src/backends/cpu/kernel/short_conv/short_conv.rsindex 72468147b..bfb44acd5 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/short_conv/short_conv.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/short_conv/short_conv.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::{Float, ToPrimitive};+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/softmax/softmax.rs b/crates/backend-uzu/src/backends/cpu/kernel/softmax/softmax.rsindex 3399ddf5e..0d3947ddc 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/softmax/softmax.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/softmax/softmax.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/ssm/conv1d.rs b/crates/backend-uzu/src/backends/cpu/kernel/ssm/conv1d.rsindex 1fb06b66d..0b46e3951 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/ssm/conv1d.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/ssm/conv1d.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/ssm/split_inproj.rs b/crates/backend-uzu/src/backends/cpu/kernel/ssm/split_inproj.rsindex 8df79081c..028c0cd85 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/ssm/split_inproj.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/ssm/split_inproj.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/ssm/ssd_prefill.rs b/crates/backend-uzu/src/backends/cpu/kernel/ssm/ssd_prefill.rsindex 674720e35..24602d4e3 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/ssm/ssd_prefill.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/ssm/ssd_prefill.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement, backends::common::gpu_types::ActivationType};diff --git a/crates/backend-uzu/src/backends/cpu/kernel/ssm/ssd_update.rs b/crates/backend-uzu/src/backends/cpu/kernel/ssm/ssd_update.rsindex e4db4967f..8304628d3 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/ssm/ssd_update.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/ssm/ssd_update.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::{ArrayElement, backends::common::gpu_types::ActivationType};diff --git a/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_bias/tensor_add_bias.rs b/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_bias/tensor_add_bias.rsindex 6a590fc17..bc37cff7d 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_bias/tensor_add_bias.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_bias/tensor_add_bias.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_scale/tensor_add_scale.rs b/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_scale/tensor_add_scale.rsindex f61c5f917..774fbff45 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_scale/tensor_add_scale.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_scale/tensor_add_scale.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_swap/tensor_add_swap.rs b/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_swap/tensor_add_swap.rsindex 6f4e1e371..29b730164 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_swap/tensor_add_swap.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/tensor_add_swap/tensor_add_swap.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/tensor_copy/tensor_copy.rs b/crates/backend-uzu/src/backends/cpu/kernel/tensor_copy/tensor_copy.rsindex 1459b590d..de80f6ad7 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/tensor_copy/tensor_copy.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/tensor_copy/tensor_copy.rs@@ -1,6 +1,6 @@-use dsl::kernel;use half::{bf16, f16};use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/src/backends/cpu/kernel/token_copy/token_copy.rs b/crates/backend-uzu/src/backends/cpu/kernel/token_copy/token_copy.rsindex f97649550..b83c1b24c 100644--- a/crates/backend-uzu/src/backends/cpu/kernel/token_copy/token_copy.rs+++ b/crates/backend-uzu/src/backends/cpu/kernel/token_copy/token_copy.rs@@ -1,5 +1,5 @@-use dsl::kernel;use num_traits::Float;+use proc_macros::kernel;use crate::ArrayElement;diff --git a/crates/backend-uzu/tests/unit/kernel/bench_entry.rs b/crates/backend-uzu/tests/unit/kernel/bench_entry.rsindex 553a549c7..dff5cf777 100644--- a/crates/backend-uzu/tests/unit/kernel/bench_entry.rs+++ b/crates/backend-uzu/tests/unit/kernel/bench_entry.rs@@ -17,6 +17,6 @@ fn bench_runner(benches: &[&dyn Fn()]) {criterion::runner(benches);}-use dsl::{__internal_uzu_bench as uzu_bench, __internal_uzu_ignored as uzu_test};+use proc_macros::{__internal_uzu_bench as uzu_bench, __internal_uzu_ignored as uzu_test};include!("mod.rs");diff --git a/crates/backend-uzu/tests/unit/kernel/test_entry.rs b/crates/backend-uzu/tests/unit/kernel/test_entry.rsindex 104ea63cb..66881e54b 100644--- a/crates/backend-uzu/tests/unit/kernel/test_entry.rs+++ b/crates/backend-uzu/tests/unit/kernel/test_entry.rs@@ -1,3 +1,3 @@-use dsl::{__internal_uzu_ignored as uzu_bench, __internal_uzu_test as uzu_test};+use proc_macros::{__internal_uzu_ignored as uzu_bench, __internal_uzu_test as uzu_test};include!("mod.rs");diff --git a/crates/dsl/Cargo.toml b/crates/proc-macros/Cargo.tomlsimilarity index 93%rename from crates/dsl/Cargo.tomlrename to crates/proc-macros/Cargo.tomlindex 2e20071b6..caac6ed98 100644--- a/crates/dsl/Cargo.toml+++ b/crates/proc-macros/Cargo.toml@@ -1,5 +1,5 @@[package]-name = "dsl"+name = "proc-macros"edition.workspace = truerust-version.workspace = trueversion.workspace = truediff --git a/crates/dsl/src/lib.rs b/crates/proc-macros/src/dsl.rssimilarity index 50%rename from crates/dsl/src/lib.rsrename to crates/proc-macros/src/dsl.rsindex 73678c534..d405182d1 100644--- a/crates/dsl/src/lib.rs+++ b/crates/proc-macros/src/dsl.rs@@ -2,7 +2,6 @@ use proc_macro::TokenStream;use quote::quote;use syn::{FnArg, ItemFn, parse_macro_input};-#[proc_macro_attribute]pub fn kernel(args: TokenStream,input: TokenStream,@@ -28,45 +27,3 @@ pub fn kernel(}.into()}--#[proc_macro_attribute]-pub fn __internal_uzu_test(- _args: TokenStream,- input: TokenStream,-) -> TokenStream {- let func = parse_macro_input!(input as ItemFn);-- quote! {- #[test]- #func- }- .into()-}--#[proc_macro_attribute]-pub fn __internal_uzu_bench(- _args: TokenStream,- input: TokenStream,-) -> TokenStream {- let func = parse_macro_input!(input as ItemFn);-- quote! {- #[::criterion_macro::criterion]- #func- }- .into()-}--#[proc_macro_attribute]-pub fn __internal_uzu_ignored(- _args: TokenStream,- input: TokenStream,-) -> TokenStream {- let func = parse_macro_input!(input as ItemFn);-- quote! {- #[allow(unused)]- #func- }- .into()-}diff --git a/crates/proc-macros/src/lib.rs b/crates/proc-macros/src/lib.rsnew file mode 100644index 000000000..c707171f2--- /dev/null+++ b/crates/proc-macros/src/lib.rs@@ -0,0 +1,36 @@+mod dsl;+mod uzu_test;++use proc_macro::TokenStream;++#[proc_macro_attribute]+pub fn kernel(+ args: TokenStream,+ input: TokenStream,+) -> TokenStream {+ dsl::kernel(args, input)+}++#[proc_macro_attribute]+pub fn __internal_uzu_test(+ args: TokenStream,+ input: TokenStream,+) -> TokenStream {+ uzu_test::__internal_uzu_test(args, input)+}++#[proc_macro_attribute]+pub fn __internal_uzu_bench(+ args: TokenStream,+ input: TokenStream,+) -> TokenStream {+ uzu_test::__internal_uzu_bench(args, input)+}++#[proc_macro_attribute]+pub fn __internal_uzu_ignored(+ args: TokenStream,+ input: TokenStream,+) -> TokenStream {+ uzu_test::__internal_uzu_ignored(args, input)+}diff --git a/crates/proc-macros/src/strict_serde.rs b/crates/proc-macros/src/strict_serde.rsnew file mode 100644index 000000000..8b1378917--- /dev/null+++ b/crates/proc-macros/src/strict_serde.rs@@ -0,0 +1 @@+diff --git a/crates/proc-macros/src/uzu_test.rs b/crates/proc-macros/src/uzu_test.rsnew file mode 100644index 000000000..d07d58741--- /dev/null+++ b/crates/proc-macros/src/uzu_test.rs@@ -0,0 +1,42 @@+use proc_macro::TokenStream;+use quote::quote;+use syn::{ItemFn, parse_macro_input};++pub fn __internal_uzu_test(+ _args: TokenStream,+ input: TokenStream,+) -> TokenStream {+ let func = parse_macro_input!(input as ItemFn);++ quote! {+ #[test]+ #func+ }+ .into()+}++pub fn __internal_uzu_bench(+ _args: TokenStream,+ input: TokenStream,+) -> TokenStream {+ let func = parse_macro_input!(input as ItemFn);++ quote! {+ #[::criterion_macro::criterion]+ #func+ }+ .into()+}++pub fn __internal_uzu_ignored(+ _args: TokenStream,+ input: TokenStream,+) -> TokenStream {+ let func = parse_macro_input!(input as ItemFn);++ quote! {+ #[allow(unused)]+ #func+ }+ .into()+}