Skip to content

Commit 1c7c397

Browse files
vtavanavtavana
committed
impl_usage_dpctl_bitwise_op
1 parent 5c96bf1 commit 1c7c397

File tree

10 files changed

+511
-421
lines changed

10 files changed

+511
-421
lines changed

‎dpnp/backend/include/dpnp_iface_fptr.hpp

Lines changed: 59 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -73,51 +73,45 @@ enum class DPNPFuncName : size_t
7373
DPNP_FN_ANY_EXT, /**< Used in numpy.any() impl, requires extra parameters */
7474
DPNP_FN_ARANGE, /**< Used in numpy.arange() impl */
7575
DPNP_FN_ARCCOS, /**< Used in numpy.arccos() impl */
76-
DPNP_FN_ARCCOS_EXT, /**< Used in numpy.arccos() impl, requires extra
77-
parameters */
78-
DPNP_FN_ARCCOSH, /**< Used in numpy.arccosh() impl */
79-
DPNP_FN_ARCCOSH_EXT, /**< Used in numpy.arccosh() impl, requires extra
80-
parameters */
81-
DPNP_FN_ARCSIN, /**< Used in numpy.arcsin() impl */
82-
DPNP_FN_ARCSIN_EXT, /**< Used in numpy.arcsin() impl, requires extra
83-
parameters */
84-
DPNP_FN_ARCSINH, /**< Used in numpy.arcsinh() impl */
85-
DPNP_FN_ARCSINH_EXT, /**< Used in numpy.arcsinh() impl, requires extra
86-
parameters */
87-
DPNP_FN_ARCTAN, /**< Used in numpy.arctan() impl */
88-
DPNP_FN_ARCTAN_EXT, /**< Used in numpy.arctan() impl, requires extra
89-
parameters */
90-
DPNP_FN_ARCTAN2, /**< Used in numpy.arctan2() impl */
91-
DPNP_FN_ARCTAN2_EXT, /**< Used in numpy.arctan2() impl, requires extra
92-
parameters */
93-
DPNP_FN_ARCTANH, /**< Used in numpy.arctanh() impl */
94-
DPNP_FN_ARCTANH_EXT, /**< Used in numpy.arctanh() impl, requires extra
95-
parameters */
96-
DPNP_FN_ARGMAX, /**< Used in numpy.argmax() impl */
97-
DPNP_FN_ARGMAX_EXT, /**< Used in numpy.argmax() impl, requires extra
98-
parameters */
99-
DPNP_FN_ARGMIN, /**< Used in numpy.argmin() impl */
100-
DPNP_FN_ARGMIN_EXT, /**< Used in numpy.argmin() impl, requires extra
101-
parameters */
102-
DPNP_FN_ARGSORT, /**< Used in numpy.argsort() impl */
103-
DPNP_FN_ARGSORT_EXT, /**< Used in numpy.argsort() impl, requires extra
104-
parameters */
105-
DPNP_FN_AROUND, /**< Used in numpy.around() impl */
106-
DPNP_FN_AROUND_EXT, /**< Used in numpy.around() impl, requires extra
107-
parameters */
108-
DPNP_FN_ASTYPE, /**< Used in numpy.astype() impl */
109-
DPNP_FN_ASTYPE_EXT, /**< Used in numpy.astype() impl, requires extra
110-
parameters */
111-
DPNP_FN_BITWISE_AND, /**< Used in numpy.bitwise_and() impl */
112-
DPNP_FN_BITWISE_AND_EXT, /**< Used in numpy.bitwise_and() impl, requires
113-
extra parameters */
114-
DPNP_FN_BITWISE_OR, /**< Used in numpy.bitwise_or() impl */
115-
DPNP_FN_BITWISE_OR_EXT, /**< Used in numpy.bitwise_or() impl, requires extra
116-
parameters */
117-
DPNP_FN_BITWISE_XOR, /**< Used in numpy.bitwise_xor() impl */
118-
DPNP_FN_BITWISE_XOR_EXT, /**< Used in numpy.bitwise_xor() impl, requires
119-
extra parameters */
120-
DPNP_FN_CBRT, /**< Used in numpy.cbrt() impl */
76+
DPNP_FN_ARCCOS_EXT, /**< Used in numpy.arccos() impl, requires extra
77+
parameters */
78+
DPNP_FN_ARCCOSH, /**< Used in numpy.arccosh() impl */
79+
DPNP_FN_ARCCOSH_EXT, /**< Used in numpy.arccosh() impl, requires extra
80+
parameters */
81+
DPNP_FN_ARCSIN, /**< Used in numpy.arcsin() impl */
82+
DPNP_FN_ARCSIN_EXT, /**< Used in numpy.arcsin() impl, requires extra
83+
parameters */
84+
DPNP_FN_ARCSINH, /**< Used in numpy.arcsinh() impl */
85+
DPNP_FN_ARCSINH_EXT, /**< Used in numpy.arcsinh() impl, requires extra
86+
parameters */
87+
DPNP_FN_ARCTAN, /**< Used in numpy.arctan() impl */
88+
DPNP_FN_ARCTAN_EXT, /**< Used in numpy.arctan() impl, requires extra
89+
parameters */
90+
DPNP_FN_ARCTAN2, /**< Used in numpy.arctan2() impl */
91+
DPNP_FN_ARCTAN2_EXT, /**< Used in numpy.arctan2() impl, requires extra
92+
parameters */
93+
DPNP_FN_ARCTANH, /**< Used in numpy.arctanh() impl */
94+
DPNP_FN_ARCTANH_EXT, /**< Used in numpy.arctanh() impl, requires extra
95+
parameters */
96+
DPNP_FN_ARGMAX, /**< Used in numpy.argmax() impl */
97+
DPNP_FN_ARGMAX_EXT, /**< Used in numpy.argmax() impl, requires extra
98+
parameters */
99+
DPNP_FN_ARGMIN, /**< Used in numpy.argmin() impl */
100+
DPNP_FN_ARGMIN_EXT, /**< Used in numpy.argmin() impl, requires extra
101+
parameters */
102+
DPNP_FN_ARGSORT, /**< Used in numpy.argsort() impl */
103+
DPNP_FN_ARGSORT_EXT, /**< Used in numpy.argsort() impl, requires extra
104+
parameters */
105+
DPNP_FN_AROUND, /**< Used in numpy.around() impl */
106+
DPNP_FN_AROUND_EXT, /**< Used in numpy.around() impl, requires extra
107+
parameters */
108+
DPNP_FN_ASTYPE, /**< Used in numpy.astype() impl */
109+
DPNP_FN_ASTYPE_EXT, /**< Used in numpy.astype() impl, requires extra
110+
parameters */
111+
DPNP_FN_BITWISE_AND, /**< Used in numpy.bitwise_and() impl */
112+
DPNP_FN_BITWISE_OR, /**< Used in numpy.bitwise_or() impl */
113+
DPNP_FN_BITWISE_XOR, /**< Used in numpy.bitwise_xor() impl */
114+
DPNP_FN_CBRT, /**< Used in numpy.cbrt() impl */
121115
DPNP_FN_CBRT_EXT, /**< Used in numpy.cbrt() impl, requires extra parameters
122116
*/
123117
DPNP_FN_CEIL, /**< Used in numpy.ceil() impl */
@@ -248,14 +242,10 @@ enum class DPNPFuncName : size_t
248242
DPNP_FN_INV_EXT, /**< Used in numpy.linalg.inv() impl, requires extra
249243
parameters */
250244
DPNP_FN_INVERT, /**< Used in numpy.invert() impl */
251-
DPNP_FN_INVERT_EXT, /**< Used in numpy.invert() impl, requires extra
252-
parameters */
253245
DPNP_FN_KRON, /**< Used in numpy.kron() impl */
254246
DPNP_FN_KRON_EXT, /**< Used in numpy.kron() impl, requires extra parameters
255247
*/
256-
DPNP_FN_LEFT_SHIFT, /**< Used in numpy.left_shift() impl */
257-
DPNP_FN_LEFT_SHIFT_EXT, /**< Used in numpy.left_shift() impl, requires extra
258-
parameters */
248+
DPNP_FN_LEFT_SHIFT, /**< Used in numpy.left_shift() impl */
259249
DPNP_FN_LESS_EXT, /**< Used in numpy.less() impl, requires extra parameters
260250
*/
261251
DPNP_FN_LESS_EQUAL_EXT, /**< Used in numpy.less_equal() impl, requires extra
@@ -325,27 +315,25 @@ enum class DPNPFuncName : size_t
325315
DPNP_FN_PUT_ALONG_AXIS_EXT, /**< Used in numpy.put_along_axis() impl,
326316
requires extra parameters */
327317
DPNP_FN_QR, /**< Used in numpy.linalg.qr() impl */
328-
DPNP_FN_QR_EXT, /**< Used in numpy.linalg.qr() impl, requires extra
329-
parameters */
330-
DPNP_FN_RADIANS, /**< Used in numpy.radians() impl */
331-
DPNP_FN_RADIANS_EXT, /**< Used in numpy.radians() impl, requires extra
332-
parameters */
333-
DPNP_FN_REMAINDER, /**< Used in numpy.remainder() impl */
334-
DPNP_FN_REMAINDER_EXT, /**< Used in numpy.remainder() impl, requires extra
335-
parameters */
336-
DPNP_FN_RECIP, /**< Used in numpy.recip() impl */
337-
DPNP_FN_RECIP_EXT, /**< Used in numpy.recip() impl, requires extra
338-
parameters */
339-
DPNP_FN_REPEAT, /**< Used in numpy.repeat() impl */
340-
DPNP_FN_REPEAT_EXT, /**< Used in numpy.repeat() impl, requires extra
341-
parameters */
342-
DPNP_FN_RIGHT_SHIFT, /**< Used in numpy.right_shift() impl */
343-
DPNP_FN_RIGHT_SHIFT_EXT, /**< Used in numpy.right_shift() impl, requires
344-
extra parameters */
345-
DPNP_FN_RNG_BETA, /**< Used in numpy.random.beta() impl */
346-
DPNP_FN_RNG_BETA_EXT, /**< Used in numpy.random.beta() impl, requires extra
347-
parameters */
348-
DPNP_FN_RNG_BINOMIAL, /**< Used in numpy.random.binomial() impl */
318+
DPNP_FN_QR_EXT, /**< Used in numpy.linalg.qr() impl, requires extra
319+
parameters */
320+
DPNP_FN_RADIANS, /**< Used in numpy.radians() impl */
321+
DPNP_FN_RADIANS_EXT, /**< Used in numpy.radians() impl, requires extra
322+
parameters */
323+
DPNP_FN_REMAINDER, /**< Used in numpy.remainder() impl */
324+
DPNP_FN_REMAINDER_EXT, /**< Used in numpy.remainder() impl, requires extra
325+
parameters */
326+
DPNP_FN_RECIP, /**< Used in numpy.recip() impl */
327+
DPNP_FN_RECIP_EXT, /**< Used in numpy.recip() impl, requires extra
328+
parameters */
329+
DPNP_FN_REPEAT, /**< Used in numpy.repeat() impl */
330+
DPNP_FN_REPEAT_EXT, /**< Used in numpy.repeat() impl, requires extra
331+
parameters */
332+
DPNP_FN_RIGHT_SHIFT, /**< Used in numpy.right_shift() impl */
333+
DPNP_FN_RNG_BETA, /**< Used in numpy.random.beta() impl */
334+
DPNP_FN_RNG_BETA_EXT, /**< Used in numpy.random.beta() impl, requires extra
335+
parameters */
336+
DPNP_FN_RNG_BINOMIAL, /**< Used in numpy.random.binomial() impl */
349337
DPNP_FN_RNG_BINOMIAL_EXT, /**< Used in numpy.random.binomial() impl,
350338
requires extra parameters */
351339
DPNP_FN_RNG_CHISQUARE, /**< Used in numpy.random.chisquare() impl */

