don't clone in transform_into

sonos · Feb 19, 2025 · f7eaef3 · f7eaef3
1 parent fb6a126
commit f7eaef3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/cli/src/params.rs b/cli/src/params.rs
@@ -754,7 +754,7 @@ impl Parameters {
                 {
                     stage!("metal", typed_model -> typed_model, |m:TypedModel| {
                         tract_metal::transform::MetalTransform::default()
-                            .transform_into(&m)
+                            .transform_into(m)
                     });
                 }
                 #[cfg(not(any(target_os = "macos", target_os = "ios")))]
@@ -768,7 +768,7 @@ impl Parameters {
             for transform in transform {
                 stage!(transform, typed_model -> typed_model, |m:TypedModel| {
                     let transform = tract_core::transform::get_transform(transform).with_context(|| format!("Could not find transform named {}", transform))?;
-                    transform.transform_into(&m)
+                    transform.transform_into(m)
                 });
                 stage!(&format!("{}-declutter", transform), typed_model -> typed_model, |m:TypedModel| m.into_decluttered());
             }

diff --git a/core/src/floats.rs b/core/src/floats.rs
@@ -249,7 +249,7 @@ mod test {
         // Execution in F16 with returns NaN
         let runnable_model = &crate::transform::get_transform("f32-to-f16")
             .unwrap()
-            .transform_into(&model)?
+            .transform_into(model.clone())?
             .into_runnable()?;
         assert!(runnable_model.run(tvec![tensor1(&[f16::from_f32(5.0)]).into()])?[0]
             .to_scalar::<f16>()?
@@ -258,7 +258,7 @@ mod test {
         // Execution in F16 with filter that returns the good output.
         let runnable_model = &crate::transform::get_transform("f32-to-f16!=layer.1")
             .unwrap()
-            .transform_into(&model)?
+            .transform_into(model.clone())?
             .into_runnable()?;
         assert_eq!(
             runnable_model.run(tvec![tensor1(&[f16::from_f32(5.0)]).into()])?[0],
@@ -268,7 +268,7 @@ mod test {
         // Execution in F16 with returns NaN despite the filter.
         let runnable_model = &crate::transform::get_transform("f32-to-f16!=layer.0")
             .unwrap()
-            .transform_into(&model)?
+            .transform_into(model)?
             .into_runnable()?;
         assert!(runnable_model.run(tvec![tensor1(&[f16::from_f32(5.0)]).into()])?[0]
             .to_scalar::<f16>()?

diff --git a/core/src/transform.rs b/core/src/transform.rs
@@ -60,8 +60,7 @@ pub fn build_float_translator<T1: Datum + Float, T2: Datum + Float>(
 pub trait ModelTransform: Debug {
     fn name(&self) -> Cow<str>;
     fn transform(&self, model: &mut TypedModel) -> TractResult<()>;
-    fn transform_into(&self, model: &TypedModel) -> TractResult<TypedModel> {
-        let mut model = model.clone();
+    fn transform_into(&self, mut model: TypedModel) -> TractResult<TypedModel> {
         self.transform(&mut model)?;
         Ok(model)
     }

diff --git a/metal/src/ops/change_axes.rs b/metal/src/ops/change_axes.rs
@@ -206,7 +206,7 @@ pub mod tests {
 
         let expected = model.clone().into_runnable()?.run(tvec![input.clone().into()])?;
 
-        let metal_model = MetalTransform::default().transform_into(&model)?;
+        let metal_model = MetalTransform::default().transform_into(model)?;
         let output = metal_model.clone().into_runnable()?.run(tvec![input.clone().into()])?;
 
         let _ = &output[0].close_enough(&expected[0], Approximation::Close)?;