Skip to content

armgit / uzu

Public Imported from GitHub
0

A high-performance inference engine for AI models

remove legacy MetalArray type alias (#196)

uuuvn22df81046e8f
diff --git a/crates/uzu/src/backends/metal/array.rs b/crates/uzu/src/backends/metal/array.rs
deleted file mode 100644
index 155200c1f..000000000
--- a/crates/uzu/src/backends/metal/array.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-use super::Metal;
-use crate::array::Array;
-
-pub type MetalArray = Array<Metal>;
diff --git a/crates/uzu/src/backends/metal/encodable_block/mamba_mixer.rs b/crates/uzu/src/backends/metal/encodable_block/mamba_mixer.rs
index 7ffb9ea8f..182533c19 100644
--- a/crates/uzu/src/backends/metal/encodable_block/mamba_mixer.rs
+++ b/crates/uzu/src/backends/metal/encodable_block/mamba_mixer.rs
@@ -8,10 +8,11 @@ use objc2::{Message, rc::Retained, runtime::ProtocolObject};
use super::transformer_layer;
use crate::{
Activation, DataType,
+ array::Array,
backends::{
common::kernel::{Conv1dDecodeKernel, Conv1dPackKernel, Conv1dScanKernel, SSDUpdateKernel, SplitInProjKernel},
metal::{
- Metal, MetalArray, MetalContext,
+ Metal, MetalContext,
kernel::{
dsl::{
Conv1dDecodeMetalKernel, Conv1dPackMetalKernel, Conv1dScanMetalKernel, SSDUpdateMetalKernel,
@@ -38,10 +39,10 @@ pub(crate) struct MambaMixer {
conv_scan: Conv1dScanMetalKernel,
ssd_prefill: SSDPrefillKernels,
ssd_update: SSDUpdateMetalKernel,
- conv_weight: MetalArray,
- conv_bias: Option<MetalArray>,
- gate_bias: MetalArray,
- skip_connection_weight: MetalArray,
+ conv_weight: Array<Metal>,
+ conv_bias: Option<Array<Metal>>,
+ gate_bias: Array<Metal>,
+ skip_connection_weight: Array<Metal>,
prefill_mode: SSDPrefillMode,
}
diff --git a/crates/uzu/src/backends/metal/encodable_block/moe_block/moe_block.rs b/crates/uzu/src/backends/metal/encodable_block/moe_block/moe_block.rs
index aa7c07d87..b776abea3 100644
--- a/crates/uzu/src/backends/metal/encodable_block/moe_block/moe_block.rs
+++ b/crates/uzu/src/backends/metal/encodable_block/moe_block/moe_block.rs
@@ -8,10 +8,11 @@ use objc2::{rc::Retained, runtime::ProtocolObject};
use super::SharedMoeWeights;
use crate::{
Activation, DataType, LinearConfig, MixtureOfExpertsConfig, RoutingFunctionConfig,
+ array::Array,
backends::{
common::kernel::{MoeCountsOffsetsFusedKernel, MoeFinalizeKernel},
metal::{
- Metal, MetalArray, MetalContext,
+ Metal, MetalContext,
kernel::{
MoeGatherKernels,
dsl::{MoeCountsOffsetsFusedMetalKernel, MoeFinalizeMetalKernel},
@@ -224,7 +225,7 @@ impl EncodableBlock<Metal> for MoeBlock {
ArrayId::MoeTwoPassRowExpertMap,
]);
- let clone_buffer = |array: &RefCell<MetalArray>| -> Retained<ProtocolObject<dyn MTLBuffer>> {
+ let clone_buffer = |array: &RefCell<Array<Metal>>| -> Retained<ProtocolObject<dyn MTLBuffer>> {
array.borrow().buffer().to_owned().into()
};
diff --git a/crates/uzu/src/backends/metal/encodable_block/short_conv_mixer.rs b/crates/uzu/src/backends/metal/encodable_block/short_conv_mixer.rs
index 336e837e2..7293db9d7 100644
--- a/crates/uzu/src/backends/metal/encodable_block/short_conv_mixer.rs
+++ b/crates/uzu/src/backends/metal/encodable_block/short_conv_mixer.rs
@@ -4,13 +4,14 @@ use objc2::{rc::Retained, runtime::ProtocolObject};
use super::transformer_layer;
use crate::{
DataType,
+ array::Array,
backends::{
common::{
Context,
kernel::{ShortConvDecodeKernel, ShortConvPackKernel, ShortConvPrefillKernel, ShortConvTrieKernel},
},
metal::{
- Metal, MetalArray, MetalContext,
+ Metal, MetalContext,
kernel::dsl::{
ShortConvDecodeMetalKernel, ShortConvPackMetalKernel, ShortConvPrefillMetalKernel,
ShortConvTrieMetalKernel,
@@ -33,8 +34,8 @@ pub(crate) struct ShortConvMixer {
short_conv_prefill: ShortConvPrefillMetalKernel,
short_conv_decode: ShortConvDecodeMetalKernel,
short_conv_trie: ShortConvTrieMetalKernel,
- conv_weight: MetalArray,
- conv_bias: Option<MetalArray>,
+ conv_weight: Array<Metal>,
+ conv_bias: Option<Array<Metal>>,
}
fn resolve_subtree<'tree>(
diff --git a/crates/uzu/src/backends/metal/mod.rs b/crates/uzu/src/backends/metal/mod.rs
index 0e2d2e9af..20eb63f8c 100644
--- a/crates/uzu/src/backends/metal/mod.rs
+++ b/crates/uzu/src/backends/metal/mod.rs
@@ -1,5 +1,3 @@
-mod allocator;
-mod array;
mod backend;
mod classifier_context;
mod command_buffer;
@@ -11,8 +9,8 @@ pub mod error;
pub mod kernel;
mod language_model_generator_context;
pub mod metal_extensions;
+mod native_buffer;
-pub use array::MetalArray;
pub use backend::Metal;
pub use classifier_context::ClassifierContext;
pub use context::{DeviceArchitecture, DeviceClass, DeviceGeneration, MetalContext};
diff --git a/crates/uzu/src/backends/metal/allocator.rs b/crates/uzu/src/backends/metal/native_buffer.rs
similarity index 100%
rename from crates/uzu/src/backends/metal/allocator.rs
rename to crates/uzu/src/backends/metal/native_buffer.rs
diff --git a/crates/uzu/src/tracer/trace_validator.rs b/crates/uzu/src/tracer/trace_validator.rs
index d18ed64a3..789927a12 100644
--- a/crates/uzu/src/tracer/trace_validator.rs
+++ b/crates/uzu/src/tracer/trace_validator.rs
@@ -18,9 +18,10 @@ use num_traits::NumCast;
use crate::{
ArrayElement, DataType,
+ array::Array,
backends::{
common::kernel::kv_cache_update::KVCacheUpdate,
- metal::{Metal, MetalArray, MetalContext},
+ metal::{Metal, MetalContext},
},
classifier::Classifier,
config::ModelMetadata,
@@ -475,7 +476,7 @@ impl TraceValidator {
) -> Vec<TracerValidationResult> {
let mut results = Vec::new();
- let validate = |path: &str, array: &Ref<MetalArray>| -> Option<TracerValidationResult> {
+ let validate = |path: &str, array: &Ref<Array<Metal>>| -> Option<TracerValidationResult> {
if traces_view.leaf(path).is_ok() {
Some(TracerValidationResult {
name: path.to_string(),
@@ -583,8 +584,8 @@ impl TraceValidator {
fn validate_array(
data_type: DataType,
- expected_array: &MetalArray,
- produced_array: &Ref<MetalArray>,
+ expected_array: &Array<Metal>,
+ produced_array: &Ref<Array<Metal>>,
transform: Option<ArrayTransform>,
) -> TracerValidationMetrics {
match data_type {
@@ -599,15 +600,15 @@ impl TraceValidator {
data_type: DataType,
traces_view: &ParameterTree<MetalContext>,
expected_array_path: &str,
- produced_array: &Ref<MetalArray>,
+ produced_array: &Ref<Array<Metal>>,
) -> TracerValidationMetrics {
let expected_array = traces_view.leaf(expected_array_path).unwrap();
Self::validate_array(data_type, &expected_array, produced_array, None)
}
fn validate_array_of_type<Precision: ArrayElement>(
- expected_array: &MetalArray,
- produced_array: &Ref<MetalArray>,
+ expected_array: &Array<Metal>,
+ produced_array: &Ref<Array<Metal>>,
transform: Option<ArrayTransform>,
) -> TracerValidationMetrics {
let expected_view = expected_array.as_view::<Precision>();
@@ -846,7 +847,7 @@ impl TraceValidator {
.expect("Failed to create sampling kernel");
}
- fn get_tokens_from_logits(logits: &MetalArray) -> Vec<u64> {
+ fn get_tokens_from_logits(logits: &Array<Metal>) -> Vec<u64> {
let data_type = logits.data_type();
match data_type {
DataType::F16 => Self::get_tokens_from_logits_of_type::<f16>(logits),
@@ -856,7 +857,7 @@ impl TraceValidator {
}
}
- fn get_tokens_from_logits_of_type<Precision: ArrayElement>(logits: &MetalArray) -> Vec<u64> {
+ fn get_tokens_from_logits_of_type<Precision: ArrayElement>(logits: &Array<Metal>) -> Vec<u64> {
let sampler = ArgmaxSampler {};
sampler.sample(logits.as_view::<Precision>())
}
diff --git a/crates/uzu/tests/person_schema_metal_bitmask_test.rs b/crates/uzu/tests/person_schema_metal_bitmask_test.rs
index e3454fe5b..1b013b3e3 100644
--- a/crates/uzu/tests/person_schema_metal_bitmask_test.rs
+++ b/crates/uzu/tests/person_schema_metal_bitmask_test.rs
@@ -6,7 +6,7 @@ use metal::{MTLDevice, MTLDeviceExt, MTLResourceOptions};
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use tokenizers::Tokenizer;
-use uzu::{DataType, backends::metal::MetalArray};
+use uzu::{DataType, array::Array, backends::metal::Metal};
use xgrammar::{DLDevice, DLDeviceType, DLTensor, Grammar, GrammarCompiler, GrammarMatcher, TokenizerInfo};
#[derive(Debug, Serialize, Deserialize, JsonSchema)]
@@ -62,7 +62,7 @@ fn person_schema_metal_bitmask() {
let elems = batch * buffer_size;
let bytes = elems * core::mem::size_of::<i32>();
let buffer = device.new_buffer(bytes, MTLResourceOptions::STORAGE_MODE_SHARED).expect("Failed to create buffer");
- let metal_bitmask = unsafe { MetalArray::from_parts(buffer, 0, &shape, DataType::I32) };
+ let metal_bitmask = unsafe { Array::<Metal>::from_parts(buffer, 0, &shape, DataType::I32) };
let mut shape_i64 = [buffer_size as i64];
let mut bitmask_tensor = DLTensor {