‎dpnp/backend/kernels/dpnp_krnl_bitwise.cpp

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,6 @@ void (*dpnp_invert_default_c)(void *,
127127
void *,
128128
size_t) = dpnp_invert_c<_DataType>;
129129

130-
template <typename _DataType>
131-
DPCTLSyclEventRef (*dpnp_invert_ext_c)(DPCTLSyclQueueRef,
132-
void *,
133-
void *,
134-
size_t,
135-
const DPCTLEventVectorRef) =
136-
dpnp_invert_c<_DataType>;
137-
138130
static void func_map_init_bitwise_1arg_1type(func_map_t &fmap)
139131
{
140132
fmap[DPNPFuncName::DPNP_FN_INVERT][eft_BLN][eft_BLN] = {
@@ -144,13 +136,6 @@ static void func_map_init_bitwise_1arg_1type(func_map_t &fmap)
144136
fmap[DPNPFuncName::DPNP_FN_INVERT][eft_LNG][eft_LNG] = {
145137
eft_LNG, (void *)dpnp_invert_default_c<int64_t>};
146138

147-
fmap[DPNPFuncName::DPNP_FN_INVERT_EXT][eft_BLN][eft_BLN] = {
148-
eft_BLN, (void *)dpnp_invert_ext_c<bool>};
149-
fmap[DPNPFuncName::DPNP_FN_INVERT_EXT][eft_INT][eft_INT] = {
150-
eft_INT, (void *)dpnp_invert_ext_c<int32_t>};
151-
fmap[DPNPFuncName::DPNP_FN_INVERT_EXT][eft_LNG][eft_LNG] = {
152-
eft_LNG, (void *)dpnp_invert_ext_c<int64_t>};
153-
154139
return;
155140
}
156141

@@ -399,16 +384,7 @@ static void func_map_init_bitwise_1arg_1type(func_map_t &fmap)
399384
const shape_elem_type *, const void *, const size_t, const size_t, \
400385
const shape_elem_type *, const shape_elem_type *, const void *, \
401386
const size_t, const size_t, const shape_elem_type *, \
402-
const shape_elem_type *, const size_t *) = __name__<_DataType>; \
403-
\
404-
template <typename _DataType> \
405-
DPCTLSyclEventRef (*__name__##_ext)( \
406-
DPCTLSyclQueueRef, void *, const size_t, const size_t, \
407-
const shape_elem_type *, const shape_elem_type *, const void *, \
408-
const size_t, const size_t, const shape_elem_type *, \
409-
const shape_elem_type *, const void *, const size_t, const size_t, \
410-
const shape_elem_type *, const shape_elem_type *, const size_t *, \
411-
const DPCTLEventVectorRef) = __name__<_DataType>;
387+
const shape_elem_type *, const size_t *) = __name__<_DataType>;
412388

