Skip to content

armgit / uzu

Public Imported from GitHub
0

A high-performance inference engine for AI models

Small backend cleanup (#885)

uuuvn9371aefcc38e
diff --git a/crates/uzu-engine/Cargo.toml b/crates/uzu-engine/Cargo.toml
index 4c0133843..56ec4b73e 100644
--- a/crates/uzu-engine/Cargo.toml
+++ b/crates/uzu-engine/Cargo.toml
@@ -56,7 +56,7 @@ xxhash-rust = { workspace = true, features = ["xxh3"], optional = true }
[dependencies]
uzu-engine-macros.workspace = true
bitflags.workspace = true
-derive_more.workspace = true
+derive_more = { workspace = true, features = ["debug"] }
shoji.workspace = true
half.workspace = true
serde.workspace = true
diff --git a/crates/uzu-engine/src/backends/common/backend.rs b/crates/uzu-engine/src/backends/common/backend.rs
index 6bb45917e..6ce7985d3 100644
--- a/crates/uzu-engine/src/backends/common/backend.rs
+++ b/crates/uzu-engine/src/backends/common/backend.rs
@@ -1,8 +1,8 @@
-use std::{error::Error, fmt::Debug};
+use std::error::Error;
use super::{CommandBuffer, ConstantBuffer, Context, GlobalBuffer, Kernels, ScratchBuffer, SparseBuffer};
-pub trait Backend: Debug + Clone + Send + Sync + 'static {
+pub trait Backend: Clone + Send + Sync + 'static {
type Context: Context<Backend = Self>;
type CommandBuffer: CommandBuffer<Backend = Self>;
type GlobalBuffer: GlobalBuffer<Backend = Self>;
@@ -11,7 +11,7 @@ pub trait Backend: Debug + Clone + Send + Sync + 'static {
type SparseBuffer: SparseBuffer<Backend = Self>;
type AllocationPool: Send + Sync;
type Kernels: Kernels<Backend = Self>;
- type Error: Error + Debug;
+ type Error: Error;
const NAME: &'static str;
}
diff --git a/crates/uzu-engine/src/backends/common/buffer/mod.rs b/crates/uzu-engine/src/backends/common/buffer/mod.rs
index afcadb840..7a2515a5e 100644
--- a/crates/uzu-engine/src/backends/common/buffer/mod.rs
+++ b/crates/uzu-engine/src/backends/common/buffer/mod.rs
@@ -1,4 +1,4 @@
-use std::{any::Any, fmt::Debug, range::Range};
+use std::{any::Any, range::Range};
use crate::backends::common::{Backend, BufferMut, BufferRef};
@@ -10,7 +10,7 @@ pub mod sparse;
pub mod reference;
-pub trait Buffer: Any + Debug + Send + Sync + Unpin {
+pub trait Buffer: Any + Send + Sync + Unpin {
type Backend: Backend;
fn size(&self) -> usize;
diff --git a/crates/uzu-engine/src/backends/common/kernel/matmul/error.rs b/crates/uzu-engine/src/backends/common/kernel/matmul/error.rs
index 96be2b02a..808aaf441 100644
--- a/crates/uzu-engine/src/backends/common/kernel/matmul/error.rs
+++ b/crates/uzu-engine/src/backends/common/kernel/matmul/error.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/backends/cpu/buffer/constant.rs b/crates/uzu-engine/src/backends/cpu/buffer/constant.rs
index f91ead2f3..cd27a4c89 100644
--- a/crates/uzu-engine/src/backends/cpu/buffer/constant.rs
+++ b/crates/uzu-engine/src/backends/cpu/buffer/constant.rs
@@ -1,4 +1,4 @@
-use std::{fmt::Debug, os::raw::c_void, ptr::NonNull};
+use std::{os::raw::c_void, ptr::NonNull};
use crate::backends::{
common::{Backend, Buffer, BufferCpuAccessible, ConstantBuffer, allocator::bump::BumpAllocation},
@@ -20,15 +20,3 @@ impl BufferCpuAccessible for BumpAllocation<<Cpu as Backend>::GlobalBuffer> {
}
impl ConstantBuffer for BumpAllocation<<Cpu as Backend>::GlobalBuffer> {}
-
-impl Debug for BumpAllocation<<Cpu as Backend>::GlobalBuffer> {
- fn fmt(
- &self,
- f: &mut std::fmt::Formatter<'_>,
- ) -> std::fmt::Result {
- f.debug_struct("BumpAllocation<Cpu::GlobalBuffer>")
- .field("page", &self.page())
- .field("range", &self.range())
- .finish_non_exhaustive()
- }
-}
diff --git a/crates/uzu-engine/src/backends/cpu/buffer/scratch.rs b/crates/uzu-engine/src/backends/cpu/buffer/scratch.rs
index 1592d6391..c44f8b96d 100644
--- a/crates/uzu-engine/src/backends/cpu/buffer/scratch.rs
+++ b/crates/uzu-engine/src/backends/cpu/buffer/scratch.rs
@@ -1,4 +1,4 @@
-use std::{fmt::Debug, os::raw::c_void, ptr::NonNull};
+use std::{os::raw::c_void, ptr::NonNull};
use crate::backends::{
common::{Backend, Buffer, BufferCpuAccessible, ScratchBuffer, allocator::pool::PoolAllocation},
@@ -20,15 +20,3 @@ impl BufferCpuAccessible for PoolAllocation<<Cpu as Backend>::GlobalBuffer> {
}
impl ScratchBuffer for PoolAllocation<<Cpu as Backend>::GlobalBuffer> {}
-
-impl Debug for PoolAllocation<<Cpu as Backend>::GlobalBuffer> {
- fn fmt(
- &self,
- f: &mut std::fmt::Formatter<'_>,
- ) -> std::fmt::Result {
- f.debug_struct("PoolAllocation<Cpu::GlobalBuffer>")
- .field("page", &self.page())
- .field("range", &self.range())
- .finish_non_exhaustive()
- }
-}
diff --git a/crates/uzu-engine/src/backends/metal/buffer/constant.rs b/crates/uzu-engine/src/backends/metal/buffer/constant.rs
index f2a19cfe6..760e5d795 100644
--- a/crates/uzu-engine/src/backends/metal/buffer/constant.rs
+++ b/crates/uzu-engine/src/backends/metal/buffer/constant.rs
@@ -1,4 +1,4 @@
-use std::{fmt::Debug, os::raw::c_void, ptr::NonNull};
+use std::{os::raw::c_void, ptr::NonNull};
use crate::backends::{
common::{Backend, Buffer, BufferCpuAccessible, ConstantBuffer, allocator::bump::BumpAllocation},
@@ -20,15 +20,3 @@ impl BufferCpuAccessible for BumpAllocation<<Metal as Backend>::GlobalBuffer> {
}
impl ConstantBuffer for BumpAllocation<<Metal as Backend>::GlobalBuffer> {}
-
-impl Debug for BumpAllocation<<Metal as Backend>::GlobalBuffer> {
- fn fmt(
- &self,
- f: &mut std::fmt::Formatter<'_>,
- ) -> std::fmt::Result {
- f.debug_struct("BumpAllocation<Metal::GlobalBuffer>")
- .field("page", &self.page())
- .field("range", &self.range())
- .finish_non_exhaustive()
- }
-}
diff --git a/crates/uzu-engine/src/backends/metal/buffer/dense.rs b/crates/uzu-engine/src/backends/metal/buffer/dense.rs
index 83fc24161..f0eb9821b 100644
--- a/crates/uzu-engine/src/backends/metal/buffer/dense.rs
+++ b/crates/uzu-engine/src/backends/metal/buffer/dense.rs
@@ -2,19 +2,17 @@ use std::sync::Arc;
use metal::{MTLBuffer, MTLDeviceExt, MTLResidencySet, MTLResourceOptions};
use objc2::{rc::Retained, runtime::ProtocolObject};
-use parking_lot::Mutex;
use crate::backends::metal::{MetalContext, error::MetalError};
-#[derive(Debug)]
pub struct MetalDenseBuffer {
buffer: Retained<ProtocolObject<dyn MTLBuffer>>,
- residency_set: Arc<Mutex<Retained<ProtocolObject<dyn MTLResidencySet>>>>,
+ context: Arc<MetalContext>,
}
impl MetalDenseBuffer {
pub(in crate::backends::metal) fn new(
- context: &MetalContext,
+ context: &Arc<MetalContext>,
size: usize,
) -> Result<Self, MetalError> {
let buffer = context
@@ -22,9 +20,7 @@ impl MetalDenseBuffer {
.new_buffer(size, MTLResourceOptions::STORAGE_MODE_SHARED)
.ok_or(MetalError::CannotCreateBuffer)?;
- let residency_set = context.residency_set.clone();
-
- let residency_set_locked = residency_set.lock();
+ let residency_set_locked = context.residency_set.lock();
residency_set_locked.add_allocation(buffer.as_ref());
residency_set_locked.commit();
residency_set_locked.request_residency();
@@ -34,7 +30,7 @@ impl MetalDenseBuffer {
Ok(Self {
buffer,
- residency_set,
+ context: context.clone(),
})
}
@@ -45,7 +41,7 @@ impl MetalDenseBuffer {
impl Drop for MetalDenseBuffer {
fn drop(&mut self) {
- let residency_set_locked = self.residency_set.lock();
+ let residency_set_locked = self.context.residency_set.lock();
residency_set_locked.remove_allocation(self.buffer.as_ref());
residency_set_locked.commit();
}
diff --git a/crates/uzu-engine/src/backends/metal/buffer/global.rs b/crates/uzu-engine/src/backends/metal/buffer/global.rs
index 25c4d3d8c..897385e7d 100644
--- a/crates/uzu-engine/src/backends/metal/buffer/global.rs
+++ b/crates/uzu-engine/src/backends/metal/buffer/global.rs
@@ -1,4 +1,4 @@
-use std::{fmt::Debug, os::raw::c_void, ptr::NonNull};
+use std::{os::raw::c_void, ptr::NonNull};
use metal::MTLBuffer;
@@ -22,15 +22,3 @@ impl BufferCpuAccessible for BlockAllocation<MetalDenseBuffer> {
}
impl GlobalBuffer for BlockAllocation<MetalDenseBuffer> {}
-
-impl Debug for BlockAllocation<MetalDenseBuffer> {
- fn fmt(
- &self,
- f: &mut std::fmt::Formatter<'_>,
- ) -> std::fmt::Result {
- f.debug_struct("BlockAllocation<MetalDenseBuffer>")
- .field("page", &self.page())
- .field("range", &self.range())
- .finish_non_exhaustive()
- }
-}
diff --git a/crates/uzu-engine/src/backends/metal/buffer/scratch.rs b/crates/uzu-engine/src/backends/metal/buffer/scratch.rs
index fd5af39b8..4479c2757 100644
--- a/crates/uzu-engine/src/backends/metal/buffer/scratch.rs
+++ b/crates/uzu-engine/src/backends/metal/buffer/scratch.rs
@@ -1,4 +1,4 @@
-use std::{fmt::Debug, os::raw::c_void, ptr::NonNull};
+use std::{os::raw::c_void, ptr::NonNull};
use crate::backends::{
common::{Backend, Buffer, BufferCpuAccessible, ScratchBuffer, allocator::pool::PoolAllocation},
@@ -20,15 +20,3 @@ impl BufferCpuAccessible for PoolAllocation<<Metal as Backend>::GlobalBuffer> {
}
impl ScratchBuffer for PoolAllocation<<Metal as Backend>::GlobalBuffer> {}
-
-impl Debug for PoolAllocation<<Metal as Backend>::GlobalBuffer> {
- fn fmt(
- &self,
- f: &mut std::fmt::Formatter<'_>,
- ) -> std::fmt::Result {
- f.debug_struct("PoolAllocation<Metal::GlobalBuffer>")
- .field("page", &self.page())
- .field("range", &self.range())
- .finish_non_exhaustive()
- }
-}
diff --git a/crates/uzu-engine/src/backends/metal/buffer/sparse/sparse_buffer.rs b/crates/uzu-engine/src/backends/metal/buffer/sparse/sparse_buffer.rs
index 6ee040bf7..beb7505f4 100644
--- a/crates/uzu-engine/src/backends/metal/buffer/sparse/sparse_buffer.rs
+++ b/crates/uzu-engine/src/backends/metal/buffer/sparse/sparse_buffer.rs
@@ -1,6 +1,5 @@
use std::{
cmp::{max, min},
- fmt::Debug,
range::Range,
sync::Arc,
};
@@ -59,18 +58,6 @@ impl MetalSparseBuffer {
}
}
-impl Debug for MetalSparseBuffer {
- fn fmt(
- &self,
- f: &mut std::fmt::Formatter<'_>,
- ) -> std::fmt::Result {
- f.debug_struct("MetalSparseBuffer")
- .field("mapped_pages", &self.mapped_pages)
- .field("buffer", &self.buffer)
- .finish_non_exhaustive()
- }
-}
-
impl Drop for MetalSparseBuffer {
fn drop(&mut self) {
let context = self.context.clone();
diff --git a/crates/uzu-engine/src/backends/metal/context.rs b/crates/uzu-engine/src/backends/metal/context.rs
index 1736faf99..85bdeace6 100644
--- a/crates/uzu-engine/src/backends/metal/context.rs
+++ b/crates/uzu-engine/src/backends/metal/context.rs
@@ -41,7 +41,7 @@ pub struct MetalContext {
pub apple_gpu_family: MTLGPUFamily,
pub supports_mxu: bool,
pub device_name: String,
- pub(super) residency_set: Arc<Mutex<Retained<ProtocolObject<dyn MTLResidencySet>>>>,
+ pub(super) residency_set: Mutex<Retained<ProtocolObject<dyn MTLResidencySet>>>,
pub command_queue: Retained<ProtocolObject<dyn MTL4CommandQueue>>,
pub(super) block_allocator: Arc<BlockAllocator<MetalDenseBuffer>>,
peak_memory_usage: AtomicUsize,
@@ -149,7 +149,7 @@ impl Context for MetalContext {
apple_gpu_family,
supports_mxu,
device_name,
- residency_set: Arc::new(Mutex::new(residency_set)),
+ residency_set: Mutex::new(residency_set),
command_queue,
block_allocator,
peak_memory_usage: AtomicUsize::new(0),
diff --git a/crates/uzu-engine/src/encodable_block/classifier.rs b/crates/uzu-engine/src/encodable_block/classifier.rs
index df7f2958e..f44077a95 100644
--- a/crates/uzu-engine/src/encodable_block/classifier.rs
+++ b/crates/uzu-engine/src/encodable_block/classifier.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/convolution.rs b/crates/uzu-engine/src/encodable_block/convolution.rs
index 59fe3f5fb..c6c852b6a 100644
--- a/crates/uzu-engine/src/encodable_block/convolution.rs
+++ b/crates/uzu-engine/src/encodable_block/convolution.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/decoder.rs b/crates/uzu-engine/src/encodable_block/decoder.rs
index 1bdfe1f9e..7b1c8bbfd 100644
--- a/crates/uzu-engine/src/encodable_block/decoder.rs
+++ b/crates/uzu-engine/src/encodable_block/decoder.rs
@@ -1,5 +1,6 @@
use std::range::Range;
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/dflash.rs b/crates/uzu-engine/src/encodable_block/dflash.rs
index 30b18eee8..52e30e8f2 100644
--- a/crates/uzu-engine/src/encodable_block/dflash.rs
+++ b/crates/uzu-engine/src/encodable_block/dflash.rs
@@ -1,5 +1,6 @@
use std::{any::Any, range::Range};
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/embedding.rs b/crates/uzu-engine/src/encodable_block/embedding.rs
index 4320242d6..2f57c2b42 100644
--- a/crates/uzu-engine/src/encodable_block/embedding.rs
+++ b/crates/uzu-engine/src/encodable_block/embedding.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use parking_lot::Mutex;
use thiserror::Error;
diff --git a/crates/uzu-engine/src/encodable_block/embedding_table.rs b/crates/uzu-engine/src/encodable_block/embedding_table.rs
index 7972d178f..9c4158518 100644
--- a/crates/uzu-engine/src/encodable_block/embedding_table.rs
+++ b/crates/uzu-engine/src/encodable_block/embedding_table.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/linear/matmul.rs b/crates/uzu-engine/src/encodable_block/linear/matmul.rs
index 7d4927dd7..23219f816 100644
--- a/crates/uzu-engine/src/encodable_block/linear/matmul.rs
+++ b/crates/uzu-engine/src/encodable_block/linear/matmul.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use parking_lot::Mutex;
use thiserror::Error;
diff --git a/crates/uzu-engine/src/encodable_block/linear/mod.rs b/crates/uzu-engine/src/encodable_block/linear/mod.rs
index 0cc7d1684..78dfdfb93 100644
--- a/crates/uzu-engine/src/encodable_block/linear/mod.rs
+++ b/crates/uzu-engine/src/encodable_block/linear/mod.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
mod input_rht;
diff --git a/crates/uzu-engine/src/encodable_block/linear/qlora_wrapper.rs b/crates/uzu-engine/src/encodable_block/linear/qlora_wrapper.rs
index 1da4b631e..bb818d607 100644
--- a/crates/uzu-engine/src/encodable_block/linear/qlora_wrapper.rs
+++ b/crates/uzu-engine/src/encodable_block/linear/qlora_wrapper.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use parking_lot::Mutex;
use thiserror::Error;
diff --git a/crates/uzu-engine/src/encodable_block/linear/rht_wrapper.rs b/crates/uzu-engine/src/encodable_block/linear/rht_wrapper.rs
index 91842627b..c4dbbe8d8 100644
--- a/crates/uzu-engine/src/encodable_block/linear/rht_wrapper.rs
+++ b/crates/uzu-engine/src/encodable_block/linear/rht_wrapper.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/mixer/attention/mod.rs b/crates/uzu-engine/src/encodable_block/mixer/attention/mod.rs
index 6d5eea1d9..9c2b21056 100644
--- a/crates/uzu-engine/src/encodable_block/mixer/attention/mod.rs
+++ b/crates/uzu-engine/src/encodable_block/mixer/attention/mod.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/mixer/attention/qkv_norm.rs b/crates/uzu-engine/src/encodable_block/mixer/attention/qkv_norm.rs
index 0f762f19f..979998d7a 100644
--- a/crates/uzu-engine/src/encodable_block/mixer/attention/qkv_norm.rs
+++ b/crates/uzu-engine/src/encodable_block/mixer/attention/qkv_norm.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/mixer/delta_net.rs b/crates/uzu-engine/src/encodable_block/mixer/delta_net.rs
index 04750b0e7..998871a3f 100644
--- a/crates/uzu-engine/src/encodable_block/mixer/delta_net.rs
+++ b/crates/uzu-engine/src/encodable_block/mixer/delta_net.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/mixer/mamba2.rs b/crates/uzu-engine/src/encodable_block/mixer/mamba2.rs
index a59c4a90c..4eb19ebac 100644
--- a/crates/uzu-engine/src/encodable_block/mixer/mamba2.rs
+++ b/crates/uzu-engine/src/encodable_block/mixer/mamba2.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/mixer/mod.rs b/crates/uzu-engine/src/encodable_block/mixer/mod.rs
index a7a2dc9fe..4865a7533 100644
--- a/crates/uzu-engine/src/encodable_block/mixer/mod.rs
+++ b/crates/uzu-engine/src/encodable_block/mixer/mod.rs
@@ -1,5 +1,6 @@
use std::any::Any;
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/mixer/short_conv.rs b/crates/uzu-engine/src/encodable_block/mixer/short_conv.rs
index e67eb8660..9955979c3 100644
--- a/crates/uzu-engine/src/encodable_block/mixer/short_conv.rs
+++ b/crates/uzu-engine/src/encodable_block/mixer/short_conv.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/mlp/mod.rs b/crates/uzu-engine/src/encodable_block/mlp/mod.rs
index 80273d940..53e533370 100644
--- a/crates/uzu-engine/src/encodable_block/mlp/mod.rs
+++ b/crates/uzu-engine/src/encodable_block/mlp/mod.rs
@@ -3,6 +3,7 @@ mod gate_act_mul;
mod moe;
pub use dense::DenseMlp;
+use derive_more::Debug;
use gate_act_mul::MlpGateActMulEncodable;
pub use moe::{MoeBlock, MoeBlockError};
use thiserror::Error;
diff --git a/crates/uzu-engine/src/encodable_block/mlp/moe/mod.rs b/crates/uzu-engine/src/encodable_block/mlp/moe/mod.rs
index d58419ddd..62b292f04 100644
--- a/crates/uzu-engine/src/encodable_block/mlp/moe/mod.rs
+++ b/crates/uzu-engine/src/encodable_block/mlp/moe/mod.rs
@@ -4,6 +4,7 @@ mod experts_two_pass_decode;
mod experts_two_pass_prefill;
mod gather;
+use derive_more::Debug;
use experts_two_pass_decode::MoeExpertsTwoPassDecodeBlock;
use experts_two_pass_prefill::{MoeExpertsTwoPassArguments, MoeExpertsTwoPassPrefillBlock};
use gather::MoeGather;
diff --git a/crates/uzu-engine/src/encodable_block/normalization.rs b/crates/uzu-engine/src/encodable_block/normalization.rs
index abf315741..6fe74ae30 100644
--- a/crates/uzu-engine/src/encodable_block/normalization.rs
+++ b/crates/uzu-engine/src/encodable_block/normalization.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/per_layer_embedding.rs b/crates/uzu-engine/src/encodable_block/per_layer_embedding.rs
index 7db1ba244..a2920a9ea 100644
--- a/crates/uzu-engine/src/encodable_block/per_layer_embedding.rs
+++ b/crates/uzu-engine/src/encodable_block/per_layer_embedding.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/prediction_head.rs b/crates/uzu-engine/src/encodable_block/prediction_head.rs
index 5fe4c2d32..351661ee1 100644
--- a/crates/uzu-engine/src/encodable_block/prediction_head.rs
+++ b/crates/uzu-engine/src/encodable_block/prediction_head.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/transformer.rs b/crates/uzu-engine/src/encodable_block/transformer.rs
index 4a107cc1f..9816ec8b3 100644
--- a/crates/uzu-engine/src/encodable_block/transformer.rs
+++ b/crates/uzu-engine/src/encodable_block/transformer.rs
@@ -1,5 +1,6 @@
use std::range::Range;
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/transformer_layer.rs b/crates/uzu-engine/src/encodable_block/transformer_layer.rs
index d9d31634d..567a92c2a 100644
--- a/crates/uzu-engine/src/encodable_block/transformer_layer.rs
+++ b/crates/uzu-engine/src/encodable_block/transformer_layer.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/weaver.rs b/crates/uzu-engine/src/encodable_block/weaver.rs
index 027ede941..d446df08c 100644
--- a/crates/uzu-engine/src/encodable_block/weaver.rs
+++ b/crates/uzu-engine/src/encodable_block/weaver.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/encodable_block/weight_matrix.rs b/crates/uzu-engine/src/encodable_block/weight_matrix.rs
index 05e3e075d..e0e4be876 100644
--- a/crates/uzu-engine/src/encodable_block/weight_matrix.rs
+++ b/crates/uzu-engine/src/encodable_block/weight_matrix.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/engine/classifier_model.rs b/crates/uzu-engine/src/engine/classifier_model.rs
index c2ae0dd6a..d92e350e7 100644
--- a/crates/uzu-engine/src/engine/classifier_model.rs
+++ b/crates/uzu-engine/src/engine/classifier_model.rs
@@ -7,6 +7,7 @@ use std::{
sync::Arc,
};
+use derive_more::Debug;
use half::bf16;
use shoji::{
traits::backend::classification::ClassifierOutput,
diff --git a/crates/uzu-engine/src/engine/language_model/mod.rs b/crates/uzu-engine/src/engine/language_model/mod.rs
index ee1f1fa8b..1255404b9 100644
--- a/crates/uzu-engine/src/engine/language_model/mod.rs
+++ b/crates/uzu-engine/src/engine/language_model/mod.rs
@@ -1,5 +1,6 @@
use std::{fs::File, io, io::BufReader, path::Path, sync::Arc};
+use derive_more::Debug;
use thiserror::Error;
use tokenizers::Tokenizer;
diff --git a/crates/uzu-engine/src/engine/language_model/state.rs b/crates/uzu-engine/src/engine/language_model/state.rs
index 65c11a3b5..4835bc60a 100644
--- a/crates/uzu-engine/src/engine/language_model/state.rs
+++ b/crates/uzu-engine/src/engine/language_model/state.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/engine/language_model/stream/mod.rs b/crates/uzu-engine/src/engine/language_model/stream/mod.rs
index bb9f12dc8..fc456ba8d 100644
--- a/crates/uzu-engine/src/engine/language_model/stream/mod.rs
+++ b/crates/uzu-engine/src/engine/language_model/stream/mod.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
#[cfg(grammar)]
diff --git a/crates/uzu-engine/src/engine/mod.rs b/crates/uzu-engine/src/engine/mod.rs
index 90b5b9728..109adcfe3 100644
--- a/crates/uzu-engine/src/engine/mod.rs
+++ b/crates/uzu-engine/src/engine/mod.rs
@@ -1,5 +1,6 @@
use std::{fs::File, io::BufReader, path::Path, sync::Arc};
+use derive_more::Debug;
use thiserror::Error;
use crate::{
diff --git a/crates/uzu-engine/src/parameters/error.rs b/crates/uzu-engine/src/parameters/error.rs
index 03c462a38..6e042a546 100644
--- a/crates/uzu-engine/src/parameters/error.rs
+++ b/crates/uzu-engine/src/parameters/error.rs
@@ -1,3 +1,4 @@
+use derive_more::Debug;
use thiserror::Error;
use super::safetensors_metadata::HeaderLoadingError;
diff --git a/crates/uzu-engine/src/speculators/dflash_tfm.rs b/crates/uzu-engine/src/speculators/dflash_tfm.rs
index a836ac1d3..6c41724b5 100644
--- a/crates/uzu-engine/src/speculators/dflash_tfm.rs
+++ b/crates/uzu-engine/src/speculators/dflash_tfm.rs
@@ -6,6 +6,7 @@ use std::{
sync::Arc,
};
+use derive_more::Debug;
use serde::{Deserialize, Serialize};
use thiserror::Error;