Skip to content

Commit 672d0f8

Browse files
committed
reuse init_window_dispatch_vectors for kaiser func
1 parent 6fe1e2b commit 672d0f8

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

dpnp/backend/extensions/window/common.hpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ sycl::event window_impl(sycl::queue &q,
6767
return window_ev;
6868
}
6969

70-
std::pair<sycl::event, sycl::event>
70+
inline std::pair<sycl::event, sycl::event>
7171
py_window(sycl::queue &exec_q,
7272
const dpctl::tensor::usm_ndarray &result,
7373
const std::vector<sycl::event> &depends,
@@ -112,10 +112,12 @@ std::pair<sycl::event, sycl::event>
112112
return std::make_pair(args_ev, window_ev);
113113
}
114114

115-
template <template <typename fnT, typename T> typename factoryT>
116-
void init_window_dispatch_vectors(window_fn_ptr_t window_dispatch_vector[])
115+
template <typename funcPtrT,
116+
template <typename fnT, typename T>
117+
typename factoryT>
118+
void init_window_dispatch_vectors(funcPtrT window_dispatch_vector[])
117119
{
118-
dpctl_td_ns::DispatchVectorBuilder<window_fn_ptr_t, factoryT,
120+
dpctl_td_ns::DispatchVectorBuilder<funcPtrT, factoryT,
119121
dpctl_td_ns::num_types>
120122
contig;
121123
contig.populate_dispatch_vector(window_dispatch_vector);

dpnp/backend/extensions/window/kaiser.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@
2424
//*****************************************************************************
2525

2626
#include "kaiser.hpp"
27+
#include "common.hpp"
28+
2729
#include "utils/output_validation.hpp"
2830
#include "utils/type_dispatch.hpp"
2931
#include "utils/type_utils.hpp"
32+
3033
#include <sycl/sycl.hpp>
3134

3235
/**
@@ -170,12 +173,8 @@ std::pair<sycl::event, sycl::event>
170173

171174
void init_kaiser_dispatch_vectors()
172175
{
173-
dpctl_td_ns::DispatchVectorBuilder<kaiser_fn_ptr_t, KaiserFactory,
174-
dpctl_td_ns::num_types>
175-
contig;
176-
contig.populate_dispatch_vector(kaiser_dispatch_vector);
177-
178-
return;
176+
init_window_dispatch_vectors<kaiser_fn_ptr_t, KaiserFactory>(
177+
kaiser_dispatch_vector);
179178
}
180179

181180
} // namespace dpnp::extensions::window

dpnp/backend/extensions/window/window_py.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ PYBIND11_MODULE(_window_impl, m)
5555

5656
{
5757
window_ns::init_window_dispatch_vectors<
58-
window_ns::kernels::BartlettFactory>(bartlett_dispatch_vector);
58+
window_ns::window_fn_ptr_t, window_ns::kernels::BartlettFactory>(
59+
bartlett_dispatch_vector);
5960

6061
auto bartlett_pyapi = [&](sycl::queue &exec_q, const arrayT &result,
6162
const event_vecT &depends = {}) {
@@ -70,7 +71,8 @@ PYBIND11_MODULE(_window_impl, m)
7071

7172
{
7273
window_ns::init_window_dispatch_vectors<
73-
window_ns::kernels::BlackmanFactory>(blackman_dispatch_vector);
74+
window_ns::window_fn_ptr_t, window_ns::kernels::BlackmanFactory>(
75+
blackman_dispatch_vector);
7476

7577
auto blackman_pyapi = [&](sycl::queue &exec_q, const arrayT &result,
7678
const event_vecT &depends = {}) {
@@ -85,7 +87,8 @@ PYBIND11_MODULE(_window_impl, m)
8587

8688
{
8789
window_ns::init_window_dispatch_vectors<
88-
window_ns::kernels::HammingFactory>(hamming_dispatch_vector);
90+
window_ns::window_fn_ptr_t, window_ns::kernels::HammingFactory>(
91+
hamming_dispatch_vector);
8992

9093
auto hamming_pyapi = [&](sycl::queue &exec_q, const arrayT &result,
9194
const event_vecT &depends = {}) {
@@ -100,7 +103,8 @@ PYBIND11_MODULE(_window_impl, m)
100103

101104
{
102105
window_ns::init_window_dispatch_vectors<
103-
window_ns::kernels::HanningFactory>(hanning_dispatch_vector);
106+
window_ns::window_fn_ptr_t, window_ns::kernels::HanningFactory>(
107+
hanning_dispatch_vector);
104108

105109
auto hanning_pyapi = [&](sycl::queue &exec_q, const arrayT &result,
106110
const event_vecT &depends = {}) {

0 commit comments

Comments
 (0)