413389
#include <dpnp_gen_2arg_1type_tbl.hpp>
414390

@@ -419,57 +395,26 @@ static void func_map_init_bitwise_2arg_1type(func_map_t &fmap)
419395
fmap[DPNPFuncName::DPNP_FN_BITWISE_AND][eft_LNG][eft_LNG] = {
420396
eft_LNG, (void *)dpnp_bitwise_and_c_default<int64_t>};
421397

422-
fmap[DPNPFuncName::DPNP_FN_BITWISE_AND_EXT][eft_BLN][eft_BLN] = {
423-
eft_BLN, (void *)dpnp_bitwise_and_c_ext<bool>};
424-
fmap[DPNPFuncName::DPNP_FN_BITWISE_AND_EXT][eft_INT][eft_INT] = {
425-
eft_INT, (void *)dpnp_bitwise_and_c_ext<int32_t>};
426-
fmap[DPNPFuncName::DPNP_FN_BITWISE_AND_EXT][eft_LNG][eft_LNG] = {
427-
eft_LNG, (void *)dpnp_bitwise_and_c_ext<int64_t>};
428-
429398
fmap[DPNPFuncName::DPNP_FN_BITWISE_OR][eft_INT][eft_INT] = {
430399
eft_INT, (void *)dpnp_bitwise_or_c_default<int32_t>};
431400
fmap[DPNPFuncName::DPNP_FN_BITWISE_OR][eft_LNG][eft_LNG] = {
432401
eft_LNG, (void *)dpnp_bitwise_or_c_default<int64_t>};
433402

