rebase and resolve conflicts

Author: vtavana

dpnp/backend/include/dpnp_iface_fptr.hpp

@@ -313,20 +313,20 @@ enum class DPNPFuncName : size_t
     DPNP_FN_PUT_ALONG_AXIS_EXT, /**< Used in numpy.put_along_axis() impl,
                                    requires extra parameters */
     DPNP_FN_QR,                 /**< Used in numpy.linalg.qr() impl  */
-    DPNP_FN_QR_EXT,          /**< Used in numpy.linalg.qr() impl, requires extra
-                                parameters */
-    DPNP_FN_RADIANS,         /**< Used in numpy.radians() impl  */
-    DPNP_FN_RADIANS_EXT,     /**< Used in numpy.radians() impl, requires extra
-                                parameters */
-    DPNP_FN_REMAINDER,       /**< Used in numpy.remainder() impl  */
-    DPNP_FN_RECIP,           /**< Used in numpy.recip() impl  */
-    DPNP_FN_RECIP_EXT,       /**< Used in numpy.recip() impl, requires extra
-                                parameters */
-    DPNP_FN_REPEAT,          /**< Used in numpy.repeat() impl  */
-    DPNP_FN_REPEAT_EXT,      /**< Used in numpy.repeat() impl, requires extra
-                                parameters */
-    DPNP_FN_RIGHT_SHIFT,     /**< Used in numpy.right_shift() impl  */
-    DPNP_FN_RNG_BETA,        /**< Used in numpy.random.beta() impl  */
+    DPNP_FN_QR_EXT,       /**< Used in numpy.linalg.qr() impl, requires extra
+                             parameters */
+    DPNP_FN_RADIANS,      /**< Used in numpy.radians() impl  */
+    DPNP_FN_RADIANS_EXT,  /**< Used in numpy.radians() impl, requires extra
+                             parameters */
+    DPNP_FN_REMAINDER,    /**< Used in numpy.remainder() impl  */
+    DPNP_FN_RECIP,        /**< Used in numpy.recip() impl  */
+    DPNP_FN_RECIP_EXT,    /**< Used in numpy.recip() impl, requires extra
+                             parameters */
+    DPNP_FN_REPEAT,       /**< Used in numpy.repeat() impl  */
+    DPNP_FN_REPEAT_EXT,   /**< Used in numpy.repeat() impl, requires extra
+                             parameters */
+    DPNP_FN_RIGHT_SHIFT,  /**< Used in numpy.right_shift() impl  */
+    DPNP_FN_RNG_BETA,     /**< Used in numpy.random.beta() impl  */
     DPNP_FN_RNG_BETA_EXT, /**< Used in numpy.random.beta() impl, requires extra
                              parameters */
     DPNP_FN_RNG_BINOMIAL, /**< Used in numpy.random.binomial() impl  */

dpnp/dpnp_algo/dpnp_elementwise_common.py

@@ -1213,10 +1213,10 @@ def dpnp_remainder(x1, x2, out=None, order="K"):
 
     res_usm = remainder_func(
         x1_usm_or_scalar, x2_usm_or_scalar, out=out_usm, order=order
-<<<<<<< HEAD
     )
     return dpnp_array._create_from_usm_ndarray(res_usm)
 
+
 _right_shift_docstring_ = """
 right_shift(x1, x2, out=None, order='K')
 
@@ -1255,9 +1255,8 @@ def dpnp_right_shift(x1, x2, out=None, order="K"):
         ti._bitwise_right_shift_result_type,
         ti._bitwise_right_shift,
         _right_shift_docstring_,
-=======
->>>>>>> address reviewer's comments
     )
+    res_usm = func(x1_usm_or_scalar, x2_usm_or_scalar, out=out_usm, order=order)
     return dpnp_array._create_from_usm_ndarray(res_usm)