Skip to content

Commit c26870e

Browse files
npolina4npolina4
authored
Merge branch 'master' into reuse_dpctl_repeat
2 parents 3c2d330 + 247a266 commit c26870e

38 files changed

+1614
-1810
lines changed

‎.github/workflows/conda-package.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ env:
1313
# TODO: to add test_arraymanipulation.py back to the scope once crash on Windows is gone
1414
TEST_SCOPE: >-
1515
test_arraycreation.py
16+
test_amin_amax.py
1617
test_dot.py
1718
test_dparray.py
1819
test_copy.py
@@ -45,6 +46,7 @@ env:
4546
third_party/cupy/math_tests/test_rounding.py
4647
third_party/cupy/math_tests/test_trigonometric.py
4748
third_party/cupy/sorting_tests/test_sort.py
49+
third_party/cupy/sorting_tests/test_count.py
4850
VER_JSON_NAME: 'version.json'
4951
VER_SCRIPT1: "import json; f = open('version.json', 'r'); j = json.load(f); f.close(); "
5052
VER_SCRIPT2: "d = j['dpnp'][0]; print('='.join((d[s] for s in ('version', 'build'))))"

‎dpnp/backend/cmake/Modules/IntelSYCLConfig.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
IntelSYCLConfig
1919
-------
2020
21-
Library to verify SYCL compatability of CMAKE_CXX_COMPILER
21+
Library to verify SYCL compatibility of CMAKE_CXX_COMPILER
2222
and passes relevant compiler flags.
2323
2424
Result Variables
@@ -290,7 +290,7 @@ if(nosycllang)
290290
set(IntelSYCL_NOT_FOUND_MESSAGE "${SYCL_REASON_FAILURE}")
291291
endif()
292292

293-
# Placeholder for identifying various implemenations of SYCL compilers.
293+
# Placeholder for identifying various implementations of SYCL compilers.
294294
# for now, set to the CMAKE_CXX_COMPILER_ID
295295
set(SYCL_IMPLEMENTATION_ID "${CMAKE_CXX_COMPILER_ID}")
296296

