Update entire ufunc extension to use init_dispatch_vector() and using init_dispatch_table() from common utils

Author: antonwolfy

dpnp/backend/extensions/ufunc/elementwise_functions/float_power.cpp

@@ -33,6 +33,9 @@
 
 #include "float_power.hpp"
 
+// utils extension header
+#include "ext/common.hpp"
+
 // include a local copy of elementwise common header from dpctl tensor:
 // dpctl/tensor/libtensor/source/elementwise_functions/elementwise_functions.hpp
 // TODO: replace by including dpctl header once available
@@ -50,6 +53,8 @@ namespace impl
 {
 namespace td_ns = dpctl::tensor::type_dispatch;
 
+using ext::common::init_dispatch_table;
+
 // Supports only float and complex types
 template <typename T1, typename T2>
 struct OutputType
@@ -82,10 +87,9 @@ struct TypeMapFactory
     }
 };
 
-void populate_float_power_dispatch_tables(void)
+static void populate_float_power_dispatch_tables(void)
 {
-    td_ns::DispatchTableBuilder<int, TypeMapFactory, td_ns::num_types> dvb;
-    dvb.populate_dispatch_table(float_power_output_typeid_table);
+    init_dispatch_table<int, TypeMapFactory>(float_power_output_typeid_table);
 }
 } // namespace impl
 

dpnp/backend/extensions/ufunc/elementwise_functions/interpolate.cpp

@@ -44,6 +44,7 @@
 
 #include "kernels/elementwise_functions/interpolate.hpp"
 
+// utils extension headers
 #include "ext/common.hpp"
 #include "ext/validation_utils.hpp"
 
@@ -67,6 +68,7 @@ namespace dpnp::extensions::ufunc
 
 namespace impl
 {
+using ext::common::init_dispatch_vector;
 
 template <typename T>
 using value_type_of_t = typename value_type_of<T>::type;
@@ -242,13 +244,10 @@ struct InterpolateFactory
     }
 };
 
-void init_interpolate_dispatch_vectors()
+static void init_interpolate_dispatch_vectors()
 {
-    using namespace td_ns;
-
-    DispatchVectorBuilder<interpolate_fn_ptr_t, InterpolateFactory, num_types>
-        dtb_interpolate;
-    dtb_interpolate.populate_dispatch_vector(interpolate_dispatch_vector);
+    init_dispatch_vector<interpolate_fn_ptr_t, InterpolateFactory>(
+        interpolate_dispatch_vector);
 }
 
 } // namespace impl

dpnp/backend/extensions/ufunc/elementwise_functions/isclose.cpp

@@ -45,6 +45,7 @@
 #include "utils/type_dispatch.hpp"
 #include "utils/type_utils.hpp"
 
+// utils extension headers
 #include "ext/common.hpp"
 #include "ext/validation_utils.hpp"
 
@@ -68,6 +69,7 @@ namespace dpnp::extensions::ufunc
 
 namespace impl
 {
+using ext::common::init_dispatch_vector;
 
 typedef sycl::event (*isclose_strided_scalar_fn_ptr_t)(
     sycl::queue &,
@@ -351,19 +353,14 @@ struct IsCloseContigScalarFactory
     }
 };
 
-void populate_isclose_dispatch_vectors()
+static void populate_isclose_dispatch_vectors()
 {
-    using namespace td_ns;
-
-    DispatchVectorBuilder<isclose_strided_scalar_fn_ptr_t,
-                          IsCloseStridedScalarFactory, num_types>
-        dvb1;
-    dvb1.populate_dispatch_vector(isclose_strided_scalar_dispatch_vector);
-
-    DispatchVectorBuilder<isclose_contig_scalar_fn_ptr_t,
-                          IsCloseContigScalarFactory, num_types>
-        dvb2;
-    dvb2.populate_dispatch_vector(isclose_contig_dispatch_vector);
+    init_dispatch_vector<isclose_strided_scalar_fn_ptr_t,
+                         IsCloseStridedScalarFactory>(
+        isclose_strided_scalar_dispatch_vector);
+    init_dispatch_vector<isclose_contig_scalar_fn_ptr_t,
+                         IsCloseContigScalarFactory>(
+        isclose_contig_dispatch_vector);
 }
 
 } // namespace impl

dpnp/backend/extensions/ufunc/elementwise_functions/nan_to_num.cpp

@@ -52,6 +52,7 @@
 #include "utils/type_dispatch.hpp"
 #include "utils/type_utils.hpp"
 
+// utils extension header
 #include "ext/common.hpp"
 
 namespace py = pybind11;
@@ -65,6 +66,7 @@ namespace dpnp::extensions::ufunc
 
 namespace impl
 {
+using ext::common::init_dispatch_vector;
 
 template <typename T>
 using value_type_of_t = typename value_type_of<T>::type;
@@ -370,17 +372,10 @@ struct NanToNumContigFactory
     }
 };
 
-void populate_nan_to_num_dispatch_vectors(void)
+static void populate_nan_to_num_dispatch_vectors(void)
 {
-    using namespace td_ns;
-
-    DispatchVectorBuilder<nan_to_num_fn_ptr_t, NanToNumFactory, num_types> dvb1;
-    dvb1.populate_dispatch_vector(nan_to_num_dispatch_vector);
-
-    DispatchVectorBuilder<nan_to_num_contig_fn_ptr_t, NanToNumContigFactory,
-                          num_types>
-        dvb2;
-    dvb2.populate_dispatch_vector(nan_to_num_contig_dispatch_vector);
+    init_dispatch_vector<nan_to_num_fn_ptr_t, NanToNumFactory>(
+        nan_to_num_dispatch_vector);
 }
 
 } // namespace impl