Skip to content

Add dtype and manipulation functions #1566

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

Closed
wants to merge 17 commits into from
Closed

Add dtype and manipulation functions #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
fabf886
Add dtype functions
npolina4 Sep 19, 2023
c02823f
Add atleast 2d and 3d, vstack, repeat, and broadcast_arrays functions
npolina4 Sep 21, 2023
f6738ff
address comments
npolina4 Sep 22, 2023
1faf3cc
Merge branch 'master' into dtype_functions
npolina4 Sep 22, 2023
86e052c
Add more tests
npolina4 Sep 22, 2023
c442a9e
Skip test with random on Iris Xe
npolina4 Sep 22, 2023
fa06664
Removed broadcast_arrays tests from skip list
npolina4 Sep 25, 2023
de1788b
Merge branch 'master' into dtype_functions
npolina4 Sep 25, 2023
485fb60
Clean up dpnp_astype and dpnp_flatten functions
npolina4 Sep 28, 2023
201a8a3
Old implementation removed
npolina4 Oct 3, 2023
589f947
address comments
npolina4 Oct 5, 2023
cb1b909
Merge branch 'master' into dtype_functions
npolina4 Oct 5, 2023
5164a7b
fix pre-commit
npolina4 Oct 5, 2023
ab8e482
fix pre-commit
npolina4 Oct 5, 2023
9182767
fix pre-commit
npolina4 Oct 5, 2023
30a3434
fix pre-commit
npolina4 Oct 5, 2023
df4bbfa
Merge branch 'master' into dtype_functions
npolina4 Oct 6, 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
34 changes: 7 additions & 27 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 @@ -88,8 +88,6 @@ enum class DPNPFuncName : size_t
parameters */
DPNP_FN_AROUND, /**< Used in numpy.around() impl */
DPNP_FN_ASTYPE, /**< Used in numpy.astype() impl */
DPNP_FN_ASTYPE_EXT, /**< Used in numpy.astype() impl, requires extra
parameters */
DPNP_FN_BITWISE_AND, /**< Used in numpy.bitwise_and() impl */
DPNP_FN_BITWISE_OR, /**< Used in numpy.bitwise_or() impl */
DPNP_FN_BITWISE_XOR, /**< Used in numpy.bitwise_xor() impl */
Expand Down Expand Up @@ -160,8 +158,6 @@ enum class DPNPFuncName : size_t
DPNP_FN_EIGVALS, /**< Used in numpy.linalg.eigvals() impl */
DPNP_FN_EIGVALS_EXT, /**< Used in numpy.linalg.eigvals() impl, requires
extra parameters */
DPNP_FN_EQUAL_EXT, /**< Used in numpy.equal() impl, requires extra
parameters */
DPNP_FN_ERF, /**< Used in scipy.special.erf impl */
DPNP_FN_ERF_EXT, /**< Used in scipy.special.erf impl, requires extra
parameters */
Expand All @@ -187,23 +183,15 @@ enum class DPNPFuncName : size_t
DPNP_FN_FILL_DIAGONAL_EXT, /**< Used in numpy.fill_diagonal() impl, requires
extra parameters */
DPNP_FN_FLATTEN, /**< Used in numpy.flatten() impl */
DPNP_FN_FLATTEN_EXT, /**< Used in numpy.flatten() impl, requires extra
parameters */
DPNP_FN_FLOOR, /**< Used in numpy.floor() impl */
DPNP_FN_FLOOR_DIVIDE, /**< Used in numpy.floor_divide() impl */
DPNP_FN_FLOOR_DIVIDE_EXT, /**< Used in numpy.floor_divide() impl, requires
extra parameters */
DPNP_FN_FMOD, /**< Used in numpy.fmod() impl */
DPNP_FN_FMOD_EXT, /**< Used in numpy.fmod() impl, requires extra parameters
*/
DPNP_FN_FULL, /**< Used in numpy.full() impl */
DPNP_FN_FULL_LIKE, /**< Used in numpy.full_like() impl */
DPNP_FN_GREATER_EXT, /**< Used in numpy.greater() impl, requires extra
parameters */
DPNP_FN_GREATER_EQUAL_EXT, /**< Used in numpy.greater_equal() impl, requires
extra parameters */
DPNP_FN_HYPOT, /**< Used in numpy.hypot() impl */
DPNP_FN_IDENTITY, /**< Used in numpy.identity() impl */
DPNP_FN_HYPOT, /**< Used in numpy.hypot() impl */
DPNP_FN_IDENTITY, /**< Used in numpy.identity() impl */
DPNP_FN_INITVAL, /**< Used in numpy ones, ones_like, zeros, zeros_like impls
*/
DPNP_FN_INITVAL_EXT, /**< Used in numpy ones, ones_like, zeros, zeros_like
Expand All @@ -216,15 +204,11 @@ enum class DPNPFuncName : size_t
DPNP_FN_KRON_EXT, /**< Used in numpy.kron() impl, requires extra parameters
*/
DPNP_FN_LEFT_SHIFT, /**< Used in numpy.left_shift() impl */
DPNP_FN_LESS_EXT, /**< Used in numpy.less() impl, requires extra parameters
*/
DPNP_FN_LESS_EQUAL_EXT, /**< Used in numpy.less_equal() impl, requires extra
parameters */
DPNP_FN_LOG, /**< Used in numpy.log() impl */
DPNP_FN_LOG10, /**< Used in numpy.log10() impl */
DPNP_FN_LOG10_EXT, /**< Used in numpy.log10() impl, requires extra
parameters */
DPNP_FN_LOG2, /**< Used in numpy.log2() impl */
DPNP_FN_LOG, /**< Used in numpy.log() impl */
DPNP_FN_LOG10, /**< Used in numpy.log10() impl */
DPNP_FN_LOG10_EXT, /**< Used in numpy.log10() impl, requires extra
parameters */
DPNP_FN_LOG2, /**< Used in numpy.log2() impl */
DPNP_FN_LOG2_EXT, /**< Used in numpy.log2() impl, requires extra parameters
*/
DPNP_FN_LOG1P, /**< Used in numpy.log1p() impl */
Expand Down Expand Up @@ -261,8 +245,6 @@ enum class DPNPFuncName : size_t
parameters */
DPNP_FN_NEGATIVE, /**< Used in numpy.negative() impl */
DPNP_FN_NONZERO, /**< Used in numpy.nonzero() impl */
DPNP_FN_NOT_EQUAL_EXT, /**< Used in numpy.not_equal() impl, requires extra
parameters */
DPNP_FN_ONES, /**< Used in numpy.ones() impl */
DPNP_FN_ONES_LIKE, /**< Used in numpy.ones_like() impl */
DPNP_FN_PARTITION, /**< Used in numpy.partition() impl */
Expand Down Expand Up @@ -290,8 +272,6 @@ enum class DPNPFuncName : size_t
DPNP_FN_RECIP_EXT, /**< Used in numpy.recip() impl, requires extra
parameters */
DPNP_FN_REPEAT, /**< Used in numpy.repeat() impl */
DPNP_FN_REPEAT_EXT, /**< Used in numpy.repeat() impl, requires extra
parameters */
DPNP_FN_RIGHT_SHIFT, /**< Used in numpy.right_shift() impl */
DPNP_FN_RNG_BETA, /**< Used in numpy.random.beta() impl */
DPNP_FN_RNG_BETA_EXT, /**< Used in numpy.random.beta() impl, requires extra
Expand Down
65 changes: 0 additions & 65 deletions dpnp/backend/kernels/dpnp_krnl_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,6 @@ template <typename _DataType, typename _ResultType>
void (*dpnp_astype_default_c)(const void *, void *, const size_t) =
dpnp_astype_c<_DataType, _ResultType>;

template <typename _DataType, typename _ResultType>
DPCTLSyclEventRef (*dpnp_astype_ext_c)(DPCTLSyclQueueRef,
const void *,
void *,
const size_t,
const DPCTLEventVectorRef) =
dpnp_astype_c<_DataType, _ResultType>;

template <typename _KernelNameSpecialization1,
typename _KernelNameSpecialization2,
typename _KernelNameSpecialization3>
Expand Down Expand Up @@ -1035,63 +1027,6 @@ void func_map_init_linalg(func_map_t &fmap)
(void *)
dpnp_astype_default_c<std::complex<double>, std::complex<double>>};

fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_BLN][eft_BLN] = {
eft_BLN, (void *)dpnp_astype_ext_c<bool, bool>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_BLN][eft_INT] = {
eft_INT, (void *)dpnp_astype_ext_c<bool, int32_t>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_BLN][eft_LNG] = {
eft_LNG, (void *)dpnp_astype_ext_c<bool, int64_t>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_BLN][eft_FLT] = {
eft_FLT, (void *)dpnp_astype_ext_c<bool, float>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_BLN][eft_DBL] = {
eft_DBL, (void *)dpnp_astype_ext_c<bool, double>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_INT][eft_BLN] = {
eft_BLN, (void *)dpnp_astype_ext_c<int32_t, bool>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_INT][eft_INT] = {
eft_INT, (void *)dpnp_astype_ext_c<int32_t, int32_t>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_INT][eft_LNG] = {
eft_LNG, (void *)dpnp_astype_ext_c<int32_t, int64_t>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_INT][eft_FLT] = {
eft_FLT, (void *)dpnp_astype_ext_c<int32_t, float>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_INT][eft_DBL] = {
eft_DBL, (void *)dpnp_astype_ext_c<int32_t, double>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_LNG][eft_BLN] = {
eft_BLN, (void *)dpnp_astype_ext_c<int64_t, bool>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_LNG][eft_INT] = {
eft_INT, (void *)dpnp_astype_ext_c<int64_t, int32_t>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_LNG][eft_LNG] = {
eft_LNG, (void *)dpnp_astype_ext_c<int64_t, int64_t>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_LNG][eft_FLT] = {
eft_FLT, (void *)dpnp_astype_ext_c<int64_t, float>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_LNG][eft_DBL] = {
eft_DBL, (void *)dpnp_astype_ext_c<int64_t, double>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_FLT][eft_BLN] = {
eft_BLN, (void *)dpnp_astype_ext_c<float, bool>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_FLT][eft_INT] = {
eft_INT, (void *)dpnp_astype_ext_c<float, int32_t>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_FLT][eft_LNG] = {
eft_LNG, (void *)dpnp_astype_ext_c<float, int64_t>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_FLT][eft_FLT] = {
eft_FLT, (void *)dpnp_astype_ext_c<float, float>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_FLT][eft_DBL] = {
eft_DBL, (void *)dpnp_astype_ext_c<float, double>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_DBL][eft_BLN] = {
eft_BLN, (void *)dpnp_astype_ext_c<double, bool>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_DBL][eft_INT] = {
eft_INT, (void *)dpnp_astype_ext_c<double, int32_t>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_DBL][eft_LNG] = {
eft_LNG, (void *)dpnp_astype_ext_c<double, int64_t>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_DBL][eft_FLT] = {
eft_FLT, (void *)dpnp_astype_ext_c<double, float>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_DBL][eft_DBL] = {
eft_DBL, (void *)dpnp_astype_ext_c<double, double>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_C64][eft_C64] = {
eft_C64,
(void *)dpnp_astype_ext_c<std::complex<float>, std::complex<float>>};
fmap[DPNPFuncName::DPNP_FN_ASTYPE_EXT][eft_C128][eft_C128] = {
eft_C128,
(void *)dpnp_astype_ext_c<std::complex<double>, std::complex<double>>};

fmap[DPNPFuncName::DPNP_FN_DOT][eft_INT][eft_INT] = {
eft_INT, (void *)dpnp_dot_default_c<int32_t, int32_t, int32_t>};
fmap[DPNPFuncName::DPNP_FN_DOT][eft_INT][eft_LNG] = {
Expand Down
13 changes: 0 additions & 13 deletions dpnp/backend/kernels/dpnp_krnl_elemwise.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,19 +949,6 @@ static void func_map_init_elemwise_1arg_1type(func_map_t &fmap)
fmap[DPNPFuncName::DPNP_FN_FLATTEN][eft_C128][eft_C128] = {
eft_C128, (void *)dpnp_copy_c_default<std::complex<double>>};

fmap[DPNPFuncName::DPNP_FN_FLATTEN_EXT][eft_BLN][eft_BLN] = {
eft_BLN, (void *)dpnp_copy_c_ext<bool>};
fmap[DPNPFuncName::DPNP_FN_FLATTEN_EXT][eft_INT][eft_INT] = {
eft_INT, (void *)dpnp_copy_c_ext<int32_t>};
fmap[DPNPFuncName::DPNP_FN_FLATTEN_EXT][eft_LNG][eft_LNG] = {
eft_LNG, (void *)dpnp_copy_c_ext<int64_t>};
fmap[DPNPFuncName::DPNP_FN_FLATTEN_EXT][eft_FLT][eft_FLT] = {
eft_FLT, (void *)dpnp_copy_c_ext<float>};
fmap[DPNPFuncName::DPNP_FN_FLATTEN_EXT][eft_DBL][eft_DBL] = {
eft_DBL, (void *)dpnp_copy_c_ext<double>};
fmap[DPNPFuncName::DPNP_FN_FLATTEN_EXT][eft_C128][eft_C128] = {
eft_C128, (void *)dpnp_copy_c_ext<std::complex<double>>};

fmap[DPNPFuncName::DPNP_FN_NEGATIVE][eft_INT][eft_INT] = {
eft_INT, (void *)dpnp_negative_c_default<int32_t>};
fmap[DPNPFuncName::DPNP_FN_NEGATIVE][eft_LNG][eft_LNG] = {
Expand Down
44 changes: 0 additions & 44 deletions dpnp/backend/kernels/dpnp_krnl_logic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,47 +667,6 @@ DPCTLSyclEventRef (*dpnp_any_ext_c)(DPCTLSyclQueueRef,
const DPCTLEventVectorRef) = \
__name__<_DataType_input1, _DataType_input2>;

#include <dpnp_gen_2arg_2type_tbl.hpp>

template <DPNPFuncType FT1, DPNPFuncType... FTs>
static void func_map_logic_2arg_2type_core(func_map_t &fmap)
{
((fmap[DPNPFuncName::DPNP_FN_EQUAL_EXT][FT1][FTs] =
{eft_BLN, (void *)dpnp_equal_c_ext<func_type_map_t::find_type<FT1>,
func_type_map_t::find_type<FTs>>}),
...);
((fmap[DPNPFuncName::DPNP_FN_GREATER_EXT][FT1][FTs] =
{eft_BLN,
(void *)dpnp_greater_c_ext<func_type_map_t::find_type<FT1>,
func_type_map_t::find_type<FTs>>}),
...);
((fmap[DPNPFuncName::DPNP_FN_GREATER_EQUAL_EXT][FT1][FTs] =
{eft_BLN,
(void *)dpnp_greater_equal_c_ext<func_type_map_t::find_type<FT1>,
func_type_map_t::find_type<FTs>>}),
...);
((fmap[DPNPFuncName::DPNP_FN_LESS_EXT][FT1][FTs] =
{eft_BLN, (void *)dpnp_less_c_ext<func_type_map_t::find_type<FT1>,
func_type_map_t::find_type<FTs>>}),
...);
((fmap[DPNPFuncName::DPNP_FN_LESS_EQUAL_EXT][FT1][FTs] =
{eft_BLN,
(void *)dpnp_less_equal_c_ext<func_type_map_t::find_type<FT1>,
func_type_map_t::find_type<FTs>>}),
...);
((fmap[DPNPFuncName::DPNP_FN_NOT_EQUAL_EXT][FT1][FTs] =
{eft_BLN,
(void *)dpnp_not_equal_c_ext<func_type_map_t::find_type<FT1>,
func_type_map_t::find_type<FTs>>}),
...);
}

template <DPNPFuncType... FTs>
static void func_map_logic_2arg_2type_helper(func_map_t &fmap)
{
((func_map_logic_2arg_2type_core<FTs, FTs...>(fmap)), ...);
}

void func_map_init_logic(func_map_t &fmap)
{
fmap[DPNPFuncName::DPNP_FN_ALL][eft_BLN][eft_BLN] = {
Expand Down Expand Up @@ -798,8 +757,5 @@ void func_map_init_logic(func_map_t &fmap)
fmap[DPNPFuncName::DPNP_FN_ANY][eft_DBL][eft_DBL] = {
eft_DBL, (void *)dpnp_any_default_c<double, bool>};

func_map_logic_2arg_2type_helper<eft_BLN, eft_INT, eft_LNG, eft_FLT,
eft_DBL>(fmap);

return;
}
18 changes: 0 additions & 18 deletions dpnp/backend/kernels/dpnp_krnl_manipulation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,6 @@ void (*dpnp_repeat_default_c)(const void *,
const size_t,
const size_t) = dpnp_repeat_c<_DataType>;

template <typename _DataType>
DPCTLSyclEventRef (*dpnp_repeat_ext_c)(DPCTLSyclQueueRef,
const void *,
void *,
const size_t,
const size_t,
const DPCTLEventVectorRef) =
dpnp_repeat_c<_DataType>;

template <typename _KernelNameSpecialization>
class dpnp_elemwise_transpose_c_kernel;

Expand Down Expand Up @@ -232,15 +223,6 @@ void func_map_init_manipulation(func_map_t &fmap)
fmap[DPNPFuncName::DPNP_FN_REPEAT][eft_DBL][eft_DBL] = {
eft_DBL, (void *)dpnp_repeat_default_c<double>};

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

fmap[DPNPFuncName::DPNP_FN_TRANSPOSE][eft_INT][eft_INT] = {
eft_INT, (void *)dpnp_elemwise_transpose_default_c<int32_t>};
fmap[DPNPFuncName::DPNP_FN_TRANSPOSE][eft_LNG][eft_LNG] = {
Expand Down
17 changes: 0 additions & 17 deletions dpnp/backend/kernels/dpnp_krnl_mathematical.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,23 +726,6 @@ void (*dpnp_floor_divide_default_c)(void *,
const size_t *) =
dpnp_floor_divide_c<_DataType_output, _DataType_input1, _DataType_input2>;

template <typename _DataType_output,
typename _DataType_input1,
typename _DataType_input2>
DPCTLSyclEventRef (*dpnp_floor_divide_ext_c)(DPCTLSyclQueueRef,
void *,
const void *,
const size_t,
const shape_elem_type *,
const size_t,
const void *,
const size_t,
const shape_elem_type *,
const size_t,
const size_t *,
const DPCTLEventVectorRef) =
dpnp_floor_divide_c<_DataType_output, _DataType_input1, _DataType_input2>;

template <typename _KernelNameSpecialization1,
typename _KernelNameSpecialization2>
class dpnp_modf_c_kernel;
Expand Down
1 change: 0 additions & 1 deletion dpnp/dparray.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,3 @@ cdef class dparray:
cdef void * get_data(self)

cpdef item(self, id=*)
cpdef dparray astype(self, dtype, order=*, casting=*, subok=*, copy=*)
Loading