Skip to content

Commit fd2a20d

Browse files
AlexanderKalistratovAlexanderKalistratov
committed
Remove legacy correlate, dot, and multiply from backend
1 parent 5f793ab commit fd2a20d

13 files changed

+4
-1590
lines changed

‎dpnp/backend/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ set(DPNP_SRC
3131
kernels/dpnp_krnl_mathematical.cpp
3232
kernels/dpnp_krnl_random.cpp
3333
kernels/dpnp_krnl_sorting.cpp
34-
kernels/dpnp_krnl_statistics.cpp
3534
src/constants.cpp
3635
src/dpnp_iface_fptr.cpp
3736
src/memory_sycl.cpp

‎dpnp/backend/include/dpnp_gen_2arg_3type_tbl.hpp

-121
This file was deleted.

‎dpnp/backend/include/dpnp_iface.hpp

-142
Original file line numberDiff line numberDiff line change
@@ -100,69 +100,6 @@ INP_DLLEXPORT void dpnp_memory_memcpy_c(DPCTLSyclQueueRef q_ref,
100100
INP_DLLEXPORT void
101101
dpnp_memory_memcpy_c(void *dst, const void *src, size_t size_in_bytes);
102102

103-
/**
104-
* @ingroup BACKEND_API
105-
* @brief Custom implementation of dot function
106-
*
107-
* @param [in] q_ref Reference to SYCL queue.
108-
* @param [out] result_out Output array.
109-
* @param [in] result_size Size of output array.
110-
* @param [in] result_ndim Number of output array dimensions.
111-
* @param [in] result_shape Shape of output array.
112-
* @param [in] result_strides Strides of output array.
113-
* @param [in] input1_in First input array.
114-
* @param [in] input1_size Size of first input array.
115-
* @param [in] input1_ndim Number of first input array dimensions.
116-
* @param [in] input1_shape Shape of first input array.
117-
* @param [in] input1_strides Strides of first input array.
118-
* @param [in] input2_in Second input array.
119-
* @param [in] input2_size Size of second input array.
120-
* @param [in] input2_ndim Number of second input array dimensions.
121-
* @param [in] input2_shape Shape of second input array.
122-
* @param [in] input2_strides Strides of second input array.
123-
* @param [in] dep_event_vec_ref Reference to vector of SYCL events.
124-
*/
125-
template <typename _DataType_output,
126-
typename _DataType_input1,
127-
typename _DataType_input2>
128-
INP_DLLEXPORT DPCTLSyclEventRef
129-
dpnp_dot_c(DPCTLSyclQueueRef q_ref,
130-
void *result_out,
131-
const size_t result_size,
132-
const size_t result_ndim,
133-
const shape_elem_type *result_shape,
134-
const shape_elem_type *result_strides,
135-
const void *input1_in,
136-
const size_t input1_size,
137-
const size_t input1_ndim,
138-
const shape_elem_type *input1_shape,
139-
const shape_elem_type *input1_strides,
140-
const void *input2_in,
141-
const size_t input2_size,
142-
const size_t input2_ndim,
143-
const shape_elem_type *input2_shape,
144-
const shape_elem_type *input2_strides,
145-
const DPCTLEventVectorRef dep_event_vec_ref);
146-
147-
template <typename _DataType_output,
148-
typename _DataType_input1,
149-
typename _DataType_input2>
150-
INP_DLLEXPORT void dpnp_dot_c(void *result_out,
151-
const size_t result_size,
152-
const size_t result_ndim,
153-
const shape_elem_type *result_shape,
154-
const shape_elem_type *result_strides,
155-
const void *input1_in,
156-
const size_t input1_size,
157-
const size_t input1_ndim,
158-
const shape_elem_type *input1_shape,
159-
const shape_elem_type *input1_strides,
160-
const void *input2_in,
161-
const size_t input2_size,
162-
const size_t input2_ndim,
163-
const shape_elem_type *input2_shape,
164-
const shape_elem_type *input2_strides);
165-
166103
/**
167104
* @ingroup BACKEND_API
168105
* @brief Return a partitioned copy of an array.
@@ -195,54 +132,6 @@ INP_DLLEXPORT void dpnp_partition_c(void *array,
195132
const shape_elem_type *shape,
196133
const size_t ndim);
197134

198-
/**
199-
* @ingroup BACKEND_API
200-
* @brief correlate function
201-
*
202-
* @param [in] q_ref Reference to SYCL queue.
203-
* @param [out] result_out Output array.
204-
* @param [in] input1_in First input array.
205-
* @param [in] input1_size Size of first input array.
206-
* @param [in] input1_shape Shape of first input array.
207-
* @param [in] input1_shape_ndim Number of first array dimensions.
208-
* @param [in] input2_in Second input array.
209-
* @param [in] input2_size Shape of second input array.
210-
* @param [in] input2_shape Shape of first input array.
211-
* @param [in] input2_shape_ndim Number of second array dimensions.
212-
* @param [in] where Mask array.
213-
* @param [in] dep_event_vec_ref Reference to vector of SYCL events.
214-
*/
215-
template <typename _DataType_output,
216-
typename _DataType_input1,
217-
typename _DataType_input2>
218-
INP_DLLEXPORT DPCTLSyclEventRef
219-
dpnp_correlate_c(DPCTLSyclQueueRef q_ref,
220-
void *result_out,
221-
const void *input1_in,
222-
const size_t input1_size,
223-
const shape_elem_type *input1_shape,
224-
const size_t input1_shape_ndim,
225-
const void *input2_in,
226-
const size_t input2_size,
227-
const shape_elem_type *input2_shape,
228-
const size_t input2_shape_ndim,
229-
const size_t *where,
230-
const DPCTLEventVectorRef dep_event_vec_ref);
231-
232-
template <typename _DataType_output,
233-
typename _DataType_input1,
234-
typename _DataType_input2>
235-
INP_DLLEXPORT void dpnp_correlate_c(void *result_out,
236-
const void *input1_in,
237-
const size_t input1_size,
238-
const shape_elem_type *input1_shape,
239-
const size_t input1_shape_ndim,
240-
const void *input2_in,
241-
const size_t input2_size,
242-
const shape_elem_type *input2_shape,
243-
const size_t input2_shape_ndim,
244-
const size_t *where);
245-
246135
/**
247136
* @ingroup BACKEND_API
248137
* @brief Construct an array from an index array and a list of arrays to choose
@@ -319,37 +208,6 @@ INP_DLLEXPORT void dpnp_initval_c(void *result1, void *value, size_t size);
319208

320209
#include <dpnp_gen_1arg_1type_tbl.hpp>
321210

322-
#define MACRO_2ARG_3TYPES_OP(__name__, __operation__, __vec_operation__, \
323-
__vec_types__, __mkl_operation__, __mkl_types__) \
324-
template <typename _DataType_output, typename _DataType_input1, \
325-
typename _DataType_input2> \
326-
INP_DLLEXPORT DPCTLSyclEventRef __name__( \
327-
DPCTLSyclQueueRef q_ref, void *result_out, const size_t result_size, \
328-
const size_t result_ndim, const shape_elem_type *result_shape, \
329-
const shape_elem_type *result_strides, const void *input1_in, \
330-
const size_t input1_size, const size_t input1_ndim, \
331-
const shape_elem_type *input1_shape, \
332-
const shape_elem_type *input1_strides, const void *input2_in, \
333-
const size_t input2_size, const size_t input2_ndim, \
334-
const shape_elem_type *input2_shape, \
335-
const shape_elem_type *input2_strides, const size_t *where, \
336-
const DPCTLEventVectorRef dep_event_vec_ref); \
337-
\
338-
template <typename _DataType_output, typename _DataType_input1, \
339-
typename _DataType_input2> \
340-
INP_DLLEXPORT void __name__( \
341-
void *result_out, const size_t result_size, const size_t result_ndim, \
342-
const shape_elem_type *result_shape, \
343-
const shape_elem_type *result_strides, const void *input1_in, \
344-
const size_t input1_size, const size_t input1_ndim, \
345-
const shape_elem_type *input1_shape, \
346-
const shape_elem_type *input1_strides, const void *input2_in, \
347-
const size_t input2_size, const size_t input2_ndim, \
348-
const shape_elem_type *input2_shape, \
349-
const shape_elem_type *input2_strides, const size_t *where);
350-
351-
#include <dpnp_gen_2arg_3type_tbl.hpp>
352-
353211
/**
354212
* @ingroup BACKEND_API
355213
* @brief modf function.

‎dpnp/backend/include/dpnp_iface_fptr.hpp

+4-9
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,10 @@
5858
*/
5959
enum class DPNPFuncName : size_t
6060
{
61-
DPNP_FN_NONE, /**< Very first element of the enumeration */
62-
DPNP_FN_CHOOSE, /**< Used in numpy.choose() impl */
63-
DPNP_FN_CHOOSE_EXT, /**< Used in numpy.choose() impl, requires extra
64-
parameters */
65-
DPNP_FN_CORRELATE, /**< Used in numpy.correlate() impl */
66-
DPNP_FN_CORRELATE_EXT, /**< Used in numpy.correlate() impl, requires extra
67-
parameters */
68-
DPNP_FN_DOT, /**< Used in numpy.dot() impl */
69-
DPNP_FN_DOT_EXT, /**< Used in numpy.dot() impl, requires extra parameters */
61+
DPNP_FN_NONE, /**< Very first element of the enumeration */
62+
DPNP_FN_CHOOSE, /**< Used in numpy.choose() impl */
63+
DPNP_FN_CHOOSE_EXT, /**< Used in numpy.choose() impl, requires extra
64+
parameters */
7065
DPNP_FN_ERF, /**< Used in scipy.special.erf impl */
7166
DPNP_FN_ERF_EXT, /**< Used in scipy.special.erf impl, requires extra
7267
parameters */

0 commit comments

Comments
 (0)