Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reuse dpctl.tensor.place for dpnp.place #1337

Merged
merged 5 commits into from
Mar 20, 2023
Merged

Reuse dpctl.tensor.place for dpnp.place #1337

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ce6a81
Reuse dpctl.tensor.place for dpnp.place
vlad-perevezentsev Mar 13, 2023
281e2e8
Small fixes
vlad-perevezentsev Mar 13, 2023
e1cf627
Remove unused declaration and fix remaks
vlad-perevezentsev Mar 14, 2023
437198a
Remove usefixtures for place tests
vlad-perevezentsev Mar 17, 2023
e5ea083
Merge master into reuse_dpctl_place
vlad-perevezentsev Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dpnp/backend/include/dpnp_iface_fptr.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@ enum class DPNPFuncName : size_t
DPNP_FN_PARTITION, /**< Used in numpy.partition() impl */
DPNP_FN_PARTITION_EXT, /**< Used in numpy.partition() impl, requires extra parameters */
DPNP_FN_PLACE, /**< Used in numpy.place() impl */
DPNP_FN_PLACE_EXT, /**< Used in numpy.place() impl, requires extra parameters */
DPNP_FN_POWER, /**< Used in numpy.power() impl */
DPNP_FN_POWER_EXT, /**< Used in numpy.power() impl, requires extra parameters */
DPNP_FN_PROD, /**< Used in numpy.prod() impl */
Expand Down
15 changes: 1 addition & 14 deletions dpnp/backend/kernels/dpnp_krnl_indexing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,20 +546,12 @@ void dpnp_place_c(void* arr_in, long* mask_in, void* vals_in, const size_t arr_s
vals_size,
dep_event_vec_ref);
DPCTLEvent_WaitAndThrow(event_ref);
DPCTLEvent_Delete(event_ref);
}

template <typename _DataType>
void (*dpnp_place_default_c)(void*, long*, void*, const size_t, const size_t) = dpnp_place_c<_DataType>;

template <typename _DataType>
DPCTLSyclEventRef (*dpnp_place_ext_c)(DPCTLSyclQueueRef,
void*,
long*,
void*,
const size_t,
const size_t,
const DPCTLEventVectorRef) = dpnp_place_c<_DataType>;

