rebase and resolve conflicts

Author: vtavana

dpnp/backend/extensions/vm/types_matrix.hpp

@@ -81,14 +81,15 @@ struct CeilOutputType
         dpctl_td_ns::TypeMapResultEntry<T, double, double>,
         dpctl_td_ns::TypeMapResultEntry<T, float, float>,
         dpctl_td_ns::DefaultResultEntry<void>>::result_type;
-}
+};
 
 /**
  * @brief A factory to define pairs of supported types for which
  * MKL VM library provides support in oneapi::mkl::vm::conj<T> function.
  *
  * @tparam T Type of input vector `a` and of result vector `y`.
  */
+template <typename T>
 struct ConjOutputType
 {
     using value_type = typename std::disjunction<

dpnp/backend/extensions/vm/vm_py.cpp

@@ -124,6 +124,34 @@ PYBIND11_MODULE(_vm_impl, m)
               py::arg("sycl_queue"), py::arg("src"), py::arg("dst"));
     }
 
+    // UnaryUfunc: ==== Conj(x) ====
+    {
+        vm_ext::init_ufunc_dispatch_vector<unary_impl_fn_ptr_t,
+                                           vm_ext::ConjContigFactory>(
+            conj_dispatch_vector);
+
+        auto conj_pyapi = [&](sycl::queue exec_q, arrayT src, arrayT dst,
+                              const event_vecT &depends = {}) {
+            return vm_ext::unary_ufunc(exec_q, src, dst, depends,
+                                       conj_dispatch_vector);
+        };
+        m.def("_conj", conj_pyapi,
+              "Call `conj` function from OneMKL VM library to compute "
+              "conjugate of vector elements",
+              py::arg("sycl_queue"), py::arg("src"), py::arg("dst"),
+              py::arg("depends") = py::list());
+
+        auto conj_need_to_call_pyapi = [&](sycl::queue exec_q, arrayT src,
+                                           arrayT dst) {
+            return vm_ext::need_to_call_unary_ufunc(exec_q, src, dst,
+                                                    conj_dispatch_vector);
+        };
+        m.def("_mkl_conj_to_call", conj_need_to_call_pyapi,
+              "Check input arguments to answer if `conj` function from "
+              "OneMKL VM library can be used",
+              py::arg("sycl_queue"), py::arg("src"), py::arg("dst"));
+    }
+
     // UnaryUfunc: ==== Cos(x) ====
     {
         vm_ext::init_ufunc_dispatch_vector<unary_impl_fn_ptr_t,
@@ -180,34 +208,6 @@ PYBIND11_MODULE(_vm_impl, m)
               py::arg("sycl_queue"), py::arg("src"), py::arg("dst"));
     }
 
-    // UnaryUfunc: ==== Conj(x) ====
-    {
-        vm_ext::init_ufunc_dispatch_vector<unary_impl_fn_ptr_t,
-                                           vm_ext::ConjContigFactory>(
-            conj_dispatch_vector);
-
-        auto conj_pyapi = [&](sycl::queue exec_q, arrayT src, arrayT dst,
-                              const event_vecT &depends = {}) {
-            return vm_ext::unary_ufunc(exec_q, src, dst, depends,
-                                       conj_dispatch_vector);
-        };
-        m.def("_conj", conj_pyapi,
-              "Call `conj` function from OneMKL VM library to compute "
-              "conjugate of vector elements",
-              py::arg("sycl_queue"), py::arg("src"), py::arg("dst"),
-              py::arg("depends") = py::list());
-
-        auto conj_need_to_call_pyapi = [&](sycl::queue exec_q, arrayT src,
-                                           arrayT dst) {
-            return vm_ext::need_to_call_unary_ufunc(exec_q, src, dst,
-                                                    conj_dispatch_vector);
-        };
-        m.def("_mkl_conj_to_call", conj_need_to_call_pyapi,
-              "Check input arguments to answer if `conj` function from "
-              "OneMKL VM library can be used",
-              py::arg("sycl_queue"), py::arg("src"), py::arg("dst"));
-    }
-
     // UnaryUfunc: ==== Ln(x) ====
     {
         vm_ext::init_ufunc_dispatch_vector<unary_impl_fn_ptr_t,