Skip to content

Commit 61120c7

Browse files
densmirndensmirn
authored
Fallback logical operations (#971)
1 parent b3ff024 commit 61120c7

1 file changed

Lines changed: 107 additions & 109 deletions

File tree

‎dpnp/dpnp_iface_logic.py‎

Lines changed: 107 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -251,17 +251,17 @@ def equal(x1, x2):
251251
252252
"""
253253

254-
x1_desc = dpnp.get_dpnp_descriptor(x1)
255-
x2_desc = dpnp.get_dpnp_descriptor(x2)
256-
if x1_desc and x2_desc:
257-
if x1_desc.size != x2_desc.size:
258-
pass
259-
elif x1_desc.dtype != x2_desc.dtype:
260-
pass
261-
elif x1_desc.shape != x2_desc.shape:
262-
pass
263-
else:
264-
return dpnp_equal(x1_desc, x2_desc).get_pyobj()
254+
# x1_desc = dpnp.get_dpnp_descriptor(x1)
255+
# x2_desc = dpnp.get_dpnp_descriptor(x2)
256+
# if x1_desc and x2_desc:
257+
# if x1_desc.size != x2_desc.size:
258+
# pass
259+
# elif x1_desc.dtype != x2_desc.dtype:
260+
# pass
261+
# elif x1_desc.shape != x2_desc.shape:
262+
# pass
263+
# else:
264+
# return dpnp_equal(x1_desc, x2_desc).get_pyobj()
265265

266266
return call_origin(numpy.equal, x1, x2)
267267

@@ -297,15 +297,15 @@ def greater(x1, x2):
297297
298298
"""
299299

300-
x1_desc = dpnp.get_dpnp_descriptor(x1)
301-
x2_desc = dpnp.get_dpnp_descriptor(x2)
302-
if x1_desc and x2_desc:
303-
if x1_desc.size < 2:
304-
pass
305-
elif x2_desc.size < 2:
306-
pass
307-
else:
308-
return dpnp_greater(x1_desc, x2_desc).get_pyobj()
300+
# x1_desc = dpnp.get_dpnp_descriptor(x1)
301+
# x2_desc = dpnp.get_dpnp_descriptor(x2)
302+
# if x1_desc and x2_desc:
303+
# if x1_desc.size < 2:
304+
# pass
305+
# elif x2_desc.size < 2:
306+
# pass
307+
# else:
308+
# return dpnp_greater(x1_desc, x2_desc).get_pyobj()
309309

310310
return call_origin(numpy.greater, x1, x2)
311311

@@ -341,15 +341,15 @@ def greater_equal(x1, x2):
341341
342342
"""
343343

344-
x1_desc = dpnp.get_dpnp_descriptor(x1)
345-
x2_desc = dpnp.get_dpnp_descriptor(x2)
346-
if x1_desc and x2_desc:
347-
if x1_desc.size < 2:
348-
pass
349-
elif x2_desc.size < 2:
350-
pass
351-
else:
352-
return dpnp_greater_equal(x1_desc, x2_desc).get_pyobj()
344+
# x1_desc = dpnp.get_dpnp_descriptor(x1)
345+
# x2_desc = dpnp.get_dpnp_descriptor(x2)
346+
# if x1_desc and x2_desc:
347+
# if x1_desc.size < 2:
348+
# pass
349+
# elif x2_desc.size < 2:
350+
# pass
351+
# else:
352+
# return dpnp_greater_equal(x1_desc, x2_desc).get_pyobj()
353353

354354
return call_origin(numpy.greater_equal, x1, x2)
355355

@@ -381,14 +381,12 @@ def isclose(x1, x2, rtol=1e-05, atol=1e-08, equal_nan=False):
381381
[True, False]
382382
383383
"""
384-
if config.__DPNP_OUTPUT_DPCTL__:
385-
return call_origin(numpy.isclose, x1, x2, rtol=rtol, atol=atol, equal_nan=equal_nan)
386384

387-
x1_desc = dpnp.get_dpnp_descriptor(x1)
388-
x2_desc = dpnp.get_dpnp_descriptor(x2)
389-
if x1_desc and x2_desc:
390-
result_obj = dpnp_isclose(x1_desc, x2_desc, rtol, atol, equal_nan).get_pyobj()
391-
return result_obj
385+
# x1_desc = dpnp.get_dpnp_descriptor(x1)
386+
# x2_desc = dpnp.get_dpnp_descriptor(x2)
387+
# if x1_desc and x2_desc:
388+
# result_obj = dpnp_isclose(x1_desc, x2_desc, rtol, atol, equal_nan).get_pyobj()
389+
# return result_obj
392390

393391
return call_origin(numpy.isclose, x1, x2, rtol=rtol, atol=atol, equal_nan=equal_nan)
394392

@@ -433,12 +431,12 @@ def isfinite(x1, out=None, **kwargs):
433431
434432
"""
435433

436-
x1_desc = dpnp.get_dpnp_descriptor(x1)
437-
if x1_desc and kwargs:
438-
if out is not None:
439-
pass
440-
else:
441-
return dpnp_isfinite(x1_desc).get_pyobj()
434+
# x1_desc = dpnp.get_dpnp_descriptor(x1)
435+
# if x1_desc and kwargs:
436+
# if out is not None:
437+
# pass
438+
# else:
439+
# return dpnp_isfinite(x1_desc).get_pyobj()
442440

443441
return call_origin(numpy.isfinite, x1, out, **kwargs)
444442

@@ -478,12 +476,12 @@ def isinf(x1, out=None, **kwargs):
478476
479477
"""
480478

481-
x1_desc = dpnp.get_dpnp_descriptor(x1)
482-
if x1_desc and kwargs:
483-
if out is not None:
484-
pass
485-
else:
486-
return dpnp_isinf(x1_desc).get_pyobj()
479+
# x1_desc = dpnp.get_dpnp_descriptor(x1)
480+
# if x1_desc and kwargs:
481+
# if out is not None:
482+
# pass
483+
# else:
484+
# return dpnp_isinf(x1_desc).get_pyobj()
487485

488486
return call_origin(numpy.isinf, x1, out, **kwargs)
489487

@@ -524,12 +522,12 @@ def isnan(x1, out=None, **kwargs):
524522
525523
"""
526524

527-
x1_desc = dpnp.get_dpnp_descriptor(x1)
528-
if x1_desc and kwargs:
529-
if out is not None:
530-
pass
531-
else:
532-
return dpnp_isnan(x1_desc).get_pyobj()
525+
# x1_desc = dpnp.get_dpnp_descriptor(x1)
526+
# if x1_desc and kwargs:
527+
# if out is not None:
528+
# pass
529+
# else:
530+
# return dpnp_isnan(x1_desc).get_pyobj()
533531

534532
return call_origin(numpy.isnan, x1, out, **kwargs)
535533

@@ -565,15 +563,15 @@ def less(x1, x2):
565563
566564
"""
567565

568-
x1_desc = dpnp.get_dpnp_descriptor(x1)
569-
x2_desc = dpnp.get_dpnp_descriptor(x2)
570-
if x1_desc and x2_desc:
571-
if x1_desc.size < 2:
572-
pass
573-
elif x2_desc.size < 2:
574-
pass
575-
else:
576-
return dpnp_less(x1_desc, x2_desc).get_pyobj()
566+
# x1_desc = dpnp.get_dpnp_descriptor(x1)
567+
# x2_desc = dpnp.get_dpnp_descriptor(x2)
568+
# if x1_desc and x2_desc:
569+
# if x1_desc.size < 2:
570+
# pass
571+
# elif x2_desc.size < 2:
572+
# pass
573+
# else:
574+
# return dpnp_less(x1_desc, x2_desc).get_pyobj()
577575

578576
return call_origin(numpy.less, x1, x2)
579577

@@ -609,15 +607,15 @@ def less_equal(x1, x2):
609607
610608
"""
611609

612-
x1_desc = dpnp.get_dpnp_descriptor(x1)
613-
x2_desc = dpnp.get_dpnp_descriptor(x2)
614-
if x1_desc and x2_desc:
615-
if x1_desc.size < 2:
616-
pass
617-
elif x2_desc.size < 2:
618-
pass
619-
else:
620-
return dpnp_less_equal(x1_desc, x2_desc).get_pyobj()
610+
# x1_desc = dpnp.get_dpnp_descriptor(x1)
611+
# x2_desc = dpnp.get_dpnp_descriptor(x2)
612+
# if x1_desc and x2_desc:
613+
# if x1_desc.size < 2:
614+
# pass
615+
# elif x2_desc.size < 2:
616+
# pass
617+
# else:
618+
# return dpnp_less_equal(x1_desc, x2_desc).get_pyobj()
621619

622620
return call_origin(numpy.less_equal, x1, x2)
623621

@@ -654,13 +652,13 @@ def logical_and(x1, x2, out=None, **kwargs):
654652
655653
"""
656654

657-
x1_desc = dpnp.get_dpnp_descriptor(x1)
658-
x2_desc = dpnp.get_dpnp_descriptor(x2)
659-
if x1_desc and x2_desc and not kwargs:
660-
if out is not None:
661-
pass
662-
else:
663-
return dpnp_logical_and(x1_desc, x2_desc).get_pyobj()
655+
# x1_desc = dpnp.get_dpnp_descriptor(x1)
656+
# x2_desc = dpnp.get_dpnp_descriptor(x2)
657+
# if x1_desc and x2_desc and not kwargs:
658+
# if out is not None:
659+
# pass
660+
# else:
661+
# return dpnp_logical_and(x1_desc, x2_desc).get_pyobj()
664662

665663
return call_origin(numpy.logical_and, x1, x2, out, **kwargs)
666664

@@ -695,12 +693,12 @@ def logical_not(x1, out=None, **kwargs):
695693
696694
"""
697695

698-
x1_desc = dpnp.get_dpnp_descriptor(x1)
699-
if x1_desc and not kwargs:
700-
if out is not None:
701-
pass
702-
else:
703-
return dpnp_logical_not(x1_desc).get_pyobj()
696+
# x1_desc = dpnp.get_dpnp_descriptor(x1)
697+
# if x1_desc and not kwargs:
698+
# if out is not None:
699+
# pass
700+
# else:
701+
# return dpnp_logical_not(x1_desc).get_pyobj()
704702

705703
return call_origin(numpy.logical_not, x1, out, **kwargs)
706704

@@ -737,13 +735,13 @@ def logical_or(x1, x2, out=None, **kwargs):
737735
738736
"""
739737

740-
x1_desc = dpnp.get_dpnp_descriptor(x1)
741-
x2_desc = dpnp.get_dpnp_descriptor(x2)
742-
if x1_desc and x2_desc and not kwargs:
743-
if out is not None:
744-
pass
745-
else:
746-
return dpnp_logical_or(x1_desc, x2_desc).get_pyobj()
738+
# x1_desc = dpnp.get_dpnp_descriptor(x1)
739+
# x2_desc = dpnp.get_dpnp_descriptor(x2)
740+
# if x1_desc and x2_desc and not kwargs:
741+
# if out is not None:
742+
# pass
743+
# else:
744+
# return dpnp_logical_or(x1_desc, x2_desc).get_pyobj()
747745

748746
return call_origin(numpy.logical_or, x1, x2, out, **kwargs)
749747

@@ -780,13 +778,13 @@ def logical_xor(x1, x2, out=None, **kwargs):
780778
781779
"""
782780

783-
x1_desc = dpnp.get_dpnp_descriptor(x1)
784-
x2_desc = dpnp.get_dpnp_descriptor(x2)
785-
if x1_desc and x2_desc and not kwargs:
786-
if out is not None:
787-
pass
788-
else:
789-
return dpnp_logical_xor(x1_desc, x2_desc).get_pyobj()
781+
# x1_desc = dpnp.get_dpnp_descriptor(x1)
782+
# x2_desc = dpnp.get_dpnp_descriptor(x2)
783+
# if x1_desc and x2_desc and not kwargs:
784+
# if out is not None:
785+
# pass
786+
# else:
787+
# return dpnp_logical_xor(x1_desc, x2_desc).get_pyobj()
790788

791789
return call_origin(numpy.logical_xor, x1, x2, out, **kwargs)
792790

@@ -823,16 +821,16 @@ def not_equal(x1, x2):
823821
824822
"""
825823

826-
x1_desc = dpnp.get_dpnp_descriptor(x1)
827-
x2_desc = dpnp.get_dpnp_descriptor(x2)
828-
if x1_desc and x2_desc:
829-
if x1_desc.size < 2:
830-
pass
831-
elif x2_desc.size < 2:
832-
pass
833-
else:
834-
result = dpnp_not_equal(x1_desc, x2_desc).get_pyobj()
824+
# x1_desc = dpnp.get_dpnp_descriptor(x1)
825+
# x2_desc = dpnp.get_dpnp_descriptor(x2)
826+
# if x1_desc and x2_desc:
827+
# if x1_desc.size < 2:
828+
# pass
829+
# elif x2_desc.size < 2:
830+
# pass
831+
# else:
832+
# result = dpnp_not_equal(x1_desc, x2_desc).get_pyobj()
835833

836-
return result
834+
# return result
837835

838836
return call_origin(numpy.not_equal, x1, x2)

0 commit comments

Comments
 (0)