Skip to content

Commit 07d3a3e

Browse files
npolina4npolina4
authored
Reuse dpctl.tensor comparison functions. (#1458)
* Reuse dpctl.tensor comparison functions. * Fixed remarks for comparison functions. * Skip part of test_bounds_fallback tests on Windows.
1 parent a1a9b14 commit 07d3a3e

6 files changed

Lines changed: 443 additions & 344 deletions

File tree

‎dpnp/dpnp_algo/dpnp_algo.pxd‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName": # need this na
120120
DPNP_FN_EIG_EXT
121121
DPNP_FN_EIGVALS
122122
DPNP_FN_EIGVALS_EXT
123-
DPNP_FN_EQUAL_EXT
124123
DPNP_FN_ERF
125124
DPNP_FN_ERF_EXT
126125
DPNP_FN_EYE
@@ -149,8 +148,6 @@ cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName": # need this na
149148
DPNP_FN_FMOD_EXT
150149
DPNP_FN_FULL
151150
DPNP_FN_FULL_LIKE
152-
DPNP_FN_GREATER_EXT
153-
DPNP_FN_GREATER_EQUAL_EXT
154151
DPNP_FN_HYPOT
155152
DPNP_FN_HYPOT_EXT
156153
DPNP_FN_IDENTITY
@@ -165,8 +162,6 @@ cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName": # need this na
165162
DPNP_FN_KRON_EXT
166163
DPNP_FN_LEFT_SHIFT
167164
DPNP_FN_LEFT_SHIFT_EXT
168-
DPNP_FN_LESS_EXT
169-
DPNP_FN_LESS_EQUAL_EXT
170165
DPNP_FN_LOG
171166
DPNP_FN_LOG_EXT
172167
DPNP_FN_LOG10
@@ -200,7 +195,6 @@ cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName": # need this na
200195
DPNP_FN_NEGATIVE
201196
DPNP_FN_NEGATIVE_EXT
202197
DPNP_FN_NONZERO
203-
DPNP_FN_NOT_EQUAL_EXT
204198
DPNP_FN_ONES
205199
DPNP_FN_ONES_LIKE
206200
DPNP_FN_PARTITION
@@ -481,18 +475,12 @@ cpdef dpnp_descriptor dpnp_right_shift(dpnp_descriptor x1_obj,
481475
"""
482476
Logic functions
483477
"""
484-
cpdef dpnp_descriptor dpnp_equal(dpnp_descriptor array1, dpnp_descriptor input2)
485-
cpdef dpnp_descriptor dpnp_greater(dpnp_descriptor input1, dpnp_descriptor input2)
486-
cpdef dpnp_descriptor dpnp_greater_equal(dpnp_descriptor input1, dpnp_descriptor input2)
487478
cpdef dpnp_descriptor dpnp_isclose(dpnp_descriptor input1, dpnp_descriptor input2,
488479
double rtol=*, double atol=*, cpp_bool equal_nan=*)
489-
cpdef dpnp_descriptor dpnp_less(dpnp_descriptor input1, dpnp_descriptor input2)
490-
cpdef dpnp_descriptor dpnp_less_equal(dpnp_descriptor input1, dpnp_descriptor input2)
491480
cpdef dpnp_descriptor dpnp_logical_and(dpnp_descriptor input1, dpnp_descriptor input2)
492481
cpdef dpnp_descriptor dpnp_logical_not(dpnp_descriptor input1)
493482
cpdef dpnp_descriptor dpnp_logical_or(dpnp_descriptor input1, dpnp_descriptor input2)
494483
cpdef dpnp_descriptor dpnp_logical_xor(dpnp_descriptor input1, dpnp_descriptor input2)
495-
cpdef dpnp_descriptor dpnp_not_equal(dpnp_descriptor input1, dpnp_descriptor input2)
496484

497485

498486
"""

‎dpnp/dpnp_algo/dpnp_algo_logic.pxi‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,14 @@ __all__ += [
3939
"dpnp_all",
4040
"dpnp_allclose",
4141
"dpnp_any",
42-
"dpnp_equal",
43-
"dpnp_greater",
44-
"dpnp_greater_equal",
4542
"dpnp_isclose",
4643
"dpnp_isfinite",
4744
"dpnp_isinf",
4845
"dpnp_isnan",
49-
"dpnp_less",
50-
"dpnp_less_equal",
5146
"dpnp_logical_and",
5247
"dpnp_logical_not",
5348
"dpnp_logical_or",
5449
"dpnp_logical_xor",
55-
"dpnp_not_equal"
5650
]
5751

5852

@@ -167,30 +161,6 @@ cpdef utils.dpnp_descriptor dpnp_any(utils.dpnp_descriptor array1):
167161
return result
168162

169163

170-
cpdef utils.dpnp_descriptor dpnp_equal(utils.dpnp_descriptor x1_obj,
171-
utils.dpnp_descriptor x2_obj,
172-
object dtype=None,
173-
utils.dpnp_descriptor out=None,
174-
object where=True):
175-
return call_fptr_2in_1out_strides(DPNP_FN_EQUAL_EXT, x1_obj, x2_obj, dtype, out, where, func_name="equal")
176-
177-
178-
cpdef utils.dpnp_descriptor dpnp_greater(utils.dpnp_descriptor x1_obj,
179-
utils.dpnp_descriptor x2_obj,
180-
object dtype=None,
181-
utils.dpnp_descriptor out=None,
182-
object where=True):
183-
return call_fptr_2in_1out_strides(DPNP_FN_GREATER_EXT, x1_obj, x2_obj, dtype, out, where, func_name="greater")
184-
185-
186-
cpdef utils.dpnp_descriptor dpnp_greater_equal(utils.dpnp_descriptor x1_obj,
187-
utils.dpnp_descriptor x2_obj,
188-
object dtype=None,
189-
utils.dpnp_descriptor out=None,
190-
object where=True):
191-
return call_fptr_2in_1out_strides(DPNP_FN_GREATER_EQUAL_EXT, x1_obj, x2_obj, dtype, out, where, func_name="greater_equal")
192-
193-
194164
cpdef utils.dpnp_descriptor dpnp_isclose(utils.dpnp_descriptor input1,
195165
utils.dpnp_descriptor input2,
196166
double rtol=1e-05,
@@ -255,22 +225,6 @@ cpdef utils.dpnp_descriptor dpnp_isnan(utils.dpnp_descriptor input1):
255225
return result
256226

257227

258-
cpdef utils.dpnp_descriptor dpnp_less(utils.dpnp_descriptor x1_obj,
259-
utils.dpnp_descriptor x2_obj,
260-
object dtype=None,
261-
utils.dpnp_descriptor out=None,
262-
object where=True):
263-
return call_fptr_2in_1out_strides(DPNP_FN_LESS_EXT, x1_obj, x2_obj, dtype, out, where, func_name="less")
264-
265-
266-
cpdef utils.dpnp_descriptor dpnp_less_equal(utils.dpnp_descriptor x1_obj,
267-
utils.dpnp_descriptor x2_obj,
268-
object dtype=None,
269-
utils.dpnp_descriptor out=None,
270-
object where=True):
271-
return call_fptr_2in_1out_strides(DPNP_FN_LESS_EQUAL_EXT, x1_obj, x2_obj, dtype, out, where, func_name="less_equal")
272-
273-
274228
cpdef utils.dpnp_descriptor dpnp_logical_and(utils.dpnp_descriptor x1_obj,
275229
utils.dpnp_descriptor x2_obj,
276230
object dtype=None,
@@ -300,11 +254,3 @@ cpdef utils.dpnp_descriptor dpnp_logical_xor(utils.dpnp_descriptor x1_obj,
300254
utils.dpnp_descriptor out=None,
301255
object where=True):
302256
return call_fptr_2in_1out_strides(DPNP_FN_LOGICAL_XOR_EXT, x1_obj, x2_obj, dtype, out, where, func_name="logical_xor")
303-
304-
305-
cpdef utils.dpnp_descriptor dpnp_not_equal(utils.dpnp_descriptor x1_obj,
306-
utils.dpnp_descriptor x2_obj,
307-
object dtype=None,
308-
utils.dpnp_descriptor out=None,
309-
object where=True):
310-
return call_fptr_2in_1out_strides(DPNP_FN_NOT_EQUAL_EXT, x1_obj, x2_obj, dtype, out, where, func_name="not_equal")

0 commit comments

Comments
 (0)