434-
fmap[DPNPFuncName::DPNP_FN_BITWISE_OR_EXT][eft_BLN][eft_BLN] = {
435-
eft_BLN, (void *)dpnp_bitwise_or_c_ext<bool>};
436-
fmap[DPNPFuncName::DPNP_FN_BITWISE_OR_EXT][eft_INT][eft_INT] = {
437-
eft_INT, (void *)dpnp_bitwise_or_c_ext<int32_t>};
438-
fmap[DPNPFuncName::DPNP_FN_BITWISE_OR_EXT][eft_LNG][eft_LNG] = {
439-
eft_LNG, (void *)dpnp_bitwise_or_c_ext<int64_t>};
440-
441403
fmap[DPNPFuncName::DPNP_FN_BITWISE_XOR][eft_INT][eft_INT] = {
442404
eft_INT, (void *)dpnp_bitwise_xor_c_default<int32_t>};
443405
fmap[DPNPFuncName::DPNP_FN_BITWISE_XOR][eft_LNG][eft_LNG] = {
444406
eft_LNG, (void *)dpnp_bitwise_xor_c_default<int64_t>};
445407

446-
fmap[DPNPFuncName::DPNP_FN_BITWISE_XOR_EXT][eft_BLN][eft_BLN] = {
447-
eft_BLN, (void *)dpnp_bitwise_xor_c_ext<bool>};
448-
fmap[DPNPFuncName::DPNP_FN_BITWISE_XOR_EXT][eft_INT][eft_INT] = {
449-
eft_INT, (void *)dpnp_bitwise_xor_c_ext<int32_t>};
450-
fmap[DPNPFuncName::DPNP_FN_BITWISE_XOR_EXT][eft_LNG][eft_LNG] = {
451-
eft_LNG, (void *)dpnp_bitwise_xor_c_ext<int64_t>};
452-
453408
fmap[DPNPFuncName::DPNP_FN_LEFT_SHIFT][eft_INT][eft_INT] = {
454409
eft_INT, (void *)dpnp_left_shift_c_default<int32_t>};
455410
fmap[DPNPFuncName::DPNP_FN_LEFT_SHIFT][eft_LNG][eft_LNG] = {
456411
eft_LNG, (void *)dpnp_left_shift_c_default<int64_t>};
457412

