Fix clippy

sonos · Oct 18, 2024 · 8ef7a78 · 8ef7a78
1 parent 808d1fd
commit 8ef7a78
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 20 deletions.
diff --git a/metal/src/kernels/array/broadcast.rs b/metal/src/kernels/array/broadcast.rs
@@ -46,7 +46,7 @@ impl MultiBroadcast {
         input_offset: usize,
         output_shape: &[usize],
     ) -> Result<MetalTensor> {
-        let output = unsafe { MetalTensor::uninitialized_dt(input.datum_type(), &output_shape)? };
+        let output = unsafe { MetalTensor::uninitialized_dt(input.datum_type(), output_shape)? };
         self.dispatch_eval(context, input, input_offset, &output)?;
         context.wait_until_completed()?;
         Ok(output)
@@ -96,7 +96,7 @@ impl MultiBroadcast {
             metal::MTLResourceUsage::Read,
         );
         encoder.set_slice(1, &input_broadcast_strides);
-        encoder.set_metal_tensor(2, &output, metal::MTLResourceUsage::Write);
+        encoder.set_metal_tensor(2, output, metal::MTLResourceUsage::Write);
         encoder.set_slice(3, output.shape());
         encoder.set_slice(4, output.strides());
 

diff --git a/metal/src/kernels/array/cast.rs b/metal/src/kernels/array/cast.rs
@@ -80,7 +80,7 @@ impl Cast {
         let encoder = command_buffer.new_compute_command_encoder();
         encoder.set_compute_pipeline_state(&pipeline);
         encoder.set_metal_tensor(0, input, metal::MTLResourceUsage::Read);
-        encoder.set_metal_tensor(1, &output, metal::MTLResourceUsage::Write);
+        encoder.set_metal_tensor(1, output, metal::MTLResourceUsage::Write);
 
         let grid_size = MTLSize { width: output.len() as NSUInteger, height: 1, depth: 1 };
         let group_size = MTLSize { width: 1, height: 1, depth: 1 };

diff --git a/metal/src/kernels/array/concat.rs b/metal/src/kernels/array/concat.rs
@@ -106,12 +106,12 @@ impl Concat {
             encoder.set_slice(1, i_strides);
             encoder.set_metal_tensor_with_offset(
                 2,
-                &output,
+                output,
                 offset as _,
                 metal::MTLResourceUsage::Write,
             );
             encoder.set_slice(3, i_shape);
-            encoder.set_slice(4, &output_strides);
+            encoder.set_slice(4, output_strides);
             let grid_size = utils::build_metal_size_for_shape(i_shape);
             let group_size = utils::build_metal_size_with_ones();
             encoder.dispatch_thread_groups(grid_size, group_size);

diff --git a/metal/src/kernels/array/copy.rs b/metal/src/kernels/array/copy.rs
@@ -66,7 +66,7 @@ impl Memcpy {
             input_offset as _,
             metal::MTLResourceUsage::Read,
         );
-        encoder.set_metal_tensor(1, &output, metal::MTLResourceUsage::Write);
+        encoder.set_metal_tensor(1, output, metal::MTLResourceUsage::Write);
 
         let grid_size = MTLSize { width: output.len() as NSUInteger, height: 1, depth: 1 };
         let group_size = MTLSize { width: 1, height: 1, depth: 1 };

diff --git a/metal/src/kernels/array/permute_axes.rs b/metal/src/kernels/array/permute_axes.rs
@@ -115,7 +115,7 @@ impl PermuteAxes {
         encoder.set_compute_pipeline_state(&pipeline);
         encoder.set_metal_tensor(0, input, metal::MTLResourceUsage::Read);
         encoder.set_slice(1, &new_strides);
-        encoder.set_metal_tensor(2, &output, metal::MTLResourceUsage::Write);
+        encoder.set_metal_tensor(2, output, metal::MTLResourceUsage::Write);
         encoder.set_slice(3, output.shape());
         encoder.set_slice(4, output.strides());
 

diff --git a/metal/src/kernels/bin_ops.rs b/metal/src/kernels/bin_ops.rs
@@ -198,7 +198,7 @@ impl BinOps {
                 encoder.set_compute_pipeline_state(&pipeline);
                 encoder.set_metal_tensor(0, lhs, metal::MTLResourceUsage::Read);
                 encoder.set_metal_tensor(1, rhs, metal::MTLResourceUsage::Read);
-                encoder.set_metal_tensor(2, &output, metal::MTLResourceUsage::Write);
+                encoder.set_metal_tensor(2, output, metal::MTLResourceUsage::Write);
 
                 let grid_size = MTLSize { width: output.len() as NSUInteger, height: 1, depth: 1 };
                 let group_size = MTLSize { width: 1, height: 1, depth: 1 };
@@ -228,7 +228,7 @@ impl BinOps {
                 encoder.set_slice(1, &lhs_strides);
                 encoder.set_metal_tensor(2, rhs, metal::MTLResourceUsage::Read);
                 encoder.set_slice(3, &rhs_strides);
-                encoder.set_metal_tensor(4, &output, metal::MTLResourceUsage::Write);
+                encoder.set_metal_tensor(4, output, metal::MTLResourceUsage::Write);
                 encoder.set_slice(5, output_shape);
 
                 let grid_size = MTLSize {

diff --git a/metal/src/kernels/element_wise.rs b/metal/src/kernels/element_wise.rs
@@ -196,7 +196,7 @@ impl ElementWiseOps {
         let encoder = command_buffer.new_compute_command_encoder();
         encoder.set_compute_pipeline_state(&pipeline);
         encoder.set_metal_tensor(0, input, metal::MTLResourceUsage::Read);
-        encoder.set_metal_tensor(1, &output, metal::MTLResourceUsage::Write);
+        encoder.set_metal_tensor(1, output, metal::MTLResourceUsage::Write);
 
         let grid_size = MTLSize { width: output.len() as NSUInteger, height: 1, depth: 1 };
         let group_size = MTLSize { width: 1, height: 1, depth: 1 };

diff --git a/metal/src/kernels/nn/new_gelu.rs b/metal/src/kernels/nn/new_gelu.rs
@@ -1,3 +1,4 @@
+use crate::encoder::EncoderExt;
 use crate::{LibraryName, MetalContext, MetalTensor};
 use anyhow::Result;
 use metal::MTLSize;
@@ -56,13 +57,10 @@ impl NewGelu {
         let command_buffer = context.command_buffer();
         let encoder = command_buffer.new_compute_command_encoder();
         encoder.set_compute_pipeline_state(&pipeline);
-        encoder.set_buffer(0, Some(input.metal()), input.metal_offset());
-        encoder.set_buffer(1, Some(output.metal()), output.metal_offset());
-
+        encoder.set_metal_tensor(0, input, metal::MTLResourceUsage::Read);
+        encoder.set_metal_tensor(1, output, metal::MTLResourceUsage::Write);
         let grid_size = MTLSize { width: output.len() as _, height: 1, depth: 1 };
         let group_size = MTLSize { width: 1, height: 1, depth: 1 };
-        encoder.use_resource(input.metal(), metal::MTLResourceUsage::Read);
-        encoder.use_resource(output.metal(), metal::MTLResourceUsage::Write);
         encoder.dispatch_thread_groups(grid_size, group_size);
         encoder.end_encoding();
         Ok(())

diff --git a/metal/src/kernels/nn/reduce.rs b/metal/src/kernels/nn/reduce.rs
@@ -72,7 +72,7 @@ impl Reducer {
 
         let input_shape_nd3 = Self::reshape_to_rank_3(input.shape(), axis);
         let input_strides_nd3 = Tensor::natural_strides(&input_shape_nd3);
-        let output_shape_nd3 = Self::reshape_to_rank_3(&output.shape(), axis);
+        let output_shape_nd3 = Self::reshape_to_rank_3(output.shape(), axis);
         let output_strides_nd3 = Tensor::natural_strides(&output_shape_nd3);
 
         let pipeline = context
@@ -83,7 +83,7 @@ impl Reducer {
         let encoder = command_buffer.new_compute_command_encoder();
         encoder.set_compute_pipeline_state(&pipeline);
         encoder.set_metal_tensor(0, input, metal::MTLResourceUsage::Read);
-        encoder.set_metal_tensor(1, &output, metal::MTLResourceUsage::Write);
+        encoder.set_metal_tensor(1, output, metal::MTLResourceUsage::Write);
         encoder.set_slice(2, &input_shape_nd3);
         encoder.set_slice(3, &input_strides_nd3);
         encoder.set_slice(4, &output_strides_nd3);

diff --git a/metal/src/kernels/nn/rms_norm.rs b/metal/src/kernels/nn/rms_norm.rs
@@ -65,7 +65,7 @@ impl RmsNorm {
         encoder.set_compute_pipeline_state(&pipeline);
         encoder.set_metal_tensor(0, input, metal::MTLResourceUsage::Read);
         encoder.set_tensor(1, eps);
-        encoder.set_metal_tensor(2, &output, metal::MTLResourceUsage::Write);
+        encoder.set_metal_tensor(2, output, metal::MTLResourceUsage::Write);
         encoder.set_slice(3, &shape_nd3);
         encoder.set_slice(4, &strides_nd3);
 

diff --git a/metal/src/kernels/nn/silu.rs b/metal/src/kernels/nn/silu.rs
@@ -44,7 +44,7 @@ impl Silu {
         let encoder = command_buffer.new_compute_command_encoder();
         encoder.set_compute_pipeline_state(&pipeline);
         encoder.set_metal_tensor(0, input, metal::MTLResourceUsage::Read);
-        encoder.set_metal_tensor(1, &output, metal::MTLResourceUsage::Write);
+        encoder.set_metal_tensor(1, output, metal::MTLResourceUsage::Write);
 
         let grid_size = MTLSize { width: output.len() as _, height: 1, depth: 1 };
         let group_size = MTLSize { width: 1, height: 1, depth: 1 };

diff --git a/metal/src/kernels/nn/softmax.rs b/metal/src/kernels/nn/softmax.rs
@@ -62,7 +62,7 @@ impl Softmax {
         let encoder = command_buffer.new_compute_command_encoder();
         encoder.set_compute_pipeline_state(&pipeline);
         encoder.set_metal_tensor(0, input, metal::MTLResourceUsage::Read);
-        encoder.set_metal_tensor(1, &output, metal::MTLResourceUsage::Write);
+        encoder.set_metal_tensor(1, output, metal::MTLResourceUsage::Write);
         encoder.set_slice(2, &shape_nd3);
         encoder.set_slice(3, &strides_nd3);