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

implement dpnp.argmin and dpnp.argmax using dpctl.tensor #1610

Merged
merged 17 commits into from
Nov 23, 2023
Merged

implement dpnp.argmin and dpnp.argmax using dpctl.tensor #1610

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2a38192
rework implementation of diag, diagflat, vander, and ptp
vtavana Sep 29, 2023
6d3f817
address comments - first round
vtavana Oct 22, 2023
0b86691
address comments - second round
vtavana Oct 26, 2023
bd6fcb0
add tests for negative use cases to improve covergae
vtavana Oct 30, 2023
8e870e8
fixed missing merge conflicts
vtavana Nov 8, 2023
5b5439d
fix pre-commit
vtavana Nov 8, 2023
fd38502
implement dpnp.argmin and dpnp.argmax using dpctl.tensor
vtavana Oct 16, 2023
14f043f
address comments
vtavana Oct 27, 2023
e026c37
add tests for negative use cases to improve coverage
vtavana Oct 30, 2023
dec3e57
remove unneccessary parts with updates in dpctl #1465
vtavana Nov 9, 2023
9ebb8a6
Merge branch 'master' into argmin_argmax
vtavana Nov 20, 2023
3eb40d6
add paramater section in doc
vtavana Nov 20, 2023
ccdf3c4
update ndarray.argmin and ndarray.argmax function signature
vtavana Nov 20, 2023
655182a
use a utility func for returning output
vtavana Nov 20, 2023
30f87eb
add tests for ndarray implementation
vtavana Nov 21, 2023
df98a82
Place new function acc to lexicographical order
antonwolfy Nov 22, 2023
618aba0
Merge branch 'master' into argmin_argmax
antonwolfy Nov 23, 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
4 changes: 0 additions & 4 deletions dpnp/backend/include/dpnp_iface_fptr.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,7 @@ enum class DPNPFuncName : size_t
DPNP_FN_ARCTAN2, /**< Used in numpy.arctan2() impl */
DPNP_FN_ARCTANH, /**< Used in numpy.arctanh() impl */
DPNP_FN_ARGMAX, /**< Used in numpy.argmax() impl */
DPNP_FN_ARGMAX_EXT, /**< Used in numpy.argmax() impl, requires extra
parameters */
DPNP_FN_ARGMIN, /**< Used in numpy.argmin() impl */
DPNP_FN_ARGMIN_EXT, /**< Used in numpy.argmin() impl, requires extra
parameters */
DPNP_FN_ARGSORT, /**< Used in numpy.argsort() impl */
DPNP_FN_ARGSORT_EXT, /**< Used in numpy.argsort() impl, requires extra
parameters */
Expand Down
50 changes: 0 additions & 50 deletions dpnp/backend/kernels/dpnp_krnl_searching.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,6 @@ void (*dpnp_argmax_default_c)(void *,
void *,
size_t) = dpnp_argmax_c<_DataType, _idx_DataType>;

template <typename _DataType, typename _idx_DataType>
DPCTLSyclEventRef (*dpnp_argmax_ext_c)(DPCTLSyclQueueRef,
void *,
void *,
size_t,
const DPCTLEventVectorRef) =
dpnp_argmax_c<_DataType, _idx_DataType>;

template <typename _DataType, typename _idx_DataType>
class dpnp_argmin_c_kernel;

Expand Down Expand Up @@ -133,14 +125,6 @@ void (*dpnp_argmin_default_c)(void *,
void *,
size_t) = dpnp_argmin_c<_DataType, _idx_DataType>;

template <typename _DataType, typename _idx_DataType>
DPCTLSyclEventRef (*dpnp_argmin_ext_c)(DPCTLSyclQueueRef,
void *,
void *,
size_t,
const DPCTLEventVectorRef) =
dpnp_argmin_c<_DataType, _idx_DataType>;