458-
fmap[DPNPFuncName::DPNP_FN_LEFT_SHIFT_EXT][eft_INT][eft_INT] = {
459-
eft_INT, (void *)dpnp_left_shift_c_ext<int32_t>};
460-
fmap[DPNPFuncName::DPNP_FN_LEFT_SHIFT_EXT][eft_LNG][eft_LNG] = {
461-
eft_LNG, (void *)dpnp_left_shift_c_ext<int64_t>};
462-
463413
fmap[DPNPFuncName::DPNP_FN_RIGHT_SHIFT][eft_INT][eft_INT] = {
464414
eft_INT, (void *)dpnp_right_shift_c_default<int32_t>};
465415
fmap[DPNPFuncName::DPNP_FN_RIGHT_SHIFT][eft_LNG][eft_LNG] = {
466416
eft_LNG, (void *)dpnp_right_shift_c_default<int64_t>};
467417

468-
fmap[DPNPFuncName::DPNP_FN_RIGHT_SHIFT_EXT][eft_INT][eft_INT] = {
469-
eft_INT, (void *)dpnp_right_shift_c_ext<int32_t>};
470-
fmap[DPNPFuncName::DPNP_FN_RIGHT_SHIFT_EXT][eft_LNG][eft_LNG] = {
471-
eft_LNG, (void *)dpnp_right_shift_c_ext<int64_t>};
472-
473418
return;
474419
}
475420

‎dpnp/dpnp_algo/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ set(dpnp_algo_pyx_deps
1111
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_searching.pxi
1212
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_indexing.pxi
1313
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_logic.pxi
14-
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_bitwise.pxi
1514
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_special.pxi
1615
)
1716

