Update window extension to use init_dispatch_vector() from common utils

Author: antonwolfy

dpnp/backend/extensions/window/CMakeLists.txt

@@ -57,8 +57,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/window/common.hpp

@@ -30,6 +30,8 @@
 #include <sycl/sycl.hpp>
 
 #include "dpctl4pybind11.hpp"
+
+// dpctl tensor headers
 #include "utils/output_validation.hpp"
 #include "utils/type_dispatch.hpp"
 #include "utils/type_utils.hpp"
@@ -127,18 +129,4 @@ inline std::pair<sycl::event, sycl::event>
 
     return std::make_pair(args_ev, window_ev);
 }
-
-template <typename funcPtrT,
-          template <typename fnT, typename T>
-          typename factoryT>
-void init_window_dispatch_vectors(funcPtrT window_dispatch_vector[])
-{
-    dpctl_td_ns::DispatchVectorBuilder<funcPtrT, factoryT,
-                                       dpctl_td_ns::num_types>
-        contig;
-    contig.populate_dispatch_vector(window_dispatch_vector);
-
-    return;
-}
-
 } // namespace dpnp::extensions::window

dpnp/backend/extensions/window/kaiser.cpp

@@ -26,18 +26,24 @@
 #include "kaiser.hpp"
 #include "common.hpp"
 
+// utils extension header
+#include "ext/common.hpp"
+
+// dpctl tensor headers
 #include "utils/output_validation.hpp"
 #include "utils/type_dispatch.hpp"
 #include "utils/type_utils.hpp"
 
 #include <sycl/sycl.hpp>
 
-#include "../kernels/elementwise_functions/i0.hpp"
+#include "kernels/elementwise_functions/i0.hpp"
 
 namespace dpnp::extensions::window
 {
 namespace dpctl_td_ns = dpctl::tensor::type_dispatch;
 
+using ext::common::init_dispatch_vector;
+
 typedef sycl::event (*kaiser_fn_ptr_t)(sycl::queue &,
                                        char *,
                                        const std::size_t,
@@ -132,7 +138,7 @@ std::pair<sycl::event, sycl::event>
 
 void init_kaiser_dispatch_vectors()
 {
-    init_window_dispatch_vectors<kaiser_fn_ptr_t, KaiserFactory>(
+    init_dispatch_vector<kaiser_fn_ptr_t, KaiserFactory>(
         kaiser_dispatch_vector);
 }
 

dpnp/backend/extensions/window/window_py.cpp

@@ -37,8 +37,13 @@
 #include "hanning.hpp"
 #include "kaiser.hpp"
 
+// utils extension header
+#include "ext/common.hpp"
+
 namespace window_ns = dpnp::extensions::window;
 namespace py = pybind11;
+
+using ext::common::init_dispatch_vector;
 using window_ns::window_fn_ptr_t;
 
 namespace dpctl_td_ns = dpctl::tensor::type_dispatch;
@@ -54,8 +59,8 @@ PYBIND11_MODULE(_window_impl, m)
     using event_vecT = std::vector<sycl::event>;
 
     {
-        window_ns::init_window_dispatch_vectors<
-            window_ns::window_fn_ptr_t, window_ns::kernels::BartlettFactory>(
+        init_dispatch_vector<window_ns::window_fn_ptr_t,
+                             window_ns::kernels::BartlettFactory>(
             bartlett_dispatch_vector);
 
         auto bartlett_pyapi = [&](sycl::queue &exec_q, const arrayT &result,
@@ -70,8 +75,8 @@ PYBIND11_MODULE(_window_impl, m)
     }
 
     {
-        window_ns::init_window_dispatch_vectors<
-            window_ns::window_fn_ptr_t, window_ns::kernels::BlackmanFactory>(
+        init_dispatch_vector<window_ns::window_fn_ptr_t,
+                             window_ns::kernels::BlackmanFactory>(
             blackman_dispatch_vector);
 
         auto blackman_pyapi = [&](sycl::queue &exec_q, const arrayT &result,
@@ -86,8 +91,8 @@ PYBIND11_MODULE(_window_impl, m)
     }
 
     {
-        window_ns::init_window_dispatch_vectors<
-            window_ns::window_fn_ptr_t, window_ns::kernels::HammingFactory>(
+        init_dispatch_vector<window_ns::window_fn_ptr_t,
+                             window_ns::kernels::HammingFactory>(
             hamming_dispatch_vector);
 
         auto hamming_pyapi = [&](sycl::queue &exec_q, const arrayT &result,
@@ -102,8 +107,8 @@ PYBIND11_MODULE(_window_impl, m)
     }
 
     {
-        window_ns::init_window_dispatch_vectors<
-            window_ns::window_fn_ptr_t, window_ns::kernels::HanningFactory>(
+        init_dispatch_vector<window_ns::window_fn_ptr_t,
+                             window_ns::kernels::HanningFactory>(
             hanning_dispatch_vector);
 
         auto hanning_pyapi = [&](sycl::queue &exec_q, const arrayT &result,