void func_map_init_searching(func_map_t &fmap)
{
fmap[DPNPFuncName::DPNP_FN_ARGMAX][eft_INT][eft_INT] = {
Expand All @@ -160,23 +144,6 @@ void func_map_init_searching(func_map_t &fmap)
fmap[DPNPFuncName::DPNP_FN_ARGMAX][eft_DBL][eft_LNG] = {
eft_LNG, (void *)dpnp_argmax_default_c<double, int64_t>};

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

fmap[DPNPFuncName::DPNP_FN_ARGMIN][eft_INT][eft_INT] = {
eft_INT, (void *)dpnp_argmin_default_c<int32_t, int32_t>};
fmap[DPNPFuncName::DPNP_FN_ARGMIN][eft_INT][eft_LNG] = {
Expand All @@ -194,22 +161,5 @@ void func_map_init_searching(func_map_t &fmap)
fmap[DPNPFuncName::DPNP_FN_ARGMIN][eft_DBL][eft_LNG] = {
eft_LNG, (void *)dpnp_argmin_default_c<double, int64_t>};

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

return;
}
1 change: 0 additions & 1 deletion dpnp/dpnp_algo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ set(dpnp_algo_pyx_deps
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_sorting.pxi
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_arraycreation.pxi
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_mathematical.pxi
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_searching.pxi
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_indexing.pxi
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_logic.pxi
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_special.pxi
Expand Down
10 changes: 0 additions & 10 deletions dpnp/dpnp_algo/dpnp_algo.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName": # need this na
DPNP_FN_ALLCLOSE
DPNP_FN_ALLCLOSE_EXT
DPNP_FN_ARANGE
DPNP_FN_ARGMAX
DPNP_FN_ARGMAX_EXT
DPNP_FN_ARGMIN
DPNP_FN_ARGMIN_EXT
DPNP_FN_ARGSORT
DPNP_FN_ARGSORT_EXT
DPNP_FN_CBRT
Expand Down Expand Up @@ -355,12 +351,6 @@ Sorting functions
cpdef dpnp_descriptor dpnp_argsort(dpnp_descriptor array1)
cpdef dpnp_descriptor dpnp_sort(dpnp_descriptor array1)

"""
Searching functions
"""
cpdef dpnp_descriptor dpnp_argmax(dpnp_descriptor array1)
cpdef dpnp_descriptor dpnp_argmin(dpnp_descriptor array1)

"""
Trigonometric functions
"""
Expand Down
1 change: 0 additions & 1 deletion dpnp/dpnp_algo/dpnp_algo.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ include "dpnp_algo_indexing.pxi"
include "dpnp_algo_linearalgebra.pxi"
include "dpnp_algo_logic.pxi"
include "dpnp_algo_mathematical.pxi"
include "dpnp_algo_searching.pxi"
include "dpnp_algo_sorting.pxi"
include "dpnp_algo_special.pxi"
include "dpnp_algo_statistics.pxi"
Expand Down
119 changes: 0 additions & 119 deletions dpnp/dpnp_algo/dpnp_algo_searching.pxi
View file
Open in desktop

This file was deleted.

39 changes: 2 additions & 37 deletions dpnp/dpnp_array.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,28 +490,7 @@ def argmax(self, axis=None, out=None):
"""
Returns array of indices of the maximum values along the given axis.

Parameters
----------
axis : {None, integer}
If None, the index is into the flattened array, otherwise along
the specified axis
out : {None, array}, optional
Array into which the result can be placed. Its type is preserved
and it must be of the right shape to hold the output.

Returns
-------
index_array : {integer_array}

Examples
--------
>>> a = np.arange(6).reshape(2,3)
>>> a.argmax()
5
>>> a.argmax(0)
array([1, 1, 1])
>>> a.argmax(1)
array([2, 2])
Refer to :obj:`dpnp.argmax` for full documentation.

"""
return dpnp.argmax(self, axis, out)
vtavana marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -520,21 +499,7 @@ def argmin(self, axis=None, out=None):
"""
Return array of indices to the minimum values along the given axis.

Parameters
----------
axis : {None, integer}
If None, the index is into the flattened array, otherwise along
the specified axis
out : {None, array}, optional
Array into which the result can be placed. Its type is preserved
and it must be of the right shape to hold the output.

Returns
-------
ndarray or scalar
If multi-dimension input, returns a new ndarray of indices to the
minimum values along the given axis. Otherwise, returns a scalar
of index to the minimum values along the given axis.
Refer to :obj:`dpnp.argmin` for full documentation.

"""
return dpnp.argmin(self, axis, out)
Expand Down
Loading
Loading