template <typename _DataType, typename _IndecesType, typename _ValueType>
DPCTLSyclEventRef dpnp_put_c(DPCTLSyclQueueRef q_ref,
void* array1_in,
Expand Down Expand Up @@ -1017,11 +1009,6 @@ void func_map_init_indexing_func(func_map_t& fmap)
fmap[DPNPFuncName::DPNP_FN_PLACE][eft_FLT][eft_FLT] = {eft_FLT, (void*)dpnp_place_default_c<float>};
fmap[DPNPFuncName::DPNP_FN_PLACE][eft_DBL][eft_DBL] = {eft_DBL, (void*)dpnp_place_default_c<double>};

fmap[DPNPFuncName::DPNP_FN_PLACE_EXT][eft_INT][eft_INT] = {eft_INT, (void*)dpnp_place_ext_c<int32_t>};
fmap[DPNPFuncName::DPNP_FN_PLACE_EXT][eft_LNG][eft_LNG] = {eft_LNG, (void*)dpnp_place_ext_c<int64_t>};
fmap[DPNPFuncName::DPNP_FN_PLACE_EXT][eft_FLT][eft_FLT] = {eft_FLT, (void*)dpnp_place_ext_c<float>};
fmap[DPNPFuncName::DPNP_FN_PLACE_EXT][eft_DBL][eft_DBL] = {eft_DBL, (void*)dpnp_place_ext_c<double>};

fmap[DPNPFuncName::DPNP_FN_PUT][eft_INT][eft_INT] = {eft_INT,
(void*)dpnp_put_default_c<int32_t, int64_t, int32_t>};
fmap[DPNPFuncName::DPNP_FN_PUT][eft_LNG][eft_LNG] = {eft_LNG,
Expand Down
1 change: 0 additions & 1 deletion dpnp/dpnp_algo/dpnp_algo.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName": # need this na
DPNP_FN_PARTITION
DPNP_FN_PARTITION_EXT
DPNP_FN_PLACE
DPNP_FN_PLACE_EXT
DPNP_FN_POWER
DPNP_FN_POWER_EXT
DPNP_FN_PROD
Expand Down
36 changes: 0 additions & 36 deletions dpnp/dpnp_algo/dpnp_algo_indexing.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ __all__ += [
"dpnp_diagonal",
"dpnp_fill_diagonal",
"dpnp_indices",
"dpnp_place",
"dpnp_put",
"dpnp_put_along_axis",
"dpnp_putmask",
Expand Down Expand Up @@ -307,41 +306,6 @@ cpdef object dpnp_indices(dimensions):
return dpnp_result


cpdef dpnp_place(dpnp_descriptor arr, object mask, dpnp_descriptor vals):
result_sycl_device, result_usm_type, result_sycl_queue = utils.get_common_usm_allocation(arr, vals)

cdef utils.dpnp_descriptor mask_ = utils_py.create_output_descriptor_py((mask.size,),
dpnp.int64,
None,
device=result_sycl_device,
usm_type=result_usm_type,
sycl_queue=result_sycl_queue)
for i in range(mask.size):
if mask.item(i):
mask_.get_pyobj()[i] = 1
else:
mask_.get_pyobj()[i] = 0
cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(arr.dtype)

cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(DPNP_FN_PLACE_EXT, param1_type, param1_type)

cdef c_dpctl.SyclQueue q = <c_dpctl.SyclQueue> result_sycl_queue
cdef c_dpctl.DPCTLSyclQueueRef q_ref = q.get_queue_ref()

cdef custom_indexing_3in_func_ptr_t func = <custom_indexing_3in_func_ptr_t > kernel_data.ptr
antonwolfy marked this conversation as resolved.
Show resolved Hide resolved

cdef c_dpctl.DPCTLSyclEventRef event_ref = func(q_ref,
arr.get_data(),
mask_.get_data(),
vals.get_data(),
arr.size,
vals.size,
NULL) # dep_events_ref

with nogil: c_dpctl.DPCTLEvent_WaitAndThrow(event_ref)
c_dpctl.DPCTLEvent_Delete(event_ref)


cpdef dpnp_put(dpnp_descriptor x1, object ind, v):
ind_is_list = isinstance(ind, list)

Expand Down
23 changes: 13 additions & 10 deletions dpnp/dpnp_iface_indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ def nonzero(x, /):
-------
y : tuple[dpnp.ndarray]
Indices of elements that are non-zero.

Limitations
-----------
Parameters `x` is supported as either :class:`dpnp.ndarray`
Expand Down Expand Up @@ -342,24 +342,27 @@ def nonzero(x, /):
return call_origin(numpy.nonzero, x)


def place(x1, mask, vals):
def place(x, mask, vals, /):
"""
Change elements of an array based on conditional and input values.
For full documentation refer to :obj:`numpy.place`.

Limitations
-----------
Input arrays ``arr`` and ``mask`` are supported as :obj:`dpnp.ndarray`.
Parameter ``vals`` is supported as 1-D sequence.
Parameters `x`, `mask` and `vals` are supported either
:class:`dpnp.ndarray` or :class:`dpctl.tensor.usm_ndarray`.
Otherwise the function will be executed sequentially on CPU.
Parameter `vals` is supported as 1-D sequence.
antonwolfy marked this conversation as resolved.
Show resolved Hide resolved
"""

x1_desc = dpnp.get_dpnp_descriptor(x1, copy_when_nondefault_queue=False)
mask_desc = dpnp.get_dpnp_descriptor(mask, copy_when_nondefault_queue=False)
vals_desc = dpnp.get_dpnp_descriptor(vals, copy_when_nondefault_queue=False)
if x1_desc and mask_desc and vals_desc:
return dpnp_place(x1_desc, mask, vals_desc)
check_type = lambda x: isinstance(x, (dpnp_array, dpt.usm_ndarray))
if check_type(x) and check_type(mask) and check_type(vals):
dpt_array = x.get_array() if isinstance(x, dpnp_array) else x
dpt_mask = mask.get_array() if isinstance(mask, dpnp_array) else mask
dpt_vals = vals.get_array() if isinstance(vals, dpnp_array) else vals
return dpt.place(dpt_array, dpt_mask, dpt_vals)

return call_origin(numpy.place, x1, mask, vals, dpnp_inplace=True)
return call_origin(numpy.place, x, mask, vals, dpnp_inplace=True)


def put(x1, ind, v, mode='raise'):
Expand Down
6 changes: 0 additions & 6 deletions tests/skipped_tests.tbl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,12 +514,6 @@ tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_5_{
tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_6_{shape=(3, 3), val=(2, 2), wrap=True}::test_columnar_slice
tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_7_{shape=(3, 3), val=(2, 2), wrap=False}::test_columnar_slice
tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_9_{shape=(2, 2, 2), val=1, wrap=False}::test_1darray
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlaceRaises_param_0_{shape=(7,)}::test_place_empty_value_error
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlaceRaises_param_0_{shape=(7,)}::test_place_shape_unmatch_error
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlaceRaises_param_1_{shape=(2, 3)}::test_place_empty_value_error
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlaceRaises_param_1_{shape=(2, 3)}::test_place_shape_unmatch_error
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlaceRaises_param_2_{shape=(4, 3, 2)}::test_place_empty_value_error
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlaceRaises_param_2_{shape=(4, 3, 2)}::test_place_shape_unmatch_error
tests/third_party/cupy/indexing_tests/test_insert.py::TestPutmaskDifferentDtypes::test_putmask_differnt_dtypes_raises
tests/third_party/cupy/indexing_tests/test_insert.py::TestPutmask::test_putmask_non_equal_shape_raises
tests/third_party/cupy/indexing_tests/test_iterate.py::TestFlatiter::test_next
Expand Down
15 changes: 0 additions & 15 deletions tests/skipped_tests_gpu.tbl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,6 @@ tests/test_sycl_queue.py::test_1in_1out[opencl:gpu:0-trapz-data19]
tests/test_sycl_queue.py::test_1in_1out[opencl:cpu:0-trapz-data19]

tests/third_party/cupy/indexing_tests/test_indexing.py::TestIndexing::test_take_no_axis
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlace_param_3_{n_vals=1, shape=(7,)}::test_place
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlace_param_4_{n_vals=1, shape=(2, 3)}::test_place
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlace_param_5_{n_vals=1, shape=(4, 3, 2)}::test_place
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlace_param_6_{n_vals=3, shape=(7,)}::test_place
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlace_param_7_{n_vals=3, shape=(2, 3)}::test_place
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlace_param_8_{n_vals=3, shape=(4, 3, 2)}::test_place
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlace_param_9_{n_vals=15, shape=(7,)}::test_place
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlace_param_10_{n_vals=15, shape=(2, 3)}::test_place
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlace_param_11_{n_vals=15, shape=(4, 3, 2)}::test_place
tests/third_party/cupy/indexing_tests/test_insert.py::TestDiagIndices_param_0_{n=2, ndim=2}::test_diag_indices
tests/third_party/cupy/indexing_tests/test_insert.py::TestDiagIndices_param_1_{n=2, ndim=3}::test_diag_indices
tests/third_party/cupy/indexing_tests/test_insert.py::TestDiagIndices_param_2_{n=2, ndim=1}::test_diag_indices
Expand Down Expand Up @@ -708,12 +699,6 @@ tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_5_{
tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_6_{shape=(3, 3), val=(2, 2), wrap=True}::test_columnar_slice
tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_7_{shape=(3, 3), val=(2, 2), wrap=False}::test_columnar_slice
tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_9_{shape=(2, 2, 2), val=1, wrap=False}::test_1darray
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlaceRaises_param_0_{shape=(7,)}::test_place_empty_value_error
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlaceRaises_param_0_{shape=(7,)}::test_place_shape_unmatch_error
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlaceRaises_param_1_{shape=(2, 3)}::test_place_empty_value_error
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlaceRaises_param_1_{shape=(2, 3)}::test_place_shape_unmatch_error
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlaceRaises_param_2_{shape=(4, 3, 2)}::test_place_empty_value_error
tests/third_party/cupy/indexing_tests/test_insert.py::TestPlaceRaises_param_2_{shape=(4, 3, 2)}::test_place_shape_unmatch_error
tests/third_party/cupy/indexing_tests/test_insert.py::TestPutmaskDifferentDtypes::test_putmask_differnt_dtypes_raises
tests/third_party/cupy/indexing_tests/test_insert.py::TestPutmask::test_putmask_non_equal_shape_raises
tests/third_party/cupy/indexing_tests/test_iterate.py::TestFlatiter::test_next
Expand Down
9 changes: 6 additions & 3 deletions tests/test_indexing.py
View file
Open in desktop
antonwolfy marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,9 @@ def test_place1(arr, mask, vals):
ia = dpnp.array(a)
m = numpy.array(mask)
im = dpnp.array(m)
iv = dpnp.array(vals)
numpy.place(a, m, vals)
dpnp.place(ia, im, vals)
dpnp.place(ia, im, iv)
assert_array_equal(a, ia)


Expand All @@ -162,8 +163,9 @@ def test_place2(arr, mask, vals):
ia = dpnp.array(a)
m = numpy.array(mask)
im = dpnp.array(m)
iv = dpnp.array(vals)
numpy.place(a, m, vals)
dpnp.place(ia, im, vals)
dpnp.place(ia, im, iv)
assert_array_equal(a, ia)


Expand All @@ -187,8 +189,9 @@ def test_place3(arr, mask, vals):
ia = dpnp.array(a)
m = numpy.array(mask)
im = dpnp.array(m)
iv = dpnp.array(vals)
numpy.place(a, m, vals)
dpnp.place(ia, im, vals)
dpnp.place(ia, im, iv)
assert_array_equal(a, ia)


Expand Down
1 change: 1 addition & 0 deletions tests/third_party/cupy/indexing_tests/test_insert.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class TestPlaceRaises(unittest.TestCase):
# https://github.com/numpy/numpy/pull/5821
@testing.with_requires('numpy>=1.10')
@testing.for_all_dtypes()
@pytest.mark.usefixtures("allow_fall_back_on_numpy")
def test_place_empty_value_error(self, dtype):
for xp in (numpy, cupy):
a = testing.shaped_arange(self.shape, xp, dtype)
Expand Down
11 changes: 9 additions & 2 deletions tests/third_party/cupy/testing/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# from dpnp.core import internal
from tests.third_party.cupy.testing import array
from tests.third_party.cupy.testing import parameterized
from dpctl import select_default_device
# import dpnp
# import dpnp.scipy.sparse

Expand Down Expand Up @@ -654,9 +655,15 @@ def test_func(self, *args, **kw):
return test_func
return decorator

def _get_supported_float_dtypes():
if select_default_device().has_aspect_fp64:
return (numpy.float64, numpy.float32)
else:
return (numpy.float32,)


_complex_dtypes = ()
_regular_float_dtypes = (numpy.float64, numpy.float32)
_regular_float_dtypes = _get_supported_float_dtypes()
_float_dtypes = _regular_float_dtypes
_signed_dtypes = ()
_unsigned_dtypes = tuple(numpy.dtype(i).type for i in 'BHILQ')
Expand All @@ -667,7 +674,7 @@ def test_func(self, *args, **kw):


def _make_all_dtypes(no_float16, no_bool, no_complex):
return (numpy.float64, numpy.float32, numpy.int64, numpy.int32)
return (numpy.int64, numpy.int32) + _get_supported_float_dtypes()
# if no_float16:
# dtypes = _regular_float_dtypes
# else:
Expand Down