Skip to content

armgit / uzu

Public Imported from GitHub
0

A high-performance inference engine for AI models

wip

eugene307754fa7a3d
diff --git a/crates/uzu/src/backends/metal/encodable_block/layer/executables.rs b/crates/uzu/src/backends/metal/encodable_block/layer/executables.rs
index 70fdc92cc..7aa663c2d 100644
--- a/crates/uzu/src/backends/metal/encodable_block/layer/executables.rs
+++ b/crates/uzu/src/backends/metal/encodable_block/layer/executables.rs
@@ -352,7 +352,8 @@ impl EncodableBlock for LayerExecutables {
out_projection.encode(state, command_buffer, parameters);
#[cfg(feature = "tracing")]
if let Some(ref layer_traces) = layer_traces {
- state.copy_array(
+ state.encode_copy_array(
+ command_buffer,
ArrayId::Main,
layer_traces.borrow().attention.clone(),
);
@@ -364,7 +365,8 @@ impl EncodableBlock for LayerExecutables {
mixer.encode(state, command_buffer, parameters);
#[cfg(feature = "tracing")]
if let Some(ref layer_traces) = layer_traces {
- state.copy_array(
+ state.encode_copy_array(
+ command_buffer,
ArrayId::Main,
layer_traces.borrow().attention.clone(),
);
@@ -376,7 +378,8 @@ impl EncodableBlock for LayerExecutables {
mixer.encode(state, command_buffer, parameters);
#[cfg(feature = "tracing")]
if let Some(ref layer_traces) = layer_traces {
- state.copy_array(
+ state.encode_copy_array(
+ command_buffer,
ArrayId::Main,
layer_traces.borrow().attention.clone(),
);
diff --git a/crates/uzu/src/classifier/classifier.rs b/crates/uzu/src/classifier/classifier.rs
index aacaa1444..68df0272d 100644
--- a/crates/uzu/src/classifier/classifier.rs
+++ b/crates/uzu/src/classifier/classifier.rs
@@ -103,6 +103,8 @@ impl Classifier {
num_labels,
);
+ self.context.reset_command_buffer();
+
let encoding_params = EncodingParameters::new(false, true, false);
self.context.embed.encode(
@@ -159,6 +161,9 @@ impl Classifier {
&encoding_params,
);
+ self.context.command_buffer.commit();
+ self.context.command_buffer.wait_until_completed();
+
let logits = self.copy_logits_from_state(&state)?;
let traces = state.traces().clone();
@@ -185,6 +190,8 @@ impl Classifier {
num_labels,
);
+ self.context.reset_command_buffer();
+
let encoding_params = EncodingParameters::new(false, true, false);
self.context.embed.encode(
@@ -220,6 +227,9 @@ impl Classifier {
&encoding_params,
);
+ self.context.command_buffer.commit();
+ self.context.command_buffer.wait_until_completed();
+
let logits = self.copy_logits_from_state(&state)?;
Ok(logits)
diff --git a/crates/uzu/tests/kv_cache_state_test.rs b/crates/uzu/tests/kv_cache_state_test.rs
index 7277373cd..abfc37aae 100644
--- a/crates/uzu/tests/kv_cache_state_test.rs
+++ b/crates/uzu/tests/kv_cache_state_test.rs
@@ -1,6 +1,6 @@
#![cfg(any(target_os = "macos", target_os = "ios"))]
-use metal::{CommandBuffer, Device};
+use metal::Device;
use uzu::{
Array, DataType, DeviceContext,
backends::metal::{