Merge pull request #611 from gizatechxyz/refactor-

Refactor Conditional operators

Author: raphaelDkhn

docs/framework/operators/tensor/tensor.and.md

@@ -1,7 +1,7 @@
 #tensor.and
 
 ```rust
-    fn and(self: @Tensor<bool>, other: @Tensor<bool>) -> Tensor<usize>;
+    fn and(self: @Tensor<bool>, other: @Tensor<bool>) -> Tensor<i32>;
 ```
 
 Computes the logical AND of two tensors element-wise.
@@ -20,7 +20,7 @@ The input tensors must have either:
 
 ## Returns
 
-A new `Tensor<bool>` with the same shape as the broadcasted inputs.
+A new `Tensor<i32>` with the same shape as the broadcasted inputs.
 
 ## Examples
 
@@ -29,7 +29,7 @@ use core::array::{ArrayTrait, SpanTrait};
 
 use orion::operators::tensor::{TensorTrait, Tensor, BoolTensor};
 
-fn and_example() -> Tensor<usize> {
+fn and_example() -> Tensor<i32> {
     let tensor_1 = TensorTrait::<bool>::new(
         shape: array![3, 3].span(), data: array![false, true, false, false, false, true, true, false, true, false, false, true].span(),
     );

docs/framework/operators/tensor/tensor.equal.md

@@ -1,7 +1,7 @@
 #tensor.equal
 
 ```rust
-    fn equal(self: @Tensor<T>, other: @Tensor<T>) -> Tensor<usize>;
+    fn equal(self: @Tensor<T>, other: @Tensor<T>) -> Tensor<i32>;
 ```
 
 Check if two tensors are equal element-wise.
@@ -20,7 +20,7 @@ The input tensors must have either:
 
 ## Returns
 
-A new `Tensor<bool>` of booleans (1 if equal, 0 otherwise) with the same shape as the broadcasted inputs.
+A new `Tensor<i32>` (1 if equal, 0 otherwise) with the same shape as the broadcasted inputs.
 
 ## Examples
 
@@ -31,7 +31,7 @@ use core::array::{ArrayTrait, SpanTrait};
 
 use orion::operators::tensor::{TensorTrait, Tensor, U32Tensor};
 
-fn eq_example() -> Tensor<usize> {
+fn eq_example() -> Tensor<i32> {
     let tensor_1 = TensorTrait::<u32>::new(
         shape: array![3, 3, 3].span(), data: array![0, 1, 2, 3, 4, 5, 6, 7, 8].span(),
     );
@@ -53,7 +53,7 @@ use core::array::{ArrayTrait, SpanTrait};
 
 use orion::operators::tensor::{TensorTrait, Tensor, U32Tensor};
 
-fn eq_example() -> Tensor<usize> {
+fn eq_example() -> Tensor<i32> {
     let tensor_1 = TensorTrait::<u32>::new(
         shape: array![3, 3, 3].span(), data: array![0, 1, 2, 3, 4, 5, 6, 7, 8].span(),
     );

docs/framework/operators/tensor/tensor.greater.md

@@ -1,7 +1,7 @@
 #tensor.greater
 
 ```rust
-    fn greater(self: @Tensor<T>, other: @Tensor<T>) -> Tensor<usize>;
+    fn greater(self: @Tensor<T>, other: @Tensor<T>) -> Tensor<i32>;
 ```
 
 Check if each element of the first tensor is greater than the corresponding element of the second tensor.
@@ -20,7 +20,7 @@ The input tensors must have either:
 
 ## Returns
 
-A new `Tensor<usize>` of booleans (0 or 1) with the same shape as the broadcasted inputs.
+A new `Tensor<i32>` of booleans (0 or 1) with the same shape as the broadcasted inputs.
 
 ## Examples
 
@@ -31,7 +31,7 @@ use core::array::{ArrayTrait, SpanTrait};
 
 use orion::operators::tensor::{TensorTrait, Tensor, U32Tensor};
 
-fn greater_example() -> Tensor<usize> {
+fn greater_example() -> Tensor<i32> {
     let tensor_1 = TensorTrait::<u32>::new(
         shape: array![3, 3, 3].span(), data: array![0, 1, 2, 3, 4, 5, 6, 7, 8].span(),
     );
@@ -53,7 +53,7 @@ use core::array::{ArrayTrait, SpanTrait};
 
 use orion::operators::tensor::{TensorTrait, Tensor, U32Tensor};
 
-fn greater_example() -> Tensor<usize> {
+fn greater_example() -> Tensor<i32> {
     let tensor_1 = TensorTrait::<u32>::new(
         shape: array![3, 3, 3].span(), data: array![0, 1, 2, 3, 4, 5, 6, 7, 8].span(),
     );

docs/framework/operators/tensor/tensor.greater_equal.md

@@ -1,7 +1,7 @@
 #tensor.greater_equal
 
 ```rust
-    fn greater_equal(self: @Tensor<T>, other: @Tensor<T>) -> Tensor<usize>;
+    fn greater_equal(self: @Tensor<T>, other: @Tensor<T>) -> Tensor<i32>;
 ```
 
 Check if each element of the first tensor is greater than or equal to the corresponding element of the second tensor.
@@ -31,7 +31,7 @@ use core::array::{ArrayTrait, SpanTrait};
 
 use orion::operators::tensor::{TensorTrait, Tensor, U32Tensor};
 
-fn greater_equal_example() -> Tensor<usize> {
+fn greater_equal_example() -> Tensor<i32> {
     let tensor_1 = TensorTrait::<u32>::new(
         shape: array![3, 3, 3].span(), data: array![0, 1, 2, 3, 4, 5, 6, 7, 8].span(),
     );
@@ -53,7 +53,7 @@ use core::array::{ArrayTrait, SpanTrait};
 
 use orion::operators::tensor::{TensorTrait, Tensor, U32Tensor};
 
-fn greater_equal_example() -> Tensor<usize> {
+fn greater_equal_example() -> Tensor<i32> {
     let tensor_1 = TensorTrait::<u32>::new(
         shape: array![3, 3, 3].span(), data: array![0, 1, 2, 3, 4, 5, 6, 7, 8].span(),
     );

docs/framework/operators/tensor/tensor.less.md

@@ -1,7 +1,7 @@
 #tensor.less
 
 ```rust
-    fn less(self: @Tensor<T>, other: @Tensor<T>) -> Tensor<usize>;
+    fn less(self: @Tensor<T>, other: @Tensor<T>) -> Tensor<i32>;
 ```
 
 Check if each element of the first tensor is less than the corresponding element of the second tensor.
@@ -31,7 +31,7 @@ use core::array::{ArrayTrait, SpanTrait};
 
 use orion::operators::tensor::{TensorTrait, Tensor, U32Tensor};
 
-fn less_example() -> Tensor<usize> {
+fn less_example() -> Tensor<i32> {
     let tensor_1 = TensorTrait::<u32>::new(
         shape: array![3, 3, 3].span(), data: array![0, 1, 2, 3, 4, 5, 6, 7, 8].span(),
     );
@@ -53,7 +53,7 @@ use core::array::{ArrayTrait, SpanTrait};
 
 use orion::operators::tensor::{TensorTrait, Tensor, U32Tensor};
 
-fn less_example() -> Tensor<usize> {
+fn less_example() -> Tensor<i32> {
     let tensor_1 = TensorTrait::<u32>::new(
         shape: array![3, 3, 3].span(), data: array![0, 1, 2, 3, 4, 5, 6, 7, 8].span(),
     );

docs/framework/operators/tensor/tensor.less_equal.md

@@ -1,7 +1,7 @@
 #tensor.less_equal
 
 ```rust
-    fn less_equal(self: @Tensor<T>, other: @Tensor<T>) -> Tensor<usize>;
+    fn less_equal(self: @Tensor<T>, other: @Tensor<T>) -> Tensor<i32>;
 ```
 
 Check if each element of the first tensor is less than or equal to the corresponding element of the second tensor.
@@ -31,7 +31,7 @@ use core::array::{ArrayTrait, SpanTrait};
 
 use orion::operators::tensor::{TensorTrait, Tensor, U32Tensor};
 
-fn less_equal_example() -> Tensor<usize> {
+fn less_equal_example() -> Tensor<i32> {
     let tensor_1 = TensorTrait::<u32>::new(
         shape: array![3, 3, 3].span(), data: array![0, 1, 2, 3, 4, 5, 6, 7, 8].span(),
     );
@@ -53,7 +53,7 @@ use core::array::{ArrayTrait, SpanTrait};
 
 use orion::operators::tensor::{TensorTrait, Tensor, U32Tensor};
 
-fn less_equal_example() -> Tensor<usize> {
+fn less_equal_example() -> Tensor<i32> {
     let tensor_1 = TensorTrait::<u32>::new(
         shape: array![3, 3, 3].span(), data: array![0, 1, 2, 3, 4, 5, 6, 7, 8].span(),
     );

docs/framework/operators/tensor/tensor.not.md

@@ -1,7 +1,7 @@
 #tensor.not
 
 ```rust
-    fn not(self: @Tensor<bool>) -> Tensor<bool;
+    fn not(self: @Tensor<bool>) -> Tensor<bool>;
 ```
 
 Computes the negation of the elements in the bool type input tensor.
@@ -23,7 +23,7 @@ use core::array::{ArrayTrait, SpanTrait};
 
 use orion::operators::tensor::{TensorTrait, Tensor, BoolTensor};
 
-fn not_example() -> Tensor<usize> {
+fn not_example() -> Tensor<bool> {
     let tensor = TensorTrait::new(
         shape: array![3].span(),
         data: array![

docs/framework/operators/tensor/tensor.or.md

@@ -1,7 +1,7 @@
 #tensor.or
 
 ```rust
-    fn or(self: @Tensor<T>, other: @Tensor<T>) -> Tensor<usize>;
+    fn or(self: @Tensor<T>, other: @Tensor<T>) -> Tensor<i32>;
 ```
 
 Computes the logical OR of two tensors element-wise.
@@ -20,7 +20,7 @@ The input tensors must have either:
 
 ## Returns
 
-A new `Tensor<usize>` of booleans (0 or 1) with the same shape as the broadcasted inputs.
+A new `Tensor<i32>` (0 or 1) with the same shape as the broadcasted inputs.
 
 ## Examples
 
@@ -31,7 +31,7 @@ use core::array::{ArrayTrait, SpanTrait};
 
 use orion::operators::tensor::{TensorTrait, Tensor, U32Tensor};
 
-fn or_example() -> Tensor<usize> {
+fn or_example() -> Tensor<i32> {
     let tensor_1 = TensorTrait::<u32>::new(
         shape: array![3, 3].span(), data: array![0, 1, 2, 3, 4, 5, 6, 7, 8].span(),
     );
@@ -52,7 +52,7 @@ use core::array::{ArrayTrait, SpanTrait};
 
 use orion::operators::tensor::{TensorTrait, Tensor, U32Tensor};
 
-fn or_example() -> Tensor<usize> {
+fn or_example() -> Tensor<i32> {
     let tensor_1 = TensorTrait::<u32>::new(
         shape: array![3, 3].span(), data: array![0, 1, 2, 3, 4, 5, 6, 7, 8].span(),
     );

docs/framework/operators/tensor/tensor.xor.md

@@ -1,7 +1,7 @@
 #tensor.xor
 
 ```rust
-    fn xor(self: @Tensor<T>, other: @Tensor<T>) -> Tensor<usize>;
+    fn xor(self: @Tensor<T>, other: @Tensor<T>) -> Tensor<i32>;
 ```
 
 Computes the logical XOR of two tensors element-wise.
@@ -20,7 +20,7 @@ The input tensors must have either:
 
 ## Returns
 
-A new `Tensor<usize>` of booleans (0 or 1) with the same shape as the broadcasted inputs.
+A new `Tensor<i32>` (0 or 1) with the same shape as the broadcasted inputs.
 
 ## Examples
 
@@ -31,7 +31,7 @@ use core::array::{ArrayTrait, SpanTrait};
 
 use orion::operators::tensor::{TensorTrait, Tensor, U32Tensor};
 
-fn xor_example() -> Tensor<usize> {
+fn xor_example() -> Tensor<i32> {
     let tensor_1 = TensorTrait::<u32>::new(
         shape: array![3, 3].span(), data: array![0, 1, 2, 3, 4, 5, 6, 7, 8].span(),
     );
@@ -52,7 +52,7 @@ use core::array::{ArrayTrait, SpanTrait};
 
 use orion::operators::tensor::{TensorTrait, Tensor, U32Tensor};
 
-fn xor_example() -> Tensor<usize> {
+fn xor_example() -> Tensor<i32> {
     let tensor_1 = TensorTrait::<u32>::new(
         shape: array![3, 3].span(), data: array![0, 1, 2, 3, 4, 5, 6, 7, 8].span(),
     );

nodegen/node/and.py

@@ -13,7 +13,7 @@ def default():
 
             x = Tensor(Dtype.BOOL, x.shape, x.flatten())
             y = Tensor(Dtype.BOOL, y.shape, y.flatten())
-            z = Tensor(Dtype.U32, z.shape, z.flatten())
+            z = Tensor(Dtype.I32, z.shape, z.flatten())
 
             name = "and_bool"
             make_test([x, y], z, "BoolTensor::and(@input_0, @input_1)", name)
@@ -25,7 +25,7 @@ def broadcast():
 
             x = Tensor(Dtype.BOOL, x.shape, x.flatten())
             y = Tensor(Dtype.BOOL, y.shape, y.flatten())
-            z = Tensor(Dtype.U32, z.shape, z.flatten())
+            z = Tensor(Dtype.I32, z.shape, z.flatten())
 
             name = "and_bool_broadcast"
             make_test([x, y], z, "BoolTensor::and(@input_0, @input_1)", name)

nodegen/node/equal.py

@@ -13,7 +13,7 @@ def default():
 
             x = Tensor(Dtype.U32, x.shape, x.flatten())
             y = Tensor(Dtype.U32, y.shape, y.flatten())
-            z = Tensor(Dtype.U32, z.shape, z.flatten())
+            z = Tensor(Dtype.I32, z.shape, z.flatten())
 
             name = "equal_u32"
             make_test([x, y], z, "input_0.equal(@input_1)", name)
@@ -25,7 +25,7 @@ def broadcast():
 
             x = Tensor(Dtype.U32, x.shape, x.flatten())
             y = Tensor(Dtype.U32, y.shape, y.flatten())
-            z = Tensor(Dtype.U32, z.shape, z.flatten())
+            z = Tensor(Dtype.I32, z.shape, z.flatten())
 
             name = "equal_u32_broadcast"
             make_test([x, y], z, "input_0.equal(@input_1)", name)
@@ -42,7 +42,7 @@ def default():
 
             x = Tensor(Dtype.I32, x.shape, x.flatten())
             y = Tensor(Dtype.I32, y.shape, y.flatten())
-            z = Tensor(Dtype.U32, z.shape, z.flatten())
+            z = Tensor(Dtype.I32, z.shape, z.flatten())
 
             name = "equal_i32"
             make_test([x, y], z, "input_0.equal(@input_1)", name)
@@ -54,7 +54,7 @@ def broadcast():
 
             x = Tensor(Dtype.I32, x.shape, x.flatten())
             y = Tensor(Dtype.I32, y.shape, y.flatten())
-            z = Tensor(Dtype.U32, z.shape, z.flatten())
+            z = Tensor(Dtype.I32, z.shape, z.flatten())
 
             name = "equal_i32_broadcast"
             make_test([x, y], z, "input_0.equal(@input_1)", name)
@@ -71,7 +71,7 @@ def default():
 
             x = Tensor(Dtype.I8, x.shape, x.flatten())
             y = Tensor(Dtype.I8, y.shape, y.flatten())
-            z = Tensor(Dtype.U32, z.shape, z.flatten())
+            z = Tensor(Dtype.I32, z.shape, z.flatten())
 
             name = "equal_i8"
             make_test([x, y], z, "input_0.equal(@input_1)", name)
@@ -83,7 +83,7 @@ def broadcast():
 
             x = Tensor(Dtype.I8, x.shape, x.flatten())
             y = Tensor(Dtype.I8, y.shape, y.flatten())
-            z = Tensor(Dtype.U32, z.shape, z.flatten())
+            z = Tensor(Dtype.I32, z.shape, z.flatten())
 
             name = "equal_i8_broadcast"
             make_test([x, y], z, "input_0.equal(@input_1)", name)
@@ -102,7 +102,7 @@ def default():
                 x.flatten(), FixedImpl.FP8x23))
             y = Tensor(Dtype.FP8x23, y.shape,  to_fp(
                 y.flatten(), FixedImpl.FP8x23))
-            z = Tensor(Dtype.U32, z.shape, z.flatten())
+            z = Tensor(Dtype.I32, z.shape, z.flatten())
 
             name = "equal_fp8x23"
             make_test([x, y], z, "input_0.equal(@input_1)", name)
@@ -116,7 +116,7 @@ def broadcast():
                 x.flatten(), FixedImpl.FP8x23))
             y = Tensor(Dtype.FP8x23, y.shape,  to_fp(
                 y.flatten(), FixedImpl.FP8x23))
-            z = Tensor(Dtype.U32, z.shape, z.flatten())
+            z = Tensor(Dtype.I32, z.shape, z.flatten())
 
             name = "equal_fp8x23_broadcast"
             make_test([x, y], z, "input_0.equal(@input_1)", name)
@@ -135,7 +135,7 @@ def default():
                 x.flatten(), FixedImpl.FP16x16))
             y = Tensor(Dtype.FP16x16, y.shape,  to_fp(
                 y.flatten(), FixedImpl.FP16x16))
-            z = Tensor(Dtype.U32, z.shape, z.flatten())
+            z = Tensor(Dtype.I32, z.shape, z.flatten())
 
             name = "equal_fp16x16"
             make_test([x, y], z, "input_0.equal(@input_1)", name)
@@ -149,7 +149,7 @@ def broadcast():
                 x.flatten(), FixedImpl.FP16x16))
             y = Tensor(Dtype.FP16x16, y.shape,  to_fp(
                 y.flatten(), FixedImpl.FP16x16))
-            z = Tensor(Dtype.U32, z.shape, z.flatten())
+            z = Tensor(Dtype.I32, z.shape, z.flatten())
 
             name = "equal_fp16x16_broadcast"
             make_test([x, y], z, "input_0.equal(@input_1)", name)