merge with main branch

Author: vtavana

dpctl/tensor/__init__.py

@@ -212,4 +212,7 @@
     "subtract",
     "equal",
     "sum",
+    "real",
+    "imag",
+    "conj",
 ]

dpctl/tensor/_elementwise_funcs.py

@@ -117,6 +117,7 @@
 conj(x, out=None, order='K')
 
 Computes conjugate of each element `x_i` for input array `x`.
+<<<<<<< HEAD
 
 Args:
     x (usm_ndarray):
@@ -131,6 +132,8 @@
     usm_narray:
         An array containing the element-wise conjugate values. The data type
         of the returned array is determined by the Type Promotion Rules.
+=======
+>>>>>>> 81b71d23222f799c7e6a06bacd546204121feb7d
 """
 
 conj = UnaryElementwiseFunc(
@@ -224,6 +227,7 @@
 _exp_docstring = """
 exp(x, out=None, order='K')
 
+<<<<<<< HEAD
 Computes exponential for each element `x_i` of input array `x`.
 
 Args:
@@ -240,6 +244,9 @@
         An array containing the element-wise exponential of x.
         The data type of the returned array is determined by
         the Type Promotion Rules.
+=======
+Computes exponential for each element `x_i` for input array `x`.
+>>>>>>> 81b71d23222f799c7e6a06bacd546204121feb7d
 """
 
 exp = UnaryElementwiseFunc("exp", ti._exp_result_type, ti._exp, _exp_docstring)
@@ -283,6 +290,7 @@
 imag(x, out=None, order='K')
 
 Computes imaginary part of each element `x_i` for input array `x`.
+<<<<<<< HEAD
 
 Args:
     x (usm_ndarray):
@@ -298,6 +306,8 @@
         An array containing the element-wise imaginary component of input.
         The data type of the returned array is determined
         by the Type Promotion Rules.
+=======
+>>>>>>> 81b71d23222f799c7e6a06bacd546204121feb7d
 """
 
 imag = UnaryElementwiseFunc(
@@ -518,6 +528,7 @@
 real(x, out=None, order='K')
 
 Computes real part of each element `x_i` for input array `x`.
+<<<<<<< HEAD
 
 Args:
     x (usm_ndarray):
@@ -532,6 +543,8 @@
     usm_narray:
         An array containing the element-wise real component of input. The data
         type of the returned array is determined by the Type Promotion Rules.
+=======
+>>>>>>> 81b71d23222f799c7e6a06bacd546204121feb7d
 """
 
 real = UnaryElementwiseFunc(
@@ -551,6 +564,7 @@
 _sin_docstring = """
 sin(x, out=None, order='K')
 
+<<<<<<< HEAD
 Computes sine for each element `x_i` of input array `x`.
 
 Args:
@@ -566,6 +580,9 @@
     usm_narray:
         An array containing the element-wise sine. The data type of the
         returned array is determined by the Type Promotion Rules.
+=======
+Computes sin for each element `x_i` for input array `x`.
+>>>>>>> 81b71d23222f799c7e6a06bacd546204121feb7d
 """
 
 sin = UnaryElementwiseFunc("sin", ti._sin_result_type, ti._sin, _sin_docstring)

dpctl/tests/elementwise/test_sincos.py

@@ -36,6 +36,7 @@ def test_sincos_out_type(np_call, dpt_call, dtype):
     skip_if_dtype_not_supported(dtype, q)
 
     X = dpt.asarray(0, dtype=dtype, sycl_queue=q)
+
     expected_dtype = np_call(np.array(0, dtype=dtype)).dtype
     expected_dtype = _map_to_device_dtype(expected_dtype, q.sycl_device)
     assert dpt_call(X).dtype == expected_dtype
@@ -91,6 +92,7 @@ def test_sincos_usm_type(np_call, dpt_call, usm_type):
     X[..., 1::2] = np.pi / 3
 
     Y = dpt_call(X)
+
     assert Y.usm_type == X.usm_type
     assert Y.sycl_queue == X.sycl_queue
     assert Y.flags.c_contiguous