Update lapack extension to use init_dispatch_vector() and init_dispatch_table() from common utils

Author: antonwolfy

dpnp/backend/extensions/lapack/CMakeLists.txt

@@ -76,8 +76,8 @@ endif()
 
 set_target_properties(${python_module_name} PROPERTIES CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-target_include_directories(${python_module_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
-target_include_directories(${python_module_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../src)
+target_include_directories(${python_module_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../)
+target_include_directories(${python_module_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common)
 
 target_include_directories(${python_module_name} PUBLIC ${Dpctl_INCLUDE_DIR})
 target_include_directories(${python_module_name} PUBLIC ${Dpctl_TENSOR_INCLUDE_DIR})

dpnp/backend/extensions/lapack/evd_common_utils.hpp

@@ -30,25 +30,11 @@
 // dpctl tensor headers
 #include "utils/memory_overlap.hpp"
 #include "utils/output_validation.hpp"
-#include "utils/type_dispatch.hpp"
 
 namespace dpnp::extensions::lapack::evd
 {
-namespace dpctl_td_ns = dpctl::tensor::type_dispatch;
 namespace py = pybind11;
 
-template <typename dispatchT,
-          template <typename fnT, typename T, typename RealT>
-          typename factoryT>
-void init_evd_dispatch_table(
-    dispatchT evd_dispatch_table[][dpctl_td_ns::num_types])
-{
-    dpctl_td_ns::DispatchTableBuilder<dispatchT, factoryT,
-                                      dpctl_td_ns::num_types>
-        contig;
-    contig.populate_dispatch_table(evd_dispatch_table);
-}
-
 inline void common_evd_checks(sycl::queue &exec_q,
                               const dpctl::tensor::usm_ndarray &eig_vecs,
                               const dpctl::tensor::usm_ndarray &eig_vals,

dpnp/backend/extensions/lapack/geqrf.cpp

@@ -27,6 +27,9 @@
 
 #include <pybind11/pybind11.h>
 
+// utils extension header
+#include "ext/common.hpp"
+
 // dpctl tensor headers
 #include "utils/memory_overlap.hpp"
 #include "utils/sycl_alloc_utils.hpp"
@@ -35,14 +38,14 @@
 #include "geqrf.hpp"
 #include "types_matrix.hpp"
 
-#include "dpnp_utils.hpp"
-
 namespace dpnp::extensions::lapack
 {
 namespace mkl_lapack = oneapi::mkl::lapack;
 namespace py = pybind11;
 namespace type_utils = dpctl::tensor::type_utils;
 
+using ext::common::init_dispatch_vector;
+
 typedef sycl::event (*geqrf_impl_fn_ptr_t)(sycl::queue &,
                                            const std::int64_t,
                                            const std::int64_t,
@@ -250,9 +253,7 @@ struct GeqrfContigFactory
 
 void init_geqrf_dispatch_vector(void)
 {
-    dpctl_td_ns::DispatchVectorBuilder<geqrf_impl_fn_ptr_t, GeqrfContigFactory,
-                                       dpctl_td_ns::num_types>
-        contig;
-    contig.populate_dispatch_vector(geqrf_dispatch_vector);
+    init_dispatch_vector<geqrf_impl_fn_ptr_t, GeqrfContigFactory>(
+        geqrf_dispatch_vector);
 }
 } // namespace dpnp::extensions::lapack

dpnp/backend/extensions/lapack/geqrf_batch.cpp

@@ -27,6 +27,9 @@
 
 #include <pybind11/pybind11.h>
 
+// utils extension header
+#include "ext/common.hpp"
+
 // dpctl tensor headers
 #include "utils/memory_overlap.hpp"
 #include "utils/sycl_alloc_utils.hpp"
@@ -35,14 +38,14 @@
 #include "geqrf.hpp"
 #include "types_matrix.hpp"
 
-#include "dpnp_utils.hpp"
-
 namespace dpnp::extensions::lapack
 {
 namespace mkl_lapack = oneapi::mkl::lapack;
 namespace py = pybind11;
 namespace type_utils = dpctl::tensor::type_utils;
 
+using ext::common::init_dispatch_vector;
+
 typedef sycl::event (*geqrf_batch_impl_fn_ptr_t)(
     sycl::queue &,
     std::int64_t,
@@ -260,10 +263,7 @@ struct GeqrfBatchContigFactory
 
 void init_geqrf_batch_dispatch_vector(void)
 {
-    dpctl_td_ns::DispatchVectorBuilder<geqrf_batch_impl_fn_ptr_t,
-                                       GeqrfBatchContigFactory,
-                                       dpctl_td_ns::num_types>
-        contig;
-    contig.populate_dispatch_vector(geqrf_batch_dispatch_vector);
+    init_dispatch_vector<geqrf_batch_impl_fn_ptr_t, GeqrfBatchContigFactory>(
+        geqrf_batch_dispatch_vector);
 }
 } // namespace dpnp::extensions::lapack

dpnp/backend/extensions/lapack/gesv.cpp

@@ -28,6 +28,9 @@
 
 #include <pybind11/pybind11.h>
 
+// utils extension header
+#include "ext/common.hpp"
+
 // dpctl tensor headers
 #include "utils/type_utils.hpp"
 
@@ -43,6 +46,7 @@ namespace py = pybind11;
 namespace type_utils = dpctl::tensor::type_utils;
 
 using dpctl::tensor::alloc_utils::sycl_free_noexcept;
+using ext::common::init_dispatch_vector;
 
 typedef sycl::event (*gesv_impl_fn_ptr_t)(sycl::queue &,
                                           const std::int64_t,
@@ -284,9 +288,7 @@ struct GesvContigFactory
 
 void init_gesv_dispatch_vector(void)
 {
-    dpctl_td_ns::DispatchVectorBuilder<gesv_impl_fn_ptr_t, GesvContigFactory,
-                                       dpctl_td_ns::num_types>
-        contig;
-    contig.populate_dispatch_vector(gesv_dispatch_vector);
+    init_dispatch_vector<gesv_impl_fn_ptr_t, GesvContigFactory>(
+        gesv_dispatch_vector);
 }
 } // namespace dpnp::extensions::lapack

dpnp/backend/extensions/lapack/gesv_batch.cpp

@@ -28,6 +28,9 @@
 
 #include <pybind11/pybind11.h>
 
+// utils extension header
+#include "ext/common.hpp"
+
 // dpctl tensor headers
 #include "utils/type_utils.hpp"
 
@@ -43,6 +46,7 @@ namespace py = pybind11;
 namespace type_utils = dpctl::tensor::type_utils;
 
 using dpctl::tensor::alloc_utils::sycl_free_noexcept;
+using ext::common::init_dispatch_vector;
 
 typedef sycl::event (*gesv_batch_impl_fn_ptr_t)(
     sycl::queue &,
@@ -425,10 +429,7 @@ struct GesvBatchContigFactory
 
 void init_gesv_batch_dispatch_vector(void)
 {
-    dpctl_td_ns::DispatchVectorBuilder<gesv_batch_impl_fn_ptr_t,
-                                       GesvBatchContigFactory,
-                                       dpctl_td_ns::num_types>
-        contig;
-    contig.populate_dispatch_vector(gesv_batch_dispatch_vector);
+    init_dispatch_vector<gesv_batch_impl_fn_ptr_t, GesvBatchContigFactory>(
+        gesv_batch_dispatch_vector);
 }
 } // namespace dpnp::extensions::lapack

dpnp/backend/extensions/lapack/gesvd.cpp

@@ -27,6 +27,9 @@
 
 #include <pybind11/pybind11.h>
 
+// utils extension header
+#include "ext/common.hpp"
+
 // dpctl tensor headers
 #include "utils/type_utils.hpp"
 
@@ -41,6 +44,8 @@ namespace mkl_lapack = oneapi::mkl::lapack;
 namespace py = pybind11;
 namespace type_utils = dpctl::tensor::type_utils;
 
+using ext::common::init_dispatch_table;
+
 typedef sycl::event (*gesvd_impl_fn_ptr_t)(sycl::queue &,
                                            const oneapi::mkl::jobsvd,
                                            const oneapi::mkl::jobsvd,
@@ -227,9 +232,7 @@ struct GesvdContigFactory
 
 void init_gesvd_dispatch_table(void)
 {
-    dpctl_td_ns::DispatchTableBuilder<gesvd_impl_fn_ptr_t, GesvdContigFactory,
-                                      dpctl_td_ns::num_types>
-        contig;
-    contig.populate_dispatch_table(gesvd_dispatch_table);
+    init_dispatch_table<gesvd_impl_fn_ptr_t, GesvdContigFactory>(
+        gesvd_dispatch_table);
 }
 } // namespace dpnp::extensions::lapack

dpnp/backend/extensions/lapack/gesvd_batch.cpp

@@ -27,6 +27,9 @@
 
 #include <pybind11/pybind11.h>
 
+// utils extension header
+#include "ext/common.hpp"
+
 // dpctl tensor headers
 #include "utils/type_utils.hpp"
 
@@ -41,6 +44,8 @@ namespace mkl_lapack = oneapi::mkl::lapack;
 namespace py = pybind11;
 namespace type_utils = dpctl::tensor::type_utils;
 
+using ext::common::init_dispatch_table;
+
 typedef sycl::event (*gesvd_batch_impl_fn_ptr_t)(
     sycl::queue &,
     const oneapi::mkl::jobsvd,
@@ -296,10 +301,7 @@ struct GesvdBatchContigFactory
 
 void init_gesvd_batch_dispatch_table(void)
 {
-    dpctl_td_ns::DispatchTableBuilder<gesvd_batch_impl_fn_ptr_t,
-                                      GesvdBatchContigFactory,
-                                      dpctl_td_ns::num_types>
-        contig;
-    contig.populate_dispatch_table(gesvd_batch_dispatch_table);
+    init_dispatch_table<gesvd_batch_impl_fn_ptr_t, GesvdBatchContigFactory>(
+        gesvd_batch_dispatch_table);
 }
 } // namespace dpnp::extensions::lapack

dpnp/backend/extensions/lapack/getrf.cpp

@@ -27,6 +27,9 @@
 
 #include <pybind11/pybind11.h>
 
+// utils extension header
+#include "ext/common.hpp"
+
 // dpctl tensor headers
 #include "utils/memory_overlap.hpp"
 #include "utils/sycl_alloc_utils.hpp"
@@ -35,14 +38,14 @@
 #include "getrf.hpp"
 #include "types_matrix.hpp"
 
-#include "dpnp_utils.hpp"
-
 namespace dpnp::extensions::lapack
 {
 namespace mkl_lapack = oneapi::mkl::lapack;
 namespace py = pybind11;
 namespace type_utils = dpctl::tensor::type_utils;
 
+using ext::common::init_dispatch_vector;
+
 typedef sycl::event (*getrf_impl_fn_ptr_t)(sycl::queue &,
                                            const std::int64_t,
                                            const std::int64_t,
@@ -262,9 +265,7 @@ struct GetrfContigFactory
 
 void init_getrf_dispatch_vector(void)
 {
-    dpctl_td_ns::DispatchVectorBuilder<getrf_impl_fn_ptr_t, GetrfContigFactory,
-                                       dpctl_td_ns::num_types>
-        contig;
-    contig.populate_dispatch_vector(getrf_dispatch_vector);
+    init_dispatch_vector<getrf_impl_fn_ptr_t, GetrfContigFactory>(
+        getrf_dispatch_vector);
 }
 } // namespace dpnp::extensions::lapack

dpnp/backend/extensions/lapack/getrf_batch.cpp

@@ -27,6 +27,9 @@
 
 #include <pybind11/pybind11.h>
 
+// utils extension header
+#include "ext/common.hpp"
+
 // dpctl tensor headers
 #include "utils/memory_overlap.hpp"
 #include "utils/sycl_alloc_utils.hpp"
@@ -35,14 +38,14 @@
 #include "getrf.hpp"
 #include "types_matrix.hpp"
 
-#include "dpnp_utils.hpp"
-
 namespace dpnp::extensions::lapack
 {
 namespace mkl_lapack = oneapi::mkl::lapack;
 namespace py = pybind11;
 namespace type_utils = dpctl::tensor::type_utils;
 
+using ext::common::init_dispatch_vector;
+
 typedef sycl::event (*getrf_batch_impl_fn_ptr_t)(
     sycl::queue &,
     std::int64_t,
@@ -295,10 +298,7 @@ struct GetrfBatchContigFactory
 
 void init_getrf_batch_dispatch_vector(void)
 {
-    dpctl_td_ns::DispatchVectorBuilder<getrf_batch_impl_fn_ptr_t,
-                                       GetrfBatchContigFactory,
-                                       dpctl_td_ns::num_types>
-        contig;
-    contig.populate_dispatch_vector(getrf_batch_dispatch_vector);
+    init_dispatch_vector<getrf_batch_impl_fn_ptr_t, GetrfBatchContigFactory>(
+        getrf_batch_dispatch_vector);
 }
 } // namespace dpnp::extensions::lapack