Skip to content

Commit 22c2a8d

Browse files
authored
Feature/numpy 1 20 (#562)
* TESTS EXT support numpy 1.20 partially * TESTS EXT fix version of numpy to 1.19
1 parent 6668502 commit 22c2a8d

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

scripts/azure-pipelines.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ jobs:
105105
displayName: 'Use Python $(python.version)'
106106
- bash: |
107107
. ./scripts/set_ci_env.sh
108+
pip3 install numpy==1.19
108109
echo ========================= build DPNP ===============================
109110
./0.build.sh
110111
echo ========================= run tests ===============================

tests_external/numpy/runtests.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ class dummy_multiarray_tests(dummymodule):
6969
run_byteorder_converter = dummy_func
7070
run_casting_converter = dummy_func
7171
run_clipmode_converter = dummy_func
72+
run_intp_converter = dummy_func
7273
run_order_converter = dummy_func
7374
run_searchside_converter = dummy_func
7475
run_selectkind_converter = dummy_func
@@ -108,6 +109,9 @@ def wrapper(*args, **kwargs):
108109
def replace_arg_value(f, arg_pos, in_values, out_value):
109110
"""Replace value of positional argument of specified function"""
110111
def wrapper(*args, **kwargs):
112+
if len(args) <= arg_pos:
113+
return f(*args, **kwargs)
114+
111115
args = list(args)
112116
arg_value = args[arg_pos]
113117
for in_value in in_values:
@@ -169,11 +173,14 @@ def wrapper(*args, **kwargs):
169173
dpnp.array(object, dtype=dpnp.uint8) -> dpnp.array(object, dtype=None)
170174
dpnp.array(object, dtype='i4,i4') -> dpnp.array(object, dtype=None)
171175
dpnp.array(object, dtype=object) -> dpnp.array(object, dtype=None)
176+
dpnp.array(object, dtype=rational) -> dpnp.array(object, dtype=None)
177+
dpnp.array(object, 'i,i') -> dpnp.array(object, None)
172178
173179
dpnp.full(shape, -2**64+1) -> dpnp.full(shape, 0)
174180
dpnp.full(shape, fill_value, dtype=object) -> dpnp.full(shape, fill_value, dtype=None)
175181
176182
a = dpnp.ones(shape) -> a.strides = numpy.ones(shape).strides
183+
dpnp.ones(shape, dtype='i,i') -> dpnp.ones(shape, dtype=None)
177184
178185
dpnp.zeros(shape, dtype='m8') -> dpnp.zeros(shape, dtype=None)
179186
dpnp.zeros(shape, dtype=dpnp.dtype(dict(
@@ -200,11 +207,14 @@ def wrapper(*args, **kwargs):
200207
for in_value, out_value in array_input_replace_map:
201208
dpnp.array = replace_arg_value(dpnp.array, 0, [in_value], out_value)
202209

203-
dpnp.array = replace_kwarg_value(dpnp.array, 'dtype', ['m8', dpnp.uint8, 'i4,i4', object], None)
210+
rational = numpy.core._rational_tests.rational
211+
dpnp.array = replace_kwarg_value(dpnp.array, 'dtype', ['m8', dpnp.uint8, 'i4,i4', object, rational], None)
212+
dpnp.array = replace_arg_value(dpnp.array, 1, ['i,i'], None)
204213

205214
dpnp.full = replace_arg_value(dpnp.full, 1, [-2**64 + 1], 0)
206215
dpnp.full = replace_kwarg_value(dpnp.full, 'dtype', [object], None)
207216
dpnp.ones = redefine_strides(dpnp.ones)
217+
dpnp.ones = replace_kwarg_value(dpnp.ones, 'dtype', ['i,i'], None)
208218
dpnp.zeros = replace_kwarg_value(dpnp.zeros, 'dtype', [
209219
'm8', dpnp.dtype(dict(
210220
formats=['<i4', '<i4'],
@@ -257,8 +267,8 @@ def wrapper(*args, **kwargs):
257267

258268
# setting some numpy attrubutes to dpnp
259269
NUMPY_ONLY_ATTRS = [
260-
'_NoValue', 'errstate', 'finfo', 'iinfo', 'inf', 'intp', 'longdouble',
261-
'NZERO', 'pi', 'testing', 'typecodes',
270+
'BUFSIZE', '_NoValue', 'errstate', 'finfo', 'iinfo', 'inf', 'intp',
271+
'longdouble', 'NZERO', 'pi', 'testing', 'typecodes',
262272
]
263273
for attr in NUMPY_ONLY_ATTRS:
264274
setattr(dpnp, attr, getattr(numpy, attr))

0 commit comments

Comments
 (0)