‎dpnp/backend/include/dpnp_iface_fptr.hpp

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -115,25 +115,23 @@ enum class DPNPFuncName : size_t
115115
DPNP_FN_COS, /**< Used in numpy.cos() impl */
116116
DPNP_FN_COSH, /**< Used in numpy.cosh() impl */
117117
DPNP_FN_COUNT_NONZERO, /**< Used in numpy.count_nonzero() impl */
118-
DPNP_FN_COUNT_NONZERO_EXT, /**< Used in numpy.count_nonzero() impl, requires
119-
extra parameters */
120-
DPNP_FN_COV, /**< Used in numpy.cov() impl */
121-
DPNP_FN_CROSS, /**< Used in numpy.cross() impl */
122-
DPNP_FN_CROSS_EXT, /**< Used in numpy.cross() impl, requires extra
123-
parameters */
124-
DPNP_FN_CUMPROD, /**< Used in numpy.cumprod() impl */
125-
DPNP_FN_CUMPROD_EXT, /**< Used in numpy.cumprod() impl, requires extra
126-
parameters */
127-
DPNP_FN_CUMSUM, /**< Used in numpy.cumsum() impl */
128-
DPNP_FN_CUMSUM_EXT, /**< Used in numpy.cumsum() impl, requires extra
129-
parameters */
130-
DPNP_FN_DEGREES, /**< Used in numpy.degrees() impl */
131-
DPNP_FN_DEGREES_EXT, /**< Used in numpy.degrees() impl, requires extra
132-
parameters */
133-
DPNP_FN_DET, /**< Used in numpy.linalg.det() impl */
134-
DPNP_FN_DET_EXT, /**< Used in numpy.linalg.det() impl, requires extra
135-
parameters */
136-
DPNP_FN_DIAG, /**< Used in numpy.diag() impl */
118+
DPNP_FN_COV, /**< Used in numpy.cov() impl */
119+
DPNP_FN_CROSS, /**< Used in numpy.cross() impl */
120+
DPNP_FN_CROSS_EXT, /**< Used in numpy.cross() impl, requires extra
121+
parameters */
122+
DPNP_FN_CUMPROD, /**< Used in numpy.cumprod() impl */
123+
DPNP_FN_CUMPROD_EXT, /**< Used in numpy.cumprod() impl, requires extra
124+
parameters */
125+
DPNP_FN_CUMSUM, /**< Used in numpy.cumsum() impl */
126+
DPNP_FN_CUMSUM_EXT, /**< Used in numpy.cumsum() impl, requires extra
127+
parameters */
128+
DPNP_FN_DEGREES, /**< Used in numpy.degrees() impl */
129+
DPNP_FN_DEGREES_EXT, /**< Used in numpy.degrees() impl, requires extra
130+
parameters */
131+
DPNP_FN_DET, /**< Used in numpy.linalg.det() impl */
132+
DPNP_FN_DET_EXT, /**< Used in numpy.linalg.det() impl, requires extra
133+
parameters */
134+
DPNP_FN_DIAG, /**< Used in numpy.diag() impl */
137135
DPNP_FN_DIAG_EXT, /**< Used in numpy.diag() impl, requires extra parameters
138136
*/
139137
DPNP_FN_DIAG_INDICES, /**< Used in numpy.diag_indices() impl */
@@ -212,20 +210,18 @@ enum class DPNPFuncName : size_t
212210
DPNP_FN_MATRIX_RANK_EXT, /**< Used in numpy.linalg.matrix_rank() impl,
213211
requires extra parameters */
214212
DPNP_FN_MAX, /**< Used in numpy.max() impl */
215-
DPNP_FN_MAX_EXT, /**< Used in numpy.max() impl, requires extra parameters */
216-
DPNP_FN_MAXIMUM, /**< Used in numpy.fmax() impl */
217-
DPNP_FN_MAXIMUM_EXT, /**< Used in numpy.fmax() impl , requires extra
218-
parameters */
219-
DPNP_FN_MEAN, /**< Used in numpy.mean() impl */
220-
DPNP_FN_MEDIAN, /**< Used in numpy.median() impl */
221-
DPNP_FN_MEDIAN_EXT, /**< Used in numpy.median() impl, requires extra
222-
parameters */
223-
DPNP_FN_MIN, /**< Used in numpy.min() impl */
224-
DPNP_FN_MIN_EXT, /**< Used in numpy.min() impl, requires extra parameters */
225-
DPNP_FN_MINIMUM, /**< Used in numpy.fmin() impl */
226-
DPNP_FN_MINIMUM_EXT, /**< Used in numpy.fmax() impl, requires extra
227-
parameters */
228-
DPNP_FN_MODF, /**< Used in numpy.modf() impl */
213+
DPNP_FN_MAXIMUM, /**< Used in numpy.fmax() impl */
214+
DPNP_FN_MAXIMUM_EXT, /**< Used in numpy.fmax() impl , requires extra
215+
parameters */
216+
DPNP_FN_MEAN, /**< Used in numpy.mean() impl */
217+
DPNP_FN_MEDIAN, /**< Used in numpy.median() impl */
218+
DPNP_FN_MEDIAN_EXT, /**< Used in numpy.median() impl, requires extra
219+
parameters */
220+
DPNP_FN_MIN, /**< Used in numpy.min() impl */
221+
DPNP_FN_MINIMUM, /**< Used in numpy.fmin() impl */
222+
DPNP_FN_MINIMUM_EXT, /**< Used in numpy.fmax() impl, requires extra
223+
parameters */
224+
DPNP_FN_MODF, /**< Used in numpy.modf() impl */
229225
DPNP_FN_MODF_EXT, /**< Used in numpy.modf() impl, requires extra parameters
230226
*/
231227
DPNP_FN_MULTIPLY, /**< Used in numpy.multiply() impl */
@@ -244,9 +240,7 @@ enum class DPNPFuncName : size_t
244240
DPNP_FN_PLACE, /**< Used in numpy.place() impl */
245241
DPNP_FN_POWER, /**< Used in numpy.power() impl */
246242
DPNP_FN_PROD, /**< Used in numpy.prod() impl */
247-
DPNP_FN_PROD_EXT, /**< Used in numpy.prod() impl, requires extra parameters
248-
*/
249-
DPNP_FN_PTP, /**< Used in numpy.ptp() impl */
243+
DPNP_FN_PTP, /**< Used in numpy.ptp() impl */
250244
DPNP_FN_PTP_EXT, /**< Used in numpy.ptp() impl, requires extra parameters */
251245
DPNP_FN_PUT, /**< Used in numpy.put() impl */
252246
DPNP_FN_PUT_ALONG_AXIS, /**< Used in numpy.put_along_axis() impl */

