fix cross & unskip tests for cross (#509)

* fix cross & unskip tests for cross

Author: Rubtsowa

dpnp/dpnp_algo/dpnp_algo_mathematical.pyx

@@ -144,7 +144,7 @@ cpdef dparray dpnp_cross(dparray x1, dparray x2):
         (dpnp.float32, dpnp.float32): dpnp.float32,
     }
 
-    res_type = types_map.get((x1.dtype, x2.dtype), dpnp.float64)
+    res_type = types_map.get((x1.dtype.type, x2.dtype.type), dpnp.float64)
 
     cdef dparray result = dparray(3, dtype=res_type)
 

dpnp/dpnp_iface_mathematical.py

@@ -328,7 +328,7 @@ def copysign(x1, x2, **kwargs):
     return call_origin(numpy.copysign, x1, x2, **kwargs)
 
 
-def cross(x1, x2, **kwargs):
+def cross(x1, x2, axisa=-1, axisb=-1, axisc=-1, axis=None):
     """
     Return the cross product of two (arrays of) vectors.
 
@@ -354,7 +354,7 @@ def cross(x1, x2, **kwargs):
 
     """
 
-    if not use_origin_backend(x1) and not kwargs:
+    if not use_origin_backend(x1):
         if not isinstance(x1, dparray):
             pass
         elif not isinstance(x2, dparray):
@@ -363,10 +363,18 @@ def cross(x1, x2, **kwargs):
             pass
         elif x1.shape != (3,) or x2.shape != (3,):
             pass
+        elif axisa != -1:
+            pass
+        elif axisb != -1:
+            pass
+        elif axisc != -1:
+            pass
+        elif axis is not None:
+            pass
         else:
             return dpnp_cross(x1, x2)
 
-    return call_origin(numpy.cross, x1, x2, **kwargs)
+    return call_origin(numpy.cross, x1, x2, axisa, axisb, axisc, axis)
 
 
 def cumprod(x1, **kwargs):

tests/skipped_tests.tbl

@@ -817,16 +817,6 @@ tests/third_party/cupy/linalg_tests/test_einsum.py::TestEinSumLarge_param_9_{opt
 tests/third_party/cupy/linalg_tests/test_einsum.py::TestEinSumUnaryOperationWithScalar::test_scalar_float
 tests/third_party/cupy/linalg_tests/test_einsum.py::TestEinSumUnaryOperationWithScalar::test_scalar_int
 tests/third_party/cupy/linalg_tests/test_einsum.py::TestListArgEinSumError::test_invalid_sub1
-tests/third_party/cupy/linalg_tests/test_product.py::TestCrossProduct_param_0_{params=((3,), (3,), -1, -1, -1)}::test_cross
-tests/third_party/cupy/linalg_tests/test_product.py::TestCrossProduct_param_1_{params=((1, 2), (1, 2), -1, -1, 1)}::test_cross
-tests/third_party/cupy/linalg_tests/test_product.py::TestCrossProduct_param_2_{params=((1, 3), (1, 3), 1, -1, -1)}::test_cross
-tests/third_party/cupy/linalg_tests/test_product.py::TestCrossProduct_param_3_{params=((1, 2), (1, 3), -1, -1, 1)}::test_cross
-tests/third_party/cupy/linalg_tests/test_product.py::TestCrossProduct_param_4_{params=((2, 2), (1, 3), -1, -1, 0)}::test_cross
-tests/third_party/cupy/linalg_tests/test_product.py::TestCrossProduct_param_5_{params=((3, 3), (1, 2), 0, -1, -1)}::test_cross
-tests/third_party/cupy/linalg_tests/test_product.py::TestCrossProduct_param_6_{params=((0, 3), (0, 3), -1, -1, -1)}::test_cross
-tests/third_party/cupy/linalg_tests/test_product.py::TestCrossProduct_param_7_{params=((2, 0, 3), (2, 0, 3), 0, 0, 0)}::test_cross
-tests/third_party/cupy/linalg_tests/test_product.py::TestCrossProduct_param_8_{params=((2, 4, 5, 3), (2, 4, 5, 3), -1, -1, 0)}::test_cross
-tests/third_party/cupy/linalg_tests/test_product.py::TestCrossProduct_param_9_{params=((2, 4, 5, 2), (2, 4, 5, 2), 0, 0, -1)}::test_cross
 tests/third_party/cupy/linalg_tests/test_product.py::TestDotFor0Dim_param_10_{shape=((4, 2), ()), trans_a=False, trans_b=True}::test_dot
 tests/third_party/cupy/linalg_tests/test_product.py::TestDotFor0Dim_param_11_{shape=((4, 2), ()), trans_a=False, trans_b=False}::test_dot
 tests/third_party/cupy/linalg_tests/test_product.py::TestDotFor0Dim_param_4_{shape=((), (2, 4)), trans_a=True, trans_b=True}::test_dot

tests/test_mathematical.py

@@ -127,19 +127,33 @@ def test_trapz_without_params(self, y_array, dx):
 
 class TestCross:
 
+    @pytest.mark.parametrize("axis", [None, 0],
+                             ids=['None', '0'])
+    @pytest.mark.parametrize("axisc", [-1, 0],
+                             ids=['-1', '0'])
+    @pytest.mark.parametrize("axisb", [-1, 0],
+                             ids=['-1', '0'])
+    @pytest.mark.parametrize("axisa", [-1, 0],
+                             ids=['-1', '0'])
     @pytest.mark.parametrize("x1", [[1, 2, 3],
                                     [1., 2.5, 6.],
-                                    [2, 4, 6]])
+                                    [2, 4, 6]],
+                             ids=['[1, 2, 3]',
+                                  '[1., 2.5, 6.]',
+                                  '[2, 4, 6]'])
     @pytest.mark.parametrize("x2", [[4, 5, 6],
                                     [1., 5., 2.],
-                                    [6, 4, 3]])
-    def test_cross_3x3(self, x1, x2):
+                                    [6, 4, 3]],
+                             ids=['[4, 5, 6]',
+                                  '[1., 5., 2.]',
+                                  '[6, 4, 3]'])
+    def test_cross_3x3(self, x1, x2, axisa, axisb, axisc, axis):
         x1_ = numpy.array(x1)
         ix1_ = inp.array(x1_)
 
         x2_ = numpy.array(x2)
         ix2_ = inp.array(x2_)
 
-        result = inp.cross(ix1_, ix2_)
-        expected = numpy.cross(x1_, x2_)
+        result = inp.cross(ix1_, ix2_, axisa, axisb, axisc, axis)
+        expected = numpy.cross(x1_, x2_, axisa, axisb, axisc, axis)
         numpy.testing.assert_array_equal(expected, result)