Skip to content

Commit a72a346

Browse files
authored
sort submodule to desc completed (#869)
1 parent 6c5cdb2 commit a72a346

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

dpnp/dpnp_algo/dpnp_algo_manipulation.pyx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ cpdef utils.dpnp_descriptor dpnp_atleast_2d(utils.dpnp_descriptor arr):
6767

6868
cpdef utils.dpnp_descriptor dpnp_atleast_3d(utils.dpnp_descriptor arr):
6969
# it looks like it should be dpnp.copy + dpnp.reshape
70+
cdef utils.dpnp_descriptor result
7071
cdef size_t arr_ndim = arr.ndim
7172
cdef shape_type_c arr_shape = arr.shape
7273
cdef long arr_size = arr.size

dpnp/dpnp_algo/dpnp_algo_sorting.pyx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,17 @@ cpdef utils.dpnp_descriptor dpnp_argsort(utils.dpnp_descriptor x1):
5050
return call_fptr_1in_1out(DPNP_FN_ARGSORT, x1, x1.shape)
5151

5252

53-
cpdef dparray dpnp_partition(utils.dpnp_descriptor arr, int kth, axis=-1, kind='introselect', order=None):
53+
cpdef utils.dpnp_descriptor dpnp_partition(utils.dpnp_descriptor arr, int kth, axis=-1, kind='introselect', order=None):
5454
cdef shape_type_c shape1 = arr.shape
5555

5656
cdef size_t kth_ = kth if kth >= 0 else (arr.ndim + kth)
5757
cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(arr.dtype)
5858

5959
cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(DPNP_FN_PARTITION, param1_type, param1_type)
6060

61-
result_type = dpnp_DPNPFuncType_to_dtype( < size_t > kernel_data.return_type)
6261
cdef utils.dpnp_descriptor arr2 = dpnp_copy(arr)
6362

64-
cdef dparray result = dparray(arr.shape, dtype=result_type)
63+
cdef utils.dpnp_descriptor result = utils.create_output_descriptor(arr.shape, kernel_data.return_type, None)
6564

6665
cdef fptr_dpnp_partition_t func = <fptr_dpnp_partition_t > kernel_data.ptr
6766

@@ -70,7 +69,7 @@ cpdef dparray dpnp_partition(utils.dpnp_descriptor arr, int kth, axis=-1, kind='
7069
return result
7170

7271

73-
cpdef dparray dpnp_searchsorted(utils.dpnp_descriptor arr, utils.dpnp_descriptor v, side='left'):
72+
cpdef utils.dpnp_descriptor dpnp_searchsorted(utils.dpnp_descriptor arr, utils.dpnp_descriptor v, side='left'):
7473
if side is 'left':
7574
side_ = True
7675
else:
@@ -80,7 +79,7 @@ cpdef dparray dpnp_searchsorted(utils.dpnp_descriptor arr, utils.dpnp_descriptor
8079

8180
cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(DPNP_FN_SEARCHSORTED, param1_type, param1_type)
8281

83-
cdef dparray result = dparray(v.shape, dtype=dpnp.int64)
82+
cdef utils.dpnp_descriptor result = utils_py.create_output_descriptor_py(v.shape, dpnp.int64, None)
8483

8584
cdef fptr_dpnp_searchsorted_t func = <fptr_dpnp_searchsorted_t > kernel_data.ptr
8685

dpnp/dpnp_iface_bitwise.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444

4545

4646
from dpnp.dpnp_algo import *
47-
from dpnp.dparray import dparray
4847
from dpnp.dpnp_utils import *
4948
import dpnp
5049

dpnp/dpnp_iface_sorting.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def partition(x1, kth, axis=-1, kind='introselect', order=None):
128128
elif order is not None:
129129
pass
130130
else:
131-
return dpnp_partition(x1_desc, kth, axis, kind, order)
131+
return dpnp_partition(x1_desc, kth, axis, kind, order).get_pyobj()
132132

133133
return call_origin(numpy.partition, x1, kth, axis, kind, order)
134134

@@ -160,7 +160,7 @@ def searchsorted(x1, x2, side='left', sorter=None):
160160
elif x1_desc.size < 2:
161161
pass
162162
else:
163-
return dpnp_searchsorted(x1_desc, x2_desc, side=side)
163+
return dpnp_searchsorted(x1_desc, x2_desc, side=side).get_pyobj()
164164

165165
return call_origin(numpy.searchsorted, x1, x2, side=side, sorter=sorter)
166166

0 commit comments

Comments
 (0)