‎dpnp/dpnp_algo/dpnp_algo.pxd

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,6 @@ cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName": # need this na
6666
DPNP_FN_AROUND_EXT
6767
DPNP_FN_ASTYPE
6868
DPNP_FN_ASTYPE_EXT
69-
DPNP_FN_BITWISE_AND
70-
DPNP_FN_BITWISE_AND_EXT
71-
DPNP_FN_BITWISE_OR
72-
DPNP_FN_BITWISE_OR_EXT
73-
DPNP_FN_BITWISE_XOR
74-
DPNP_FN_BITWISE_XOR_EXT
7569
DPNP_FN_CBRT
7670
DPNP_FN_CBRT_EXT
7771
DPNP_FN_CEIL
@@ -152,12 +146,8 @@ cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName": # need this na
152146
DPNP_FN_INITVAL_EXT
153147
DPNP_FN_INV
154148
DPNP_FN_INV_EXT
155-
DPNP_FN_INVERT
156-
DPNP_FN_INVERT_EXT
157149
DPNP_FN_KRON
158150
DPNP_FN_KRON_EXT
159-
DPNP_FN_LEFT_SHIFT
160-
DPNP_FN_LEFT_SHIFT_EXT
161151
DPNP_FN_LOG10
162152
DPNP_FN_LOG10_EXT
163153
DPNP_FN_LOG1P
@@ -208,8 +198,6 @@ cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName": # need this na
208198
DPNP_FN_RECIP_EXT
209199
DPNP_FN_REPEAT
210200
DPNP_FN_REPEAT_EXT
211-
DPNP_FN_RIGHT_SHIFT
212-
DPNP_FN_RIGHT_SHIFT_EXT
213201
DPNP_FN_RNG_BETA
214202
DPNP_FN_RNG_BETA_EXT
215203
DPNP_FN_RNG_BINOMIAL
@@ -425,37 +413,6 @@ cdef DPNPFuncType dpnp_dtype_to_DPNPFuncType(dtype)
425413
cdef dpnp_DPNPFuncType_to_dtype(size_t type)
426414

427415

428-
"""
429-
Bitwise functions
430-
"""
431-
cpdef dpnp_descriptor dpnp_bitwise_and(dpnp_descriptor x1_obj,
432-
dpnp_descriptor x2_obj,
433-
object dtype=*,
434-
dpnp_descriptor out=*,
435-
object where=*)
436-
cpdef dpnp_descriptor dpnp_bitwise_or(dpnp_descriptor x1_obj,
437-
dpnp_descriptor x2_obj,
438-
object dtype=*,
439-
dpnp_descriptor out=*,
440-
object where=*)
441-
cpdef dpnp_descriptor dpnp_bitwise_xor(dpnp_descriptor x1_obj,
442-
dpnp_descriptor x2_obj,
443-
object dtype=*,
444-
dpnp_descriptor out=*,
445-
object where=*)
446-
cpdef dpnp_descriptor dpnp_invert(dpnp_descriptor x1)
447-
cpdef dpnp_descriptor dpnp_left_shift(dpnp_descriptor x1_obj,
448-
dpnp_descriptor x2_obj,
449-
object dtype=*,
450-
dpnp_descriptor out=*,
451-
object where=*)
452-
cpdef dpnp_descriptor dpnp_right_shift(dpnp_descriptor x1_obj,
453-
dpnp_descriptor x2_obj,
454-
object dtype=*,
455-
dpnp_descriptor out=*,
456-
object where=*)
457-
458-
459416
"""
460417
Logic functions
461418
"""

‎dpnp/dpnp_algo/dpnp_algo.pyx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ __all__ = [
6363

6464

6565
include "dpnp_algo_arraycreation.pxi"
66-
include "dpnp_algo_bitwise.pxi"
6766
include "dpnp_algo_counting.pxi"
6867
include "dpnp_algo_indexing.pxi"
6968
include "dpnp_algo_linearalgebra.pxi"

0 commit comments

Comments
 (0)