refactor: move helper dims_and_offsets to general hypothesis helpers …

…and remove duplications making additional functionality easier to add

ivy_tests/test_ivy/helpers/hypothesis_helpers/general_helpers.py

@@ -685,3 +685,17 @@ def get_factor(n):
         else shape
     )
     return shape_
+
+
+@st.composite
+def dims_and_offset(draw, shape):
+    shape_actual = draw(shape)
+    dim1 = draw(get_axis(shape=shape, force_int=True))
+    dim2 = draw(get_axis(shape=shape, force_int=True))
+    while dim1 == dim2:
+        dim2 = draw(get_axis(shape=shape, force_int=True))
+
+    offset = draw(
+        st.integers(min_value=-shape_actual[dim1], max_value=shape_actual[dim1])
+    )
+    return dim1, dim2, offset

ivy_tests/test_ivy/test_frontends/test_paddle/test_linalg.py

@@ -171,17 +171,6 @@ def _transpose_helper(draw):
     return dtype, x, perm
 
 
-@st.composite
-def dims_and_offset(draw, shape):
-    shape_actual = draw(shape)
-    dim1 = draw(helpers.get_axis(shape=shape, force_int=True))
-    dim2 = draw(helpers.get_axis(shape=shape, force_int=True))
-    offset = draw(
-        st.integers(min_value=-shape_actual[dim1], max_value=shape_actual[dim1])
-    )
-    return dim1, dim2, offset
-
-
 # Helpers #
 # ------ #
 
@@ -706,7 +695,7 @@ def test_paddle_eigvalsh(
         available_dtypes=helpers.get_dtypes("valid"),
         shape=st.shared(helpers.get_shape(min_num_dims=2), key="shape"),
     ),
-    axis_and_offset=dims_and_offset(
+    axis_and_offset=helpers.dims_and_offset(
         shape=st.shared(helpers.get_shape(min_num_dims=2), key="shape")
     ),
 )

ivy_tests/test_ivy/test_frontends/test_paddle/test_tensor/test_tensor.py

@@ -424,18 +424,6 @@ def _reshape_helper(draw):
     return dtypes, x, reshape_shape
 
 
-# diagonal
-@st.composite
-def dims_and_offset(draw, shape):
-    shape_actual = draw(shape)
-    dim1 = draw(helpers.get_axis(shape=shape, force_int=True))
-    dim2 = draw(helpers.get_axis(shape=shape, force_int=True))
-    offset = draw(
-        st.integers(min_value=-shape_actual[dim1], max_value=shape_actual[dim1])
-    )
-    return dim1, dim2, offset
-
-
 # expand helper function
 @st.composite
 def dtypes_x_shape(draw):
@@ -2755,7 +2743,7 @@ def test_paddle_device(
         available_dtypes=helpers.get_dtypes("valid"),
         shape=st.shared(helpers.get_shape(min_num_dims=2), key="shape"),
     ),
-    dims_and_offset=dims_and_offset(
+    dims_and_offset=helpers.dims_and_offset(
         shape=st.shared(helpers.get_shape(min_num_dims=2), key="shape")
     ),
 )

ivy_tests/test_ivy/test_frontends/test_torch/test_miscellaneous_ops.py

@@ -191,17 +191,6 @@ def complex_strategy(
     return tuple(shape)
 
 
-@st.composite
-def dims_and_offset(draw, shape):
-    shape_actual = draw(shape)
-    dim1 = draw(helpers.get_axis(shape=shape, force_int=True))
-    dim2 = draw(helpers.get_axis(shape=shape, force_int=True))
-    offset = draw(
-        st.integers(min_value=-shape_actual[dim1], max_value=shape_actual[dim1])
-    )
-    return dim1, dim2, offset
-
-
 # cross
 @st.composite
 def dtype_value1_value2_axis(
@@ -900,7 +889,7 @@ def test_torch_diagflat(
         available_dtypes=helpers.get_dtypes("float"),
         shape=st.shared(helpers.get_shape(min_num_dims=2), key="shape"),
     ),
-    dims_and_offset=dims_and_offset(
+    dims_and_offset=helpers.dims_and_offset(
         shape=st.shared(helpers.get_shape(min_num_dims=2), key="shape")
     ),
 )

ivy_tests/test_ivy/test_frontends/test_torch/test_tensor.py

@@ -417,18 +417,6 @@ def _unfold_args(draw):
     return values_dtype, values, axis, size, step
 
 
-# diagonal
-@st.composite
-def dims_and_offset(draw, shape):
-    shape_actual = draw(shape)
-    dim1 = draw(helpers.get_axis(shape=shape, force_int=True))
-    dim2 = draw(helpers.get_axis(shape=shape, force_int=True))
-    offset = draw(
-        st.integers(min_value=-shape_actual[dim1], max_value=shape_actual[dim1])
-    )
-    return dim1, dim2, offset
-
-
 # --- Main --- #
 # ------------ #
 
@@ -5898,7 +5886,7 @@ def test_torch_diag(
         available_dtypes=helpers.get_dtypes("valid"),
         shape=st.shared(helpers.get_shape(min_num_dims=2), key="shape"),
     ),
-    dims_and_offset=dims_and_offset(
+    dims_and_offset=helpers.dims_and_offset(
         shape=st.shared(helpers.get_shape(min_num_dims=2), key="shape")
     ),
 )