Skip to content

Commit 0db87b0

Browse files
Merge branch 'master' of https://github.com/IntelPython/dpnp into noncentral_chisquare
2 parents 3bc643d + 3e54006 commit 0db87b0

14 files changed

+275
-47
lines changed

dpnp/backend/include/dpnp_gen_1arg_1type_tbl.hpp

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,26 +47,46 @@
4747
/** */ \
4848
/** Function "__name__" executes operator "__operation1__" over each element of the array */ \
4949
/** */ \
50-
/** @param[in] array1 Input array. */ \
51-
/** @param[out] result1 Output array. */ \
52-
/** @param[in] size Number of elements in the input array. */ \
50+
/** @param[out] result_out Output array. */ \
51+
/** @param[in] result_size Output array size. */ \
52+
/** @param[in] result_ndim Number of output array dimensions. */ \
53+
/** @param[in] result_shape Output array shape. */ \
54+
/** @param[in] result_strides Output array strides. */ \
55+
/** @param[in] input1_in Input array 1. */ \
56+
/** @param[in] input1_size Input array 1 size. */ \
57+
/** @param[in] input1_ndim Number of input array 1 dimensions. */ \
58+
/** @param[in] input1_shape Input array 1 shape. */ \
59+
/** @param[in] input1_strides Input array 1 strides. */ \
60+
/** @param[in] where Where condition. */ \
5361
template <typename _DataType> \
54-
void __name__(void* array1, void* result1, size_t size);
62+
void __name__(void* result_out, \
63+
const size_t result_size, \
64+
const size_t result_ndim, \
65+
const size_t* result_shape, \
66+
const size_t* result_strides, \
67+
const void* input1_in, \
68+
const size_t input1_size, \
69+
const size_t input1_ndim, \
70+
const size_t* input1_shape, \
71+
const size_t* input1_strides, \
72+
const size_t* where);
5573

5674
#endif
5775

5876
MACRO_1ARG_1TYPE_OP(dpnp_conjugate_c, std::conj(input_elem), DPNP_QUEUE.submit(kernel_func))
5977
MACRO_1ARG_1TYPE_OP(dpnp_copy_c, input_elem, DPNP_QUEUE.submit(kernel_func))
6078
MACRO_1ARG_1TYPE_OP(dpnp_erf_c,
6179
cl::sycl::erf((double)input_elem),
62-
oneapi::mkl::vm::erf(DPNP_QUEUE, size, array1, result)) // no sycl::erf for int and long
80+
oneapi::mkl::vm::erf(DPNP_QUEUE, input1_size, input1_data, result)) // no sycl::erf for int and long
6381
MACRO_1ARG_1TYPE_OP(dpnp_negative_c, -input_elem, DPNP_QUEUE.submit(kernel_func))
6482
MACRO_1ARG_1TYPE_OP(dpnp_recip_c,
6583
_DataType(1) / input_elem,
6684
DPNP_QUEUE.submit(kernel_func)) // error: no member named 'recip' in namespace 'cl::sycl'
6785
MACRO_1ARG_1TYPE_OP(dpnp_sign_c,
6886
cl::sycl::sign((double)input_elem),
6987
DPNP_QUEUE.submit(kernel_func)) // no sycl::sign for int and long
70-
MACRO_1ARG_1TYPE_OP(dpnp_square_c, input_elem* input_elem, oneapi::mkl::vm::sqr(DPNP_QUEUE, size, array1, result))
88+
MACRO_1ARG_1TYPE_OP(dpnp_square_c,
89+
input_elem* input_elem,
90+
oneapi::mkl::vm::sqr(DPNP_QUEUE, input1_size, input1_data, result))
7191

7292
#undef MACRO_1ARG_1TYPE_OP

dpnp/backend/include/dpnp_iface.hpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,17 @@ INP_DLLEXPORT void dpnp_invert_c(void* array1_in, void* result, size_t size);
953953

954954
#define MACRO_1ARG_1TYPE_OP(__name__, __operation1__, __operation2__) \
955955
template <typename _DataType> \
956-
INP_DLLEXPORT void __name__(void* array1, void* result1, size_t size);
956+
INP_DLLEXPORT void __name__(void* result_out, \
957+
const size_t result_size, \
958+
const size_t result_ndim, \
959+
const size_t* result_shape, \
960+
const size_t* result_strides, \
961+
const void* input1_in, \
962+
const size_t input1_size, \
963+
const size_t input1_ndim, \
964+
const size_t* input1_shape, \
965+
const size_t* input1_strides, \
966+
const size_t* where);
957967

958968
#include <dpnp_gen_1arg_1type_tbl.hpp>
959969

0 commit comments

Comments
 (0)