‎dpnp/backend/kernels/dpnp_krnl_reduction.cpp

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -294,19 +294,6 @@ void (*dpnp_prod_default_c)(void *,
294294
const long *) =
295295
dpnp_prod_c<_DataType_output, _DataType_input>;
296296

297-
template <typename _DataType_output, typename _DataType_input>
298-
DPCTLSyclEventRef (*dpnp_prod_ext_c)(DPCTLSyclQueueRef,
299-
void *,
300-
const void *,
301-
const shape_elem_type *,
302-
const size_t,
303-
const shape_elem_type *,
304-
const size_t,
305-
const void *,
306-
const long *,
307-
const DPCTLEventVectorRef) =
308-
dpnp_prod_c<_DataType_output, _DataType_input>;
309-
310297
void func_map_init_reduction(func_map_t &fmap)
311298
{
312299
// WARNING. The meaning of the fmap is changed. Second argument represents
@@ -349,42 +336,6 @@ void func_map_init_reduction(func_map_t &fmap)
349336
fmap[DPNPFuncName::DPNP_FN_PROD][eft_DBL][eft_DBL] = {
350337
eft_DBL, (void *)dpnp_prod_default_c<double, double>};
351338

352-
fmap[DPNPFuncName::DPNP_FN_PROD_EXT][eft_INT][eft_INT] = {
353-
eft_LNG, (void *)dpnp_prod_ext_c<int32_t, int32_t>};
354-
fmap[DPNPFuncName::DPNP_FN_PROD_EXT][eft_INT][eft_LNG] = {
355-
eft_LNG, (void *)dpnp_prod_ext_c<int64_t, int32_t>};
356-
fmap[DPNPFuncName::DPNP_FN_PROD_EXT][eft_INT][eft_FLT] = {
357-
eft_FLT, (void *)dpnp_prod_ext_c<float, int32_t>};
358-
fmap[DPNPFuncName::DPNP_FN_PROD_EXT][eft_INT][eft_DBL] = {
359-
eft_DBL, (void *)dpnp_prod_ext_c<double, int32_t>};
360-
361-
fmap[DPNPFuncName::DPNP_FN_PROD_EXT][eft_LNG][eft_INT] = {
362-
eft_INT, (void *)dpnp_prod_ext_c<int32_t, int64_t>};
363-
fmap[DPNPFuncName::DPNP_FN_PROD_EXT][eft_LNG][eft_LNG] = {
364-
eft_LNG, (void *)dpnp_prod_ext_c<int64_t, int64_t>};
365-
fmap[DPNPFuncName::DPNP_FN_PROD_EXT][eft_LNG][eft_FLT] = {
366-
eft_FLT, (void *)dpnp_prod_ext_c<float, int64_t>};
367-
fmap[DPNPFuncName::DPNP_FN_PROD_EXT][eft_LNG][eft_DBL] = {
368-
eft_DBL, (void *)dpnp_prod_ext_c<double, int64_t>};
369-
370-
fmap[DPNPFuncName::DPNP_FN_PROD_EXT][eft_FLT][eft_INT] = {
371-
eft_INT, (void *)dpnp_prod_ext_c<int32_t, float>};
372-
fmap[DPNPFuncName::DPNP_FN_PROD_EXT][eft_FLT][eft_LNG] = {
373-
eft_LNG, (void *)dpnp_prod_ext_c<int64_t, float>};
374-
fmap[DPNPFuncName::DPNP_FN_PROD_EXT][eft_FLT][eft_FLT] = {
375-
eft_FLT, (void *)dpnp_prod_ext_c<float, float>};
376-
fmap[DPNPFuncName::DPNP_FN_PROD_EXT][eft_FLT][eft_DBL] = {
377-
eft_DBL, (void *)dpnp_prod_ext_c<double, float>};
378-
379-
fmap[DPNPFuncName::DPNP_FN_PROD_EXT][eft_DBL][eft_INT] = {
380-
eft_INT, (void *)dpnp_prod_ext_c<int32_t, double>};
381-
fmap[DPNPFuncName::DPNP_FN_PROD_EXT][eft_DBL][eft_LNG] = {
382-
eft_LNG, (void *)dpnp_prod_ext_c<int64_t, double>};
383-
fmap[DPNPFuncName::DPNP_FN_PROD_EXT][eft_DBL][eft_FLT] = {
384-
eft_FLT, (void *)dpnp_prod_ext_c<float, double>};
385-
fmap[DPNPFuncName::DPNP_FN_PROD_EXT][eft_DBL][eft_DBL] = {
386-
eft_DBL, (void *)dpnp_prod_ext_c<double, double>};
387-
388339
fmap[DPNPFuncName::DPNP_FN_SUM][eft_INT][eft_INT] = {
389340
eft_LNG, (void *)dpnp_sum_default_c<int32_t, int32_t>};
390341
fmap[DPNPFuncName::DPNP_FN_SUM][eft_INT][eft_LNG] = {

‎dpnp/backend/kernels/dpnp_krnl_statistics.cpp

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -292,14 +292,6 @@ template <typename _DataType_input, typename _DataType_output>
292292
void (*dpnp_count_nonzero_default_c)(void *, void *, size_t) =
293293
dpnp_count_nonzero_c<_DataType_input, _DataType_output>;
294294

295-
template <typename _DataType_input, typename _DataType_output>
296-
DPCTLSyclEventRef (*dpnp_count_nonzero_ext_c)(DPCTLSyclQueueRef,
297-
void *,
298-
void *,
299-
size_t,
300-
const DPCTLEventVectorRef) =
301-
dpnp_count_nonzero_c<_DataType_input, _DataType_output>;
302-
303295
template <typename _DataType>
304296
class dpnp_max_c_kernel;
305297

@@ -511,18 +503,6 @@ void (*dpnp_max_default_c)(void *,
511503
const shape_elem_type *,
512504
size_t) = dpnp_max_c<_DataType>;
513505

514-
template <typename _DataType>
515-
DPCTLSyclEventRef (*dpnp_max_ext_c)(DPCTLSyclQueueRef,
516-
void *,
517-
void *,
518-
const size_t,
519-
const shape_elem_type *,
520-
size_t,
521-
const shape_elem_type *,
522-
size_t,
523-
const DPCTLEventVectorRef) =
524-
dpnp_max_c<_DataType>;
525-
526506
template <typename _DataType, typename _ResultType>
527507
DPCTLSyclEventRef dpnp_mean_c(DPCTLSyclQueueRef q_ref,
528508
void *array1_in,
@@ -895,18 +875,6 @@ void (*dpnp_min_default_c)(void *,
895875
const shape_elem_type *,
896876
size_t) = dpnp_min_c<_DataType>;
897877

898-
template <typename _DataType>
899-
DPCTLSyclEventRef (*dpnp_min_ext_c)(DPCTLSyclQueueRef,
900-
void *,
901-
void *,
902-
const size_t,
903-
const shape_elem_type *,
904-
size_t,
905-
const shape_elem_type *,
906-
size_t,
907-
const DPCTLEventVectorRef) =
908-
dpnp_min_c<_DataType>;
909-
910878
template <typename _DataType>
911879
DPCTLSyclEventRef dpnp_nanvar_c(DPCTLSyclQueueRef q_ref,
912880
void *array1_in,
@@ -1273,17 +1241,6 @@ void func_map_init_statistics(func_map_t &fmap)
12731241
fmap[DPNPFuncName::DPNP_FN_COUNT_NONZERO][eft_DBL][eft_DBL] = {
12741242
eft_LNG, (void *)dpnp_count_nonzero_default_c<double, int64_t>};
12751243

1276-
fmap[DPNPFuncName::DPNP_FN_COUNT_NONZERO_EXT][eft_BLN][eft_BLN] = {
1277-
eft_LNG, (void *)dpnp_count_nonzero_ext_c<bool, int64_t>};
1278-
fmap[DPNPFuncName::DPNP_FN_COUNT_NONZERO_EXT][eft_INT][eft_INT] = {
1279-
eft_LNG, (void *)dpnp_count_nonzero_ext_c<int32_t, int64_t>};
1280-
fmap[DPNPFuncName::DPNP_FN_COUNT_NONZERO_EXT][eft_LNG][eft_LNG] = {
1281-
eft_LNG, (void *)dpnp_count_nonzero_ext_c<int64_t, int64_t>};
1282-
fmap[DPNPFuncName::DPNP_FN_COUNT_NONZERO_EXT][eft_FLT][eft_FLT] = {
1283-
eft_LNG, (void *)dpnp_count_nonzero_ext_c<float, int64_t>};
1284-
fmap[DPNPFuncName::DPNP_FN_COUNT_NONZERO_EXT][eft_DBL][eft_DBL] = {
1285-
eft_LNG, (void *)dpnp_count_nonzero_ext_c<double, int64_t>};
1286-
12871244
fmap[DPNPFuncName::DPNP_FN_COV][eft_INT][eft_INT] = {
12881245
eft_DBL, (void *)dpnp_cov_default_c<double>};
12891246
fmap[DPNPFuncName::DPNP_FN_COV][eft_LNG][eft_LNG] = {
@@ -1302,15 +1259,6 @@ void func_map_init_statistics(func_map_t &fmap)
13021259
fmap[DPNPFuncName::DPNP_FN_MAX][eft_DBL][eft_DBL] = {
13031260
eft_DBL, (void *)dpnp_max_default_c<double>};
13041261

1305-
fmap[DPNPFuncName::DPNP_FN_MAX_EXT][eft_INT][eft_INT] = {
1306-
eft_INT, (void *)dpnp_max_ext_c<int32_t>};
1307-
fmap[DPNPFuncName::DPNP_FN_MAX_EXT][eft_LNG][eft_LNG] = {
1308-
eft_LNG, (void *)dpnp_max_ext_c<int64_t>};
1309-
fmap[DPNPFuncName::DPNP_FN_MAX_EXT][eft_FLT][eft_FLT] = {
1310-
eft_FLT, (void *)dpnp_max_ext_c<float>};
1311-
fmap[DPNPFuncName::DPNP_FN_MAX_EXT][eft_DBL][eft_DBL] = {
1312-
eft_DBL, (void *)dpnp_max_ext_c<double>};
1313-
13141262
fmap[DPNPFuncName::DPNP_FN_MEAN][eft_INT][eft_INT] = {
13151263
eft_DBL, (void *)dpnp_mean_default_c<int32_t, double>};
13161264
fmap[DPNPFuncName::DPNP_FN_MEAN][eft_LNG][eft_LNG] = {
@@ -1359,15 +1307,6 @@ void func_map_init_statistics(func_map_t &fmap)
13591307
fmap[DPNPFuncName::DPNP_FN_MIN][eft_DBL][eft_DBL] = {
13601308
eft_DBL, (void *)dpnp_min_default_c<double>};
13611309

1362-
fmap[DPNPFuncName::DPNP_FN_MIN_EXT][eft_INT][eft_INT] = {
1363-
eft_INT, (void *)dpnp_min_ext_c<int32_t>};
1364-
fmap[DPNPFuncName::DPNP_FN_MIN_EXT][eft_LNG][eft_LNG] = {
1365-
eft_LNG, (void *)dpnp_min_ext_c<int64_t>};
1366-
fmap[DPNPFuncName::DPNP_FN_MIN_EXT][eft_FLT][eft_FLT] = {
1367-
eft_FLT, (void *)dpnp_min_ext_c<float>};
1368-
fmap[DPNPFuncName::DPNP_FN_MIN_EXT][eft_DBL][eft_DBL] = {
1369-
eft_DBL, (void *)dpnp_min_ext_c<double>};
1370-
13711310
fmap[DPNPFuncName::DPNP_FN_NANVAR][eft_INT][eft_INT] = {
13721311
eft_INT, (void *)dpnp_nanvar_default_c<int32_t>};
13731312
fmap[DPNPFuncName::DPNP_FN_NANVAR][eft_LNG][eft_LNG] = {

‎dpnp/dpnp_algo/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

22
set(dpnp_algo_pyx_deps
33
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_linearalgebra.pxi
4-
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_counting.pxi
54
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_statistics.pxi
65
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_trigonometric.pxi
76
${CMAKE_CURRENT_SOURCE_DIR}/dpnp_algo_sorting.pxi

‎dpnp/dpnp_algo/dpnp_algo.pxd

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName": # need this na
5454
DPNP_FN_COPYSIGN_EXT
5555
DPNP_FN_CORRELATE
5656
DPNP_FN_CORRELATE_EXT
57-
DPNP_FN_COUNT_NONZERO
58-
DPNP_FN_COUNT_NONZERO_EXT
5957
DPNP_FN_CROSS
6058
DPNP_FN_CROSS_EXT
6159
DPNP_FN_CUMPROD
@@ -106,14 +104,10 @@ cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName": # need this na
106104
DPNP_FN_MATMUL_EXT
107105
DPNP_FN_MATRIX_RANK
108106
DPNP_FN_MATRIX_RANK_EXT
109-
DPNP_FN_MAX
110-
DPNP_FN_MAX_EXT
111107
DPNP_FN_MAXIMUM
112108
DPNP_FN_MAXIMUM_EXT
113109
DPNP_FN_MEDIAN
114110
DPNP_FN_MEDIAN_EXT
115-
DPNP_FN_MIN
116-
DPNP_FN_MIN_EXT
117111
DPNP_FN_MINIMUM
118112
DPNP_FN_MINIMUM_EXT
119113
DPNP_FN_MODF
@@ -126,8 +120,6 @@ cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName": # need this na
126120
DPNP_FN_PARTITION
127121
DPNP_FN_PARTITION_EXT
128122
DPNP_FN_PLACE
129-
DPNP_FN_PROD
130-
DPNP_FN_PROD_EXT
131123
DPNP_FN_PTP
132124
DPNP_FN_PTP_EXT
133125
DPNP_FN_QR
@@ -361,10 +353,6 @@ cpdef dpnp_descriptor dpnp_fmax(dpnp_descriptor x1_obj, dpnp_descriptor x2_obj,
361353
dpnp_descriptor out=*, object where=*)
362354
cpdef dpnp_descriptor dpnp_fmin(dpnp_descriptor x1_obj, dpnp_descriptor x2_obj, object dtype=*,
363355
dpnp_descriptor out=*, object where=*)
364-
"""
365-
Statistics functions
366-
"""
367-
cpdef dpnp_descriptor dpnp_min(dpnp_descriptor a, axis)
368356

369357

370358
"""

‎dpnp/dpnp_algo/dpnp_algo.pyx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ __all__ = [
5959

6060

6161
include "dpnp_algo_arraycreation.pxi"
62-
include "dpnp_algo_counting.pxi"
6362
include "dpnp_algo_indexing.pxi"
6463
include "dpnp_algo_linearalgebra.pxi"
6564
include "dpnp_algo_logic.pxi"

0 commit comments

Comments
 (0)