address comments

Author: vtavana

dpnp/backend/extensions/vm/vm_py.cpp

@@ -152,7 +152,6 @@ PYBIND11_MODULE(_vm_impl, m)
               py::arg("sycl_queue"), py::arg("src"), py::arg("dst"));
     }
 
-<<<<<<< HEAD
     // UnaryUfunc: ==== Floor(x) ====
     {
         vm_ext::init_ufunc_dispatch_vector<unary_impl_fn_ptr_t,
@@ -177,7 +176,10 @@ PYBIND11_MODULE(_vm_impl, m)
         };
         m.def("_mkl_floor_to_call", floor_need_to_call_pyapi,
               "Check input arguments to answer if `floor` function from "
-=======
+              "OneMKL VM library can be used",
+              py::arg("sycl_queue"), py::arg("src"), py::arg("dst"));
+    }
+
     // UnaryUfunc: ==== Conj(x) ====
     {
         vm_ext::init_ufunc_dispatch_vector<unary_impl_fn_ptr_t,
@@ -202,7 +204,6 @@ PYBIND11_MODULE(_vm_impl, m)
         };
         m.def("_mkl_conj_to_call", conj_need_to_call_pyapi,
               "Check input arguments to answer if `conj` function from "
->>>>>>> use_dpctl_conj_for_dpnp
               "OneMKL VM library can be used",
               py::arg("sycl_queue"), py::arg("src"), py::arg("dst"));
     }

dpnp/dpnp_algo/dpnp_elementwise_common.py

@@ -394,36 +394,6 @@ def dpnp_ceil(x, out=None, order="K"):
 """
 
 
-def dpnp_cos(x, out=None, order="K"):
-    """
-    Invokes cos() function from pybind11 extension of OneMKL VM if possible.
-
-    Otherwise fully relies on dpctl.tensor implementation for cos() function.
-
-    """
-
-    def _call_cos(src, dst, sycl_queue, depends=None):
-        """A callback to register in UnaryElementwiseFunc class of dpctl.tensor"""
-
-        if depends is None:
-            depends = []
-
-        if vmi._mkl_cos_to_call(sycl_queue, src, dst):
-            # call pybind11 extension for cos() function from OneMKL VM
-            return vmi._cos(sycl_queue, src, dst, depends)
-        return ti._cos(src, dst, sycl_queue, depends)
-
-    # dpctl.tensor only works with usm_ndarray
-    x1_usm = dpnp.get_usm_ndarray(x)
-    out_usm = None if out is None else dpnp.get_usm_ndarray(out)
-
-    func = UnaryElementwiseFunc(
-        "cos", ti._cos_result_type, _call_cos, _cos_docstring
-    )
-    res_usm = func(x1_usm, out=out_usm, order=order)
-    return dpnp_array._create_from_usm_ndarray(res_usm)
-
-
 _conj_docstring = """
 conj(x, out=None, order='K')
 
@@ -462,6 +432,36 @@ def _call_conj(src, dst, sycl_queue, depends=None):
 )
 
 
+def dpnp_cos(x, out=None, order="K"):
+    """
+    Invokes cos() function from pybind11 extension of OneMKL VM if possible.
+
+    Otherwise fully relies on dpctl.tensor implementation for cos() function.
+
+    """
+
+    def _call_cos(src, dst, sycl_queue, depends=None):
+        """A callback to register in UnaryElementwiseFunc class of dpctl.tensor"""
+
+        if depends is None:
+            depends = []
+
+        if vmi._mkl_cos_to_call(sycl_queue, src, dst):
+            # call pybind11 extension for cos() function from OneMKL VM
+            return vmi._cos(sycl_queue, src, dst, depends)
+        return ti._cos(src, dst, sycl_queue, depends)
+
+    # dpctl.tensor only works with usm_ndarray
+    x1_usm = dpnp.get_usm_ndarray(x)
+    out_usm = None if out is None else dpnp.get_usm_ndarray(out)
+
+    func = UnaryElementwiseFunc(
+        "cos", ti._cos_result_type, _call_cos, _cos_docstring
+    )
+    res_usm = func(x1_usm, out=out_usm, order=order)
+    return dpnp_array._create_from_usm_ndarray(res_usm)
+
+
 def dpnp_conj(x, out=None, order="K"):
     """
     Invokes conj() function from pybind11 extension of OneMKL VM if possible.

dpnp/dpnp_array.py

@@ -622,7 +622,7 @@ def conj(self):
 
         """
 
-        if not dpnp.issubsctype(self.dtype, dpnp.complex_):
+        if not dpnp.issubsctype(self.dtype, dpnp.complexfloating):
             return self
         else:
             return dpnp.conjugate(self)
@@ -635,7 +635,7 @@ def conjugate(self):
 
         """
 
-        if not dpnp.issubsctype(self.dtype, dpnp.complex_):
+        if not dpnp.issubsctype(self.dtype, dpnp.complexfloating):
             return self
         else:
             return dpnp.conjugate(self)

dpnp/dpnp_iface_mathematical.py

@@ -397,7 +397,7 @@ def conjugate(
     Examples
     --------
     >>> import dpnp as np
-    >>> np.conjugate(1+2j)
+    >>> np.conjugate(np.array(1+2j))
     (1-2j)
 
     >>> x = np.eye(2) + 1j * np.eye(2)

tests/third_party/cupy/math_tests/test_arithmetic.py

@@ -26,7 +26,12 @@
         testing.product(
             {
                 "nargs": [1],
-                "name": ["reciprocal", "angle"],
+                "name": [
+                    "reciprocal",
+                    "conj",
+                    "conjugate",
+                    "angle",
+                ],
             }
         )
         + testing.product(
@@ -68,6 +73,18 @@ def test_raises_with_numpy_input(self):
 @testing.parameterize(
     *(
         testing.product(
+            {
+                "arg1": (
+                    [
+                        testing.shaped_arange((2, 3), numpy, dtype=d)
+                        for d in all_types
+                    ]
+                    + [0, 0.0j, 0j, 2, 2.0, 2j, True, False]
+                ),
+                "name": ["conj", "conjugate"],
+            }
+        )
+        + testing.product(
             {
                 "arg1": (
                     [