Skip to content

Commit 726738d

Browse files
antonwolfyantonwolfy
authored
Remove unused enums with function names (#1758)
* Remove unused enums with function names * Rolled back removal of shape_type_c and dpnp_subtract_c_ext
1 parent b57d71f commit 726738d

File tree

3 files changed

+14
-126
lines changed

3 files changed

+14
-126
lines changed

‎dpnp/backend/include/dpnp_iface_fptr.hpp‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,10 @@
5858
*/
5959
enum class DPNPFuncName : size_t
6060
{
61-
DPNP_FN_NONE, /**< Very first element of the enumeration */
62-
DPNP_FN_ABSOLUTE, /**< Used in numpy.absolute() impl */
63-
DPNP_FN_ADD, /**< Used in numpy.add() impl */
64-
DPNP_FN_ADD_EXT, /**< Used in numpy.add() impl, requires extra parameters */
65-
DPNP_FN_ALL, /**< Used in numpy.all() impl */
61+
DPNP_FN_NONE, /**< Very first element of the enumeration */
62+
DPNP_FN_ABSOLUTE, /**< Used in numpy.absolute() impl */
63+
DPNP_FN_ADD, /**< Used in numpy.add() impl */
64+
DPNP_FN_ALL, /**< Used in numpy.all() impl */
6665
DPNP_FN_ALLCLOSE, /**< Used in numpy.allclose() impl */
6766
DPNP_FN_ALLCLOSE_EXT, /**< Used in numpy.allclose() impl, requires extra
6867
parameters */
@@ -123,8 +122,6 @@ enum class DPNPFuncName : size_t
123122
DPNP_FN_DIAGONAL_EXT, /**< Used in numpy.diagonal() impl, requires extra
124123
parameters */
125124
DPNP_FN_DIVIDE, /**< Used in numpy.divide() impl */
126-
DPNP_FN_DIVIDE_EXT, /**< Used in numpy.divide() impl, requires extra
127-
parameters */
128125
DPNP_FN_DOT, /**< Used in numpy.dot() impl */
129126
DPNP_FN_DOT_EXT, /**< Used in numpy.dot() impl, requires extra parameters */
130127
DPNP_FN_EDIFF1D, /**< Used in numpy.ediff1d() impl */
@@ -158,8 +155,6 @@ enum class DPNPFuncName : size_t
158155
DPNP_FN_FLATTEN, /**< Used in numpy.flatten() impl */
159156
DPNP_FN_FLOOR, /**< Used in numpy.floor() impl */
160157
DPNP_FN_FLOOR_DIVIDE, /**< Used in numpy.floor_divide() impl */
161-
DPNP_FN_FLOOR_DIVIDE_EXT, /**< Used in numpy.floor_divide() impl, requires
162-
extra parameters */
163158
DPNP_FN_FMOD, /**< Used in numpy.fmod() impl */
164159
DPNP_FN_FMOD_EXT, /**< Used in numpy.fmod() impl, requires extra parameters
165160
*/
@@ -194,17 +189,15 @@ enum class DPNPFuncName : size_t
194189
DPNP_FN_MINIMUM_EXT, /**< Used in numpy.fmax() impl, requires extra
195190
parameters */
196191
DPNP_FN_MODF, /**< Used in numpy.modf() impl */
197-
DPNP_FN_MODF_EXT, /**< Used in numpy.modf() impl, requires extra parameters
198-
*/
199-
DPNP_FN_MULTIPLY, /**< Used in numpy.multiply() impl */
200-
DPNP_FN_MULTIPLY_EXT, /**< Used in numpy.multiply() impl, requires extra
201-
parameters */
202-
DPNP_FN_NANVAR, /**< Used in numpy.nanvar() impl */
203-
DPNP_FN_NEGATIVE, /**< Used in numpy.negative() impl */
204-
DPNP_FN_NONZERO, /**< Used in numpy.nonzero() impl */
205-
DPNP_FN_ONES, /**< Used in numpy.ones() impl */
206-
DPNP_FN_ONES_LIKE, /**< Used in numpy.ones_like() impl */
207-
DPNP_FN_PARTITION, /**< Used in numpy.partition() impl */
192+
DPNP_FN_MODF_EXT, /**< Used in numpy.modf() impl, requires extra parameters
193+
*/
194+
DPNP_FN_MULTIPLY, /**< Used in numpy.multiply() impl */
195+
DPNP_FN_NANVAR, /**< Used in numpy.nanvar() impl */
196+
DPNP_FN_NEGATIVE, /**< Used in numpy.negative() impl */
197+
DPNP_FN_NONZERO, /**< Used in numpy.nonzero() impl */
198+
DPNP_FN_ONES, /**< Used in numpy.ones() impl */
199+
DPNP_FN_ONES_LIKE, /**< Used in numpy.ones_like() impl */
200+
DPNP_FN_PARTITION, /**< Used in numpy.partition() impl */
208201
DPNP_FN_PARTITION_EXT, /**< Used in numpy.partition() impl, requires extra
209202
parameters */
210203
DPNP_FN_PLACE, /**< Used in numpy.place() impl */

‎dpnp/backend/kernels/dpnp_krnl_elemwise.cpp‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,33 +1397,7 @@ static constexpr DPNPFuncType get_divide_res_type()
13971397
template <DPNPFuncType FT1, DPNPFuncType... FTs>
13981398
static void func_map_elemwise_2arg_3type_core(func_map_t &fmap)
13991399
{
1400-
((fmap[DPNPFuncName::DPNP_FN_ADD_EXT][FT1][FTs] =
1401-
{populate_func_types<FT1, FTs>(),
1402-
(void *)dpnp_add_c_ext<
1403-
func_type_map_t::find_type<populate_func_types<FT1, FTs>()>,
1404-
func_type_map_t::find_type<FT1>,
1405-
func_type_map_t::find_type<FTs>>}),
1406-
...);
1407-
((fmap[DPNPFuncName::DPNP_FN_DIVIDE_EXT][FT1][FTs] =
1408-
{get_divide_res_type<FT1, FTs>(),
1409-
(void *)dpnp_divide_c_ext<
1410-
func_type_map_t::find_type<get_divide_res_type<FT1, FTs>()>,
1411-
func_type_map_t::find_type<FT1>,
1412-
func_type_map_t::find_type<FTs>>,
1413-
get_divide_res_type<FT1, FTs, std::false_type>(),
1414-
(void *)
1415-
dpnp_divide_c_ext<func_type_map_t::find_type<get_divide_res_type<
1416-
FT1, FTs, std::false_type>()>,
1417-
func_type_map_t::find_type<FT1>,
1418-
func_type_map_t::find_type<FTs>>}),
1419-
...);
1420-
((fmap[DPNPFuncName::DPNP_FN_MULTIPLY_EXT][FT1][FTs] =
1421-
{populate_func_types<FT1, FTs>(),
1422-
(void *)dpnp_multiply_c_ext<
1423-
func_type_map_t::find_type<populate_func_types<FT1, FTs>()>,
1424-
func_type_map_t::find_type<FT1>,
1425-
func_type_map_t::find_type<FTs>>}),
1426-
...);
1400+
// dpnp_subtract_c_ext is implicitly used by dpnp_ptp_c
14271401
((fmap[DPNPFuncName::DPNP_FN_SUBTRACT_EXT][FT1][FTs] =
14281402
{populate_func_types<FT1, FTs>(),
14291403
(void *)dpnp_subtract_c_ext<

‎dpnp/dpnp_algo/dpnp_algo.pxd‎

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -33,145 +33,70 @@ from dpnp.dpnp_utils.dpnp_algo_utils cimport dpnp_descriptor
3333

3434
cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName": # need this namespace for Enum import
3535
cdef enum DPNPFuncName "DPNPFuncName":
36-
DPNP_FN_ALLCLOSE
3736
DPNP_FN_ALLCLOSE_EXT
38-
DPNP_FN_ARANGE
39-
DPNP_FN_CHOOSE
4037
DPNP_FN_CHOOSE_EXT
41-
DPNP_FN_COPY
4238
DPNP_FN_COPY_EXT
43-
DPNP_FN_CORRELATE
4439
DPNP_FN_CORRELATE_EXT
45-
DPNP_FN_CUMPROD
4640
DPNP_FN_CUMPROD_EXT
47-
DPNP_FN_CUMSUM
4841
DPNP_FN_CUMSUM_EXT
49-
DPNP_FN_DEGREES
5042
DPNP_FN_DEGREES_EXT
51-
DPNP_FN_DIAG_INDICES
5243
DPNP_FN_DIAG_INDICES_EXT
53-
DPNP_FN_DIAGONAL
5444
DPNP_FN_DIAGONAL_EXT
55-
DPNP_FN_EDIFF1D
5645
DPNP_FN_EDIFF1D_EXT
57-
DPNP_FN_EIG
5846
DPNP_FN_EIG_EXT
59-
DPNP_FN_EIGVALS
6047
DPNP_FN_EIGVALS_EXT
61-
DPNP_FN_ERF
6248
DPNP_FN_ERF_EXT
63-
DPNP_FN_EYE
64-
DPNP_FN_EYE_EXT
65-
DPNP_FN_FABS
6649
DPNP_FN_FABS_EXT
67-
DPNP_FN_FFT_FFT
6850
DPNP_FN_FFT_FFT_EXT
69-
DPNP_FN_FFT_RFFT
7051
DPNP_FN_FFT_RFFT_EXT
71-
DPNP_FN_FILL_DIAGONAL
7252
DPNP_FN_FILL_DIAGONAL_EXT
73-
DPNP_FN_FMOD
7453
DPNP_FN_FMOD_EXT
75-
DPNP_FN_FULL
76-
DPNP_FN_FULL_LIKE
77-
DPNP_FN_MAXIMUM
7854
DPNP_FN_MAXIMUM_EXT
79-
DPNP_FN_MEDIAN
8055
DPNP_FN_MEDIAN_EXT
81-
DPNP_FN_MINIMUM
8256
DPNP_FN_MINIMUM_EXT
83-
DPNP_FN_MODF
8457
DPNP_FN_MODF_EXT
85-
DPNP_FN_NONZERO
86-
DPNP_FN_ONES
87-
DPNP_FN_ONES_LIKE
88-
DPNP_FN_PARTITION
8958
DPNP_FN_PARTITION_EXT
90-
DPNP_FN_PLACE
91-
DPNP_FN_RADIANS
9259
DPNP_FN_RADIANS_EXT
93-
DPNP_FN_RNG_BETA
9460
DPNP_FN_RNG_BETA_EXT
95-
DPNP_FN_RNG_BINOMIAL
9661
DPNP_FN_RNG_BINOMIAL_EXT
97-
DPNP_FN_RNG_CHISQUARE
9862
DPNP_FN_RNG_CHISQUARE_EXT
99-
DPNP_FN_RNG_EXPONENTIAL
10063
DPNP_FN_RNG_EXPONENTIAL_EXT
101-
DPNP_FN_RNG_F
10264
DPNP_FN_RNG_F_EXT
103-
DPNP_FN_RNG_GAMMA
10465
DPNP_FN_RNG_GAMMA_EXT
105-
DPNP_FN_RNG_GAUSSIAN
10666
DPNP_FN_RNG_GAUSSIAN_EXT
107-
DPNP_FN_RNG_GEOMETRIC
10867
DPNP_FN_RNG_GEOMETRIC_EXT
109-
DPNP_FN_RNG_GUMBEL
11068
DPNP_FN_RNG_GUMBEL_EXT
111-
DPNP_FN_RNG_HYPERGEOMETRIC
11269
DPNP_FN_RNG_HYPERGEOMETRIC_EXT
113-
DPNP_FN_RNG_LAPLACE
11470
DPNP_FN_RNG_LAPLACE_EXT
115-
DPNP_FN_RNG_LOGISTIC
11671
DPNP_FN_RNG_LOGISTIC_EXT
117-
DPNP_FN_RNG_LOGNORMAL
11872
DPNP_FN_RNG_LOGNORMAL_EXT
119-
DPNP_FN_RNG_MULTINOMIAL
12073
DPNP_FN_RNG_MULTINOMIAL_EXT
12174
DPNP_FN_RNG_MULTIVARIATE_NORMAL
12275
DPNP_FN_RNG_MULTIVARIATE_NORMAL_EXT
123-
DPNP_FN_RNG_NEGATIVE_BINOMIAL
12476
DPNP_FN_RNG_NEGATIVE_BINOMIAL_EXT
125-
DPNP_FN_RNG_NONCENTRAL_CHISQUARE
12677
DPNP_FN_RNG_NONCENTRAL_CHISQUARE_EXT
127-
DPNP_FN_RNG_NORMAL
12878
DPNP_FN_RNG_NORMAL_EXT
129-
DPNP_FN_RNG_PARETO
13079
DPNP_FN_RNG_PARETO_EXT
131-
DPNP_FN_RNG_POISSON
13280
DPNP_FN_RNG_POISSON_EXT
133-
DPNP_FN_RNG_POWER
13481
DPNP_FN_RNG_POWER_EXT
135-
DPNP_FN_RNG_RAYLEIGH
13682
DPNP_FN_RNG_RAYLEIGH_EXT
137-
DPNP_FN_RNG_SHUFFLE
13883
DPNP_FN_RNG_SHUFFLE_EXT
13984
DPNP_FN_RNG_SRAND
14085
DPNP_FN_RNG_SRAND_EXT
141-
DPNP_FN_RNG_STANDARD_CAUCHY
14286
DPNP_FN_RNG_STANDARD_CAUCHY_EXT
143-
DPNP_FN_RNG_STANDARD_EXPONENTIAL
14487
DPNP_FN_RNG_STANDARD_EXPONENTIAL_EXT
145-
DPNP_FN_RNG_STANDARD_GAMMA
14688
DPNP_FN_RNG_STANDARD_GAMMA_EXT
14789
DPNP_FN_RNG_STANDARD_NORMAL
148-
DPNP_FN_RNG_STANDARD_T
14990
DPNP_FN_RNG_STANDARD_T_EXT
150-
DPNP_FN_RNG_TRIANGULAR
15191
DPNP_FN_RNG_TRIANGULAR_EXT
152-
DPNP_FN_RNG_UNIFORM
15392
DPNP_FN_RNG_UNIFORM_EXT
154-
DPNP_FN_RNG_VONMISES
15593
DPNP_FN_RNG_VONMISES_EXT
156-
DPNP_FN_RNG_WALD
15794
DPNP_FN_RNG_WALD_EXT
158-
DPNP_FN_RNG_WEIBULL
15995
DPNP_FN_RNG_WEIBULL_EXT
160-
DPNP_FN_RNG_ZIPF
16196
DPNP_FN_RNG_ZIPF_EXT
162-
DPNP_FN_SEARCHSORTED
16397
DPNP_FN_SEARCHSORTED_EXT
164-
DPNP_FN_TRACE
16598
DPNP_FN_TRACE_EXT
166-
DPNP_FN_TRANSPOSE
167-
DPNP_FN_TRAPZ
16899
DPNP_FN_TRAPZ_EXT
169-
DPNP_FN_TRIL
170-
DPNP_FN_TRIL_EXT
171-
DPNP_FN_TRIU
172-
DPNP_FN_TRIU_EXT
173-
DPNP_FN_ZEROS
174-
DPNP_FN_ZEROS_LIKE
175100

176101
cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncType": # need this namespace for Enum import
177102
cdef enum DPNPFuncType "DPNPFuncType":
@@ -206,9 +131,6 @@ cdef extern from "dpnp_iface.hpp":
206131

207132

208133
# C function pointer to the C library template functions
209-
ctypedef c_dpctl.DPCTLSyclEventRef(*fptr_1out_t)(c_dpctl.DPCTLSyclQueueRef,
210-
void * , size_t,
211-
const c_dpctl.DPCTLEventVectorRef) except +
212134
ctypedef c_dpctl.DPCTLSyclEventRef(*fptr_1in_1out_t)(c_dpctl.DPCTLSyclQueueRef,
213135
void *, void * , size_t,
214136
const c_dpctl.DPCTLEventVectorRef)
@@ -248,7 +170,6 @@ ctypedef c_dpctl.DPCTLSyclEventRef(*fptr_2in_1out_strides_t)(c_dpctl.DPCTLSyclQu
248170
const shape_elem_type * ,
249171
const long * ,
250172
const c_dpctl.DPCTLEventVectorRef) except +
251-
ctypedef void(*fptr_blas_gemm_2in_1out_t)(void *, void * , void * , size_t, size_t, size_t)
252173

253174

254175
"""

0 commit comments

Comments
 (0)