Adding to multiply func support of complex inputs (#1126)

Author: Alexander-Makaryev

dpnp/backend/kernels/dpnp_krnl_elemwise.cpp

@@ -817,6 +817,34 @@ static void func_map_init_elemwise_2arg_3type(func_map_t& fmap)
     fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_DBL][eft_LNG] = {eft_DBL, (void*)dpnp_multiply_c<double, double, int64_t>};
     fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_DBL][eft_FLT] = {eft_DBL, (void*)dpnp_multiply_c<double, double, float>};
     fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_DBL][eft_DBL] = {eft_DBL, (void*)dpnp_multiply_c<double, double, double>};
+
+    fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_C64][eft_BLN] = {
+        eft_C64, (void*)dpnp_multiply_c<std::complex<float>, std::complex<float>, bool>};
+    fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_C64][eft_INT] = {
+        eft_C64, (void*)dpnp_multiply_c<std::complex<float>, std::complex<float>, int32_t>};
+    fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_C64][eft_LNG] = {
+        eft_C64, (void*)dpnp_multiply_c<std::complex<float>, std::complex<float>, int64_t>};
+    fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_C64][eft_FLT] = {
+        eft_C64, (void*)dpnp_multiply_c<std::complex<float>, std::complex<float>, float>};
+    fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_C64][eft_DBL] = {
+        eft_C128, (void*)dpnp_multiply_c<std::complex<double>, std::complex<float>, double>};
+    fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_C64][eft_C64] = {
+        eft_C64, (void*)dpnp_multiply_c<std::complex<float>, std::complex<float>, std::complex<float>>};
+    fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_C64][eft_C128] = {
+        eft_C128, (void*)dpnp_multiply_c<std::complex<double>, std::complex<float>, std::complex<double>>};
+
+    fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_C128][eft_BLN] = {
+        eft_C128, (void*)dpnp_multiply_c<std::complex<double>, std::complex<double>, bool>};
+    fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_C128][eft_INT] = {
+        eft_C128, (void*)dpnp_multiply_c<std::complex<double>, std::complex<double>, int32_t>};
+    fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_C128][eft_LNG] = {
+        eft_C128, (void*)dpnp_multiply_c<std::complex<double>, std::complex<double>, int64_t>};
+    fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_C128][eft_FLT] = {
+        eft_C128, (void*)dpnp_multiply_c<std::complex<double>, std::complex<double>, float>};
+    fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_C128][eft_DBL] = {
+        eft_C128, (void*)dpnp_multiply_c<std::complex<double>, std::complex<double>, double>};
+    fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_C128][eft_C64] = {
+        eft_C128, (void*)dpnp_multiply_c<std::complex<double>, std::complex<double>, std::complex<float>>};
     fmap[DPNPFuncName::DPNP_FN_MULTIPLY][eft_C128][eft_C128] = {
         eft_C128, (void*)dpnp_multiply_c<std::complex<double>, std::complex<double>, std::complex<double>>};
 

tests/test_mathematical.py

@@ -54,32 +54,12 @@ def test_diff(array):
     numpy.testing.assert_allclose(expected, result)
 
 
-@pytest.mark.parametrize("data",
-                         [[[1 + 1j, -2j], [3 - 3j, 4j]]],
-                         ids=['[[1+1j, -2j], [3-3j, 4j]]'])
-def test_multiply_complex(data):
-    np_a = numpy.array(data)
-    dpnp_a = dpnp.array(data)
-
-    result = dpnp.multiply(dpnp_a, dpnp_a)
-    expected = numpy.multiply(np_a, np_a)
-    numpy.testing.assert_array_equal(result, expected)
-
-    result = dpnp.multiply(dpnp_a, 0.5j)
-    expected = numpy.multiply(np_a, 0.5j)
-    numpy.testing.assert_array_equal(result, expected)
-
-    result = dpnp.multiply(0.5j, dpnp_a)
-    expected = numpy.multiply(0.5j, np_a)
-    numpy.testing.assert_array_equal(result, expected)
-
-
 @pytest.mark.parametrize("dtype1",
-                         [numpy.bool_, numpy.float64, numpy.float32, numpy.int64, numpy.int32],
-                         ids=['numpy.bool_', 'numpy.float64', 'numpy.float32', 'numpy.int64', 'numpy.int32'])
+                         [numpy.bool_, numpy.float64, numpy.float32, numpy.int64, numpy.int32, numpy.complex64, numpy.complex128],
+                         ids=['numpy.bool_', 'numpy.float64', 'numpy.float32', 'numpy.int64', 'numpy.int32', 'numpy.complex64', 'numpy.complex128'])
 @pytest.mark.parametrize("dtype2",
-                         [numpy.bool_, numpy.float64, numpy.float32, numpy.int64, numpy.int32],
-                         ids=['numpy.bool_', 'numpy.float64', 'numpy.float32', 'numpy.int64', 'numpy.int32'])
+                         [numpy.bool_, numpy.float64, numpy.float32, numpy.int64, numpy.int32, numpy.complex64, numpy.complex128],
+                         ids=['numpy.bool_', 'numpy.float64', 'numpy.float32', 'numpy.int64', 'numpy.int32', 'numpy.complex64', 'numpy.complex128'])
 @pytest.mark.parametrize("data",
                          [[[1, 2], [3, 4]]],
                          ids=['[[1, 2], [3, 4]]'])