Skip to content

Commit 0820add

Browse files
Removed unsed code
Also consolidated various *impl_fn_ptr_t which were common among unary functions, and among binary functions into common reused types.
1 parent aebaf3a commit 0820add

File tree

11 files changed

+141
-512
lines changed

11 files changed

+141
-512
lines changed

dpctl/tensor/libtensor/include/kernels/elementwise_functions/abs.hpp

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,6 @@ template <typename T> struct AbsOutputType
8484
template <typename T1, typename T2, unsigned int vec_sz, unsigned int n_vecs>
8585
class abs_contig_kernel;
8686

87-
typedef sycl::event (*abs_contig_impl_fn_ptr_t)(
88-
sycl::queue,
89-
size_t,
90-
const char *,
91-
char *,
92-
const std::vector<sycl::event> &);
93-
9487
template <typename argTy>
9588
sycl::event abs_contig_impl(sycl::queue exec_q,
9689
size_t nelems,
@@ -153,18 +146,6 @@ using AbsStridedFunctor = elementwise_common::
153146

154147
template <typename T1, typename T2, typename T3> class abs_strided_kernel;
155148

156-
typedef sycl::event (*abs_strided_impl_fn_ptr_t)(
157-
sycl::queue,
158-
size_t,
159-
int,
160-
const py::ssize_t *,
161-
const char *,
162-
py::ssize_t,
163-
char *,
164-
py::ssize_t,
165-
const std::vector<sycl::event> &,
166-
const std::vector<sycl::event> &);
167-
168149
template <typename argTy>
169150
sycl::event abs_strided_impl(sycl::queue exec_q,
170151
size_t nelems,

dpctl/tensor/libtensor/include/kernels/elementwise_functions/add.hpp

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -148,17 +148,6 @@ template <typename argT1,
148148
unsigned int n_vecs>
149149
class add_contig_kernel;
150150

151-
typedef sycl::event (*add_contig_impl_fn_ptr_t)(
152-
sycl::queue,
153-
size_t,
154-
const char *,
155-
py::ssize_t,
156-
const char *,
157-
py::ssize_t,
158-
char *,
159-
py::ssize_t,
160-
const std::vector<sycl::event> &);
161-
162151
template <typename argTy1, typename argTy2>
163152
sycl::event add_contig_impl(sycl::queue exec_q,
164153
size_t nelems,
@@ -228,20 +217,6 @@ template <typename fnT, typename T1, typename T2> struct AddTypeMapFactory
228217
template <typename T1, typename T2, typename resT, typename IndexerT>
229218
class add_strided_strided_kernel;
230219

231-
typedef sycl::event (*add_strided_impl_fn_ptr_t)(
232-
sycl::queue,
233-
size_t,
234-
int,
235-
const py::ssize_t *,
236-
const char *,
237-
py::ssize_t,
238-
const char *,
239-
py::ssize_t,
240-
char *,
241-
py::ssize_t,
242-
const std::vector<sycl::event> &,
243-
const std::vector<sycl::event> &);
244-
245220
template <typename argTy1, typename argTy2>
246221
sycl::event add_strided_impl(sycl::queue exec_q,
247222
size_t nelems,
@@ -299,19 +274,6 @@ template <typename fnT, typename T1, typename T2> struct AddStridedFactory
299274
template <typename argT1, typename argT2, typename resT>
300275
class add_matrix_row_broadcast_sg_krn;
301276

302-
typedef sycl::event (*add_contig_matrix_contig_row_broadcast_impl_fn_ptr_t)(
303-
sycl::queue,
304-
std::vector<sycl::event> &,
305-
size_t,
306-
size_t,
307-
const char *,
308-
py::ssize_t,
309-
const char *,
310-
py::ssize_t,
311-
char *,
312-
py::ssize_t,
313-
const std::vector<sycl::event> &);
314-
315277
template <typename argT1, typename argT2, typename resT>
316278
using AddContigMatrixContigRowBroadcastingFunctor =
317279
elementwise_common::BinaryContigMatrixContigRowBroadcastingFunctor<
@@ -420,19 +382,6 @@ struct AddContigMatrixContigRowBroadcastFactory
420382
}
421383
};
422384

423-
typedef sycl::event (*add_contig_row_contig_matrix_broadcast_impl_fn_ptr_t)(
424-
sycl::queue,
425-
std::vector<sycl::event> &,
426-
size_t,
427-
size_t,
428-
const char *,
429-
py::ssize_t,
430-
const char *,
431-
py::ssize_t,
432-
char *,
433-
py::ssize_t,
434-
const std::vector<sycl::event> &);
435-
436385
template <typename argT1, typename argT2, typename resT>
437386
sycl::event add_contig_row_contig_matrix_broadcast_impl(
438387
sycl::queue exec_q,

dpctl/tensor/libtensor/include/kernels/elementwise_functions/common.hpp

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,78 @@ struct BinaryContigRowContigMatrixBroadcastingFunctor
544544
}
545545
};
546546

547+
// Typdefs for function pointers
548+
549+
typedef sycl::event (*unary_contig_impl_fn_ptr_t)(
550+
sycl::queue,
551+
size_t,
552+
const char *,
553+
char *,
554+
const std::vector<sycl::event> &);
555+
556+
typedef sycl::event (*unary_strided_impl_fn_ptr_t)(
557+
sycl::queue,
558+
size_t,
559+
int,
560+
const py::ssize_t *,
561+
const char *,
562+
py::ssize_t,
563+
char *,
564+
py::ssize_t,
565+
const std::vector<sycl::event> &,
566+
const std::vector<sycl::event> &);
567+
568+
typedef sycl::event (*binary_contig_impl_fn_ptr_t)(
569+
sycl::queue,
570+
size_t,
571+
const char *,
572+
py::ssize_t,
573+
const char *,
574+
py::ssize_t,
575+
char *,
576+
py::ssize_t,
577+
const std::vector<sycl::event> &);
578+
579+
typedef sycl::event (*binary_strided_impl_fn_ptr_t)(
580+
sycl::queue,
581+
size_t,
582+
int,
583+
const py::ssize_t *,
584+
const char *,
585+
py::ssize_t,
586+
const char *,
587+
py::ssize_t,
588+
char *,
589+
py::ssize_t,
590+
const std::vector<sycl::event> &,
591+
const std::vector<sycl::event> &);
592+
593+
typedef sycl::event (*binary_contig_matrix_contig_row_broadcast_impl_fn_ptr_t)(
594+
sycl::queue,
595+
std::vector<sycl::event> &,
596+
size_t,
597+
size_t,
598+
const char *,
599+
py::ssize_t,
600+
const char *,
601+
py::ssize_t,
602+
char *,
603+
py::ssize_t,
604+
const std::vector<sycl::event> &);
605+
606+
typedef sycl::event (*binary_contig_row_contig_matrix_broadcast_impl_fn_ptr_t)(
607+
sycl::queue,
608+
std::vector<sycl::event> &,
609+
size_t,
610+
size_t,
611+
const char *,
612+
py::ssize_t,
613+
const char *,
614+
py::ssize_t,
615+
char *,
616+
py::ssize_t,
617+
const std::vector<sycl::event> &);
618+
547619
} // namespace elementwise_common
548620
} // namespace kernels
549621
} // namespace tensor

dpctl/tensor/libtensor/include/kernels/elementwise_functions/cos.hpp

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,6 @@ template <typename T> struct CosOutputType
6969
td_ns::DefaultResultEntry<void>>::result_type;
7070
};
7171

72-
typedef sycl::event (*cos_contig_impl_fn_ptr_t)(
73-
sycl::queue,
74-
size_t,
75-
const char *,
76-
char *,
77-
const std::vector<sycl::event> &);
78-
7972
template <typename T1, typename T2, unsigned int vec_sz, unsigned int n_vecs>
8073
class cos_contig_kernel;
8174

@@ -137,18 +130,6 @@ template <typename fnT, typename T> struct CosTypeMapFactory
137130

138131
template <typename T1, typename T2, typename T3> class cos_strided_kernel;
139132

140-
typedef sycl::event (*cos_strided_impl_fn_ptr_t)(
141-
sycl::queue,
142-
size_t,
143-
int,
144-
const py::ssize_t *,
145-
const char *,
146-
py::ssize_t,
147-
char *,
148-
py::ssize_t,
149-
const std::vector<sycl::event> &,
150-
const std::vector<sycl::event> &);
151-
152133
template <typename argTy>
153134
sycl::event cos_strided_impl(sycl::queue exec_q,
154135
size_t nelems,

0 commit comments

Comments
 (0)