refactor operator

raphaelDkhn · raphaelDkhn · commit e7438faa6d9b · 2024-03-25T10:06:25.000+01:00
diff --git a/src/operators/tensor/core.cairo b/src/operators/tensor/core.cairo
@@ -1386,7 +1386,7 @@ trait TensorTrait<T> {
     /// >>> [1,1,1,0,0,0,1,1,1]
     /// ```
     ///
-    fn less_equal(self: @Tensor<T>, other: @Tensor<T>) -> Tensor<usize>;
+    fn less_equal(self: @Tensor<T>, other: @Tensor<T>) -> Tensor<i32>;
     /// #tensor.abs
     ///
     /// ```rust
diff --git a/src/operators/tensor/implementations/tensor_bool.cairo b/src/operators/tensor/implementations/tensor_bool.cairo
@@ -121,7 +121,7 @@ impl BoolTensor of TensorTrait<bool> {
         panic(array!['not supported!'])
     }
 
-    fn less_equal(self: @Tensor<bool>, other: @Tensor<bool>) -> Tensor<usize> {
+    fn less_equal(self: @Tensor<bool>, other: @Tensor<bool>) -> Tensor<i32> {
         panic(array!['not supported!'])
     }
 
diff --git a/src/operators/tensor/implementations/tensor_complex64.cairo b/src/operators/tensor/implementations/tensor_complex64.cairo
@@ -138,7 +138,7 @@ impl Complex64Tensor of TensorTrait<complex64> {
         panic(array!['not supported!'])
     }
 
-    fn less_equal(self: @Tensor<complex64>, other: @Tensor<complex64>) -> Tensor<usize> {
+    fn less_equal(self: @Tensor<complex64>, other: @Tensor<complex64>) -> Tensor<i32> {
         panic(array!['not supported!'])
     }
 
diff --git a/src/operators/tensor/implementations/tensor_fp16x16.cairo b/src/operators/tensor/implementations/tensor_fp16x16.cairo
@@ -132,7 +132,7 @@ impl FP16x16Tensor of TensorTrait<FP16x16> {
         math::less::less(self, other)
     }
 
-    fn less_equal(self: @Tensor<FP16x16>, other: @Tensor<FP16x16>) -> Tensor<usize> {
+    fn less_equal(self: @Tensor<FP16x16>, other: @Tensor<FP16x16>) -> Tensor<i32> {
         math::less_equal::less_equal(self, other)
     }
 
diff --git a/src/operators/tensor/implementations/tensor_fp16x16wide.cairo b/src/operators/tensor/implementations/tensor_fp16x16wide.cairo
@@ -142,7 +142,7 @@ impl FP16x16WTensor of TensorTrait<FP16x16W> {
         math::less::less(self, other)
     }
 
-    fn less_equal(self: @Tensor<FP16x16W>, other: @Tensor<FP16x16W>) -> Tensor<usize> {
+    fn less_equal(self: @Tensor<FP16x16W>, other: @Tensor<FP16x16W>) -> Tensor<i32> {
         math::less_equal::less_equal(self, other)
     }
 
diff --git a/src/operators/tensor/implementations/tensor_fp32x32.cairo b/src/operators/tensor/implementations/tensor_fp32x32.cairo
@@ -129,7 +129,7 @@ impl FP32x32Tensor of TensorTrait<FP32x32> {
         math::less::less(self, other)
     }
 
-    fn less_equal(self: @Tensor<FP32x32>, other: @Tensor<FP32x32>) -> Tensor<usize> {
+    fn less_equal(self: @Tensor<FP32x32>, other: @Tensor<FP32x32>) -> Tensor<i32> {
         math::less_equal::less_equal(self, other)
     }
 
diff --git a/src/operators/tensor/implementations/tensor_fp64x64.cairo b/src/operators/tensor/implementations/tensor_fp64x64.cairo
@@ -129,7 +129,7 @@ impl FP64x64Tensor of TensorTrait<FP64x64> {
         math::less::less(self, other)
     }
 
-    fn less_equal(self: @Tensor<FP64x64>, other: @Tensor<FP64x64>) -> Tensor<usize> {
+    fn less_equal(self: @Tensor<FP64x64>, other: @Tensor<FP64x64>) -> Tensor<i32> {
         math::less_equal::less_equal(self, other)
     }
 
diff --git a/src/operators/tensor/implementations/tensor_fp8x23.cairo b/src/operators/tensor/implementations/tensor_fp8x23.cairo
@@ -129,7 +129,7 @@ impl FP8x23Tensor of TensorTrait<FP8x23> {
         math::less::less(self, other)
     }
 
-    fn less_equal(self: @Tensor<FP8x23>, other: @Tensor<FP8x23>) -> Tensor<usize> {
+    fn less_equal(self: @Tensor<FP8x23>, other: @Tensor<FP8x23>) -> Tensor<i32> {
         math::less_equal::less_equal(self, other)
     }
 
diff --git a/src/operators/tensor/implementations/tensor_fp8x23wide.cairo b/src/operators/tensor/implementations/tensor_fp8x23wide.cairo
@@ -132,7 +132,7 @@ impl FP8x23WTensor of TensorTrait<FP8x23W> {
         math::less::less(self, other)
     }
 
-    fn less_equal(self: @Tensor<FP8x23W>, other: @Tensor<FP8x23W>) -> Tensor<usize> {
+    fn less_equal(self: @Tensor<FP8x23W>, other: @Tensor<FP8x23W>) -> Tensor<i32> {
         math::less_equal::less_equal(self, other)
     }
 
diff --git a/src/operators/tensor/implementations/tensor_i32.cairo b/src/operators/tensor/implementations/tensor_i32.cairo
@@ -130,7 +130,7 @@ impl I32Tensor of TensorTrait<i32> {
         math::less::less(self, other)
     }
 
-    fn less_equal(self: @Tensor<i32>, other: @Tensor<i32>) -> Tensor<usize> {
+    fn less_equal(self: @Tensor<i32>, other: @Tensor<i32>) -> Tensor<i32> {
         math::less_equal::less_equal(self, other)
     }
 
diff --git a/src/operators/tensor/implementations/tensor_i8.cairo b/src/operators/tensor/implementations/tensor_i8.cairo
@@ -127,7 +127,7 @@ impl I8Tensor of TensorTrait<i8> {
         math::less::less(self, other)
     }
 
-    fn less_equal(self: @Tensor<i8>, other: @Tensor<i8>) -> Tensor<usize> {
+    fn less_equal(self: @Tensor<i8>, other: @Tensor<i8>) -> Tensor<i32> {
         math::less_equal::less_equal(self, other)
     }
 
diff --git a/src/operators/tensor/implementations/tensor_u32.cairo b/src/operators/tensor/implementations/tensor_u32.cairo
@@ -126,7 +126,7 @@ impl U32Tensor of TensorTrait<u32> {
         math::less::less(self, other)
     }
 
-    fn less_equal(self: @Tensor<u32>, other: @Tensor<u32>) -> Tensor<usize> {
+    fn less_equal(self: @Tensor<u32>, other: @Tensor<u32>) -> Tensor<i32> {
         math::less_equal::less_equal(self, other)
     }
 
diff --git a/src/operators/tensor/math/less_equal.cairo b/src/operators/tensor/math/less_equal.cairo
@@ -1,20 +1,19 @@
-use orion::operators::tensor::core::{Tensor, TensorTrait, unravel_index};
+use orion::operators::tensor::{core::{Tensor, TensorTrait, unravel_index}, I32Tensor};
 use orion::operators::tensor::helpers::{
     broadcast_shape, broadcast_index_mapping, len_from_shape, check_compatibility
 };
 
 /// Cf: TensorTrait::less_equal docstring
 fn less_equal<
     T,
-    impl UsizeFTensor: TensorTrait<usize>,
     impl TPartialOrd: PartialOrd<T>,
     impl TCopy: Copy<T>,
     impl TDrop: Drop<T>
 >(
     y: @Tensor<T>, z: @Tensor<T>
-) -> Tensor<usize> {
+) -> Tensor<i32> {
     let broadcasted_shape = broadcast_shape(*y.shape, *z.shape);
-    let mut result: Array<usize> = array![];
+    let mut result: Array<i32> = array![];
 
     let num_elements = len_from_shape(broadcasted_shape);
 

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ impl BoolTensor of TensorTrait<bool> {`
`121`	`121`	`panic(array!['not supported!'])`
`122`	`122`	`}`
`123`	`123`
`124`		`- fn less_equal(self: @Tensor<bool>, other: @Tensor<bool>) -> Tensor<usize> {`
	`124`	`+ fn less_equal(self: @Tensor<bool>, other: @Tensor<bool>) -> Tensor<i32> {`
`125`	`125`	`panic(array!['not supported!'])`
`126`	`126`	`}`
`127`	`127`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ impl Complex64Tensor of TensorTrait<complex64> {`
`138`	`138`	`panic(array!['not supported!'])`
`139`	`139`	`}`
`140`	`140`
`141`		`- fn less_equal(self: @Tensor<complex64>, other: @Tensor<complex64>) -> Tensor<usize> {`
	`141`	`+ fn less_equal(self: @Tensor<complex64>, other: @Tensor<complex64>) -> Tensor<i32> {`
`142`	`142`	`panic(array!['not supported!'])`
`143`	`143`	`}`
`144`	`144`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ impl FP16x16Tensor of TensorTrait<FP16x16> {`
`132`	`132`	`math::less::less(self, other)`
`133`	`133`	`}`
`134`	`134`
`135`		`- fn less_equal(self: @Tensor<FP16x16>, other: @Tensor<FP16x16>) -> Tensor<usize> {`
	`135`	`+ fn less_equal(self: @Tensor<FP16x16>, other: @Tensor<FP16x16>) -> Tensor<i32> {`
`136`	`136`	`math::less_equal::less_equal(self, other)`
`137`	`137`	`}`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ impl FP16x16WTensor of TensorTrait<FP16x16W> {`
`142`	`142`	`math::less::less(self, other)`
`143`	`143`	`}`
`144`	`144`
`145`		`- fn less_equal(self: @Tensor<FP16x16W>, other: @Tensor<FP16x16W>) -> Tensor<usize> {`
	`145`	`+ fn less_equal(self: @Tensor<FP16x16W>, other: @Tensor<FP16x16W>) -> Tensor<i32> {`
`146`	`146`	`math::less_equal::less_equal(self, other)`
`147`	`147`	`}`
`148`	`148`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ impl FP32x32Tensor of TensorTrait<FP32x32> {`
`129`	`129`	`math::less::less(self, other)`
`130`	`130`	`}`
`131`	`131`
`132`		`- fn less_equal(self: @Tensor<FP32x32>, other: @Tensor<FP32x32>) -> Tensor<usize> {`
	`132`	`+ fn less_equal(self: @Tensor<FP32x32>, other: @Tensor<FP32x32>) -> Tensor<i32> {`
`133`	`133`	`math::less_equal::less_equal(self, other)`
`134`	`134`	`}`
`135`	`135`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ impl FP64x64Tensor of TensorTrait<FP64x64> {`
`129`	`129`	`math::less::less(self, other)`
`130`	`130`	`}`
`131`	`131`
`132`		`- fn less_equal(self: @Tensor<FP64x64>, other: @Tensor<FP64x64>) -> Tensor<usize> {`
	`132`	`+ fn less_equal(self: @Tensor<FP64x64>, other: @Tensor<FP64x64>) -> Tensor<i32> {`
`133`	`133`	`math::less_equal::less_equal(self, other)`
`134`	`134`	`}`
`135`	`135`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ impl FP8x23Tensor of TensorTrait<FP8x23> {`
`129`	`129`	`math::less::less(self, other)`
`130`	`130`	`}`
`131`	`131`
`132`		`- fn less_equal(self: @Tensor<FP8x23>, other: @Tensor<FP8x23>) -> Tensor<usize> {`
	`132`	`+ fn less_equal(self: @Tensor<FP8x23>, other: @Tensor<FP8x23>) -> Tensor<i32> {`
`133`	`133`	`math::less_equal::less_equal(self, other)`
`134`	`134`	`}`
`135`	`135`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ impl FP8x23WTensor of TensorTrait<FP8x23W> {`
`132`	`132`	`math::less::less(self, other)`
`133`	`133`	`}`
`134`	`134`
`135`		`- fn less_equal(self: @Tensor<FP8x23W>, other: @Tensor<FP8x23W>) -> Tensor<usize> {`
	`135`	`+ fn less_equal(self: @Tensor<FP8x23W>, other: @Tensor<FP8x23W>) -> Tensor<i32> {`
`136`	`136`	`math::less_equal::less_equal(self, other)`
`137`	`137`	`}`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ impl I32Tensor of TensorTrait<i32> {`
`130`	`130`	`math::less::less(self, other)`
`131`	`131`	`}`
`132`	`132`
`133`		`- fn less_equal(self: @Tensor<i32>, other: @Tensor<i32>) -> Tensor<usize> {`
	`133`	`+ fn less_equal(self: @Tensor<i32>, other: @Tensor<i32>) -> Tensor<i32> {`
`134`	`134`	`math::less_equal::less_equal(self, other)`
`135`	`135`	`}`
`136`	`136`