Skip to content

Commit 46c79d6

Browse files
AlexanderKalistratovAlexanderKalistratov
committed
Review comments
1 parent 80fd7c5 commit 46c79d6

File tree

5 files changed

+54
-17
lines changed

5 files changed

+54
-17
lines changed

‎.github/workflows/conda-package.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,15 @@ jobs:
173173
python -c "import dpnp; print(dpnp.__version__)"
174174
175175
- name: Run tests
176+
env:
177+
DPNP_TEST_ALL_TYPES: 1
176178
if: env.RERUN_TESTS_ON_FAILURE != 'true'
177179
run: |
178-
export DPNP_TEST_ALL_TYPES=1
179180
python -m pytest -n auto -ra --pyargs ${{ env.PACKAGE_NAME }}.tests
180181
181182
- name: Run tests
183+
env:
184+
DPNP_TEST_ALL_TYPES: 1
182185
if: env.RERUN_TESTS_ON_FAILURE == 'true'
183186
id: run_tests_linux
184187
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
@@ -191,7 +194,6 @@ jobs:
191194
. $CONDA/etc/profile.d/mamba.sh
192195
mamba activate ${{ env.TEST_ENV_NAME }}
193196
194-
export DPNP_TEST_ALL_TYPES=1
195197
python -m pytest -n auto -ra --pyargs ${{ env.PACKAGE_NAME }}.tests
196198
197199
test_windows:
@@ -311,12 +313,15 @@ jobs:
311313
python -c "import dpnp; print(dpnp.__version__)"
312314
313315
- name: Run tests
316+
env:
317+
DPNP_TEST_ALL_TYPES: 1
314318
if: env.RERUN_TESTS_ON_FAILURE != 'true'
315319
run: |
316-
set DPNP_TEST_ALL_TYPES=1
317320
pytest -n auto -ra --pyargs ${{ env.PACKAGE_NAME }}.tests
318321
319322
- name: Run tests
323+
env:
324+
DPNP_TEST_ALL_TYPES: 1
320325
if: env.RERUN_TESTS_ON_FAILURE == 'true'
321326
id: run_tests_win
322327
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
@@ -325,7 +330,6 @@ jobs:
325330
max_attempts: ${{ env.RUN_TESTS_MAX_ATTEMPTS }}
326331
retry_on: any
327332
command: |
328-
set DPNP_TEST_ALL_TYPES=1
329333
python -m pytest -n auto -ra --pyargs ${{ env.PACKAGE_NAME }}.tests
330334
331335
upload:

‎doc/reference/dtypes_table.rst‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,37 @@ Table below shows a list of all supported data types (dtypes) and constants of t
1313
- Constants
1414
* -
1515
- :obj:`bool <numpy.bool_>`
16+
- :obj:`int8 <numpy.int8>`
17+
- :obj:`int16 <numpy.int16>`
1618
- :obj:`int32 <numpy.int32>`
1719
- :obj:`int64 <numpy.int64>`
20+
- :obj:`uint8 <numpy.uint8>`
21+
- :obj:`uint16 <numpy.uint16>`
22+
- :obj:`uint32 <numpy.uint32>`
23+
- :obj:`uint64 <numpy.uint64>`
1824
- :obj:`float32 <numpy.float32>`
1925
- :obj:`float64 <numpy.float64>`
2026
- :obj:`complex64 <numpy.complex64>`
2127
- :obj:`complex128 <numpy.complex128>`
2228
-
2329
- :obj:`bool_ <numpy.bool_>`
30+
- :obj:`byte <numpy.byte>`
2431
- :obj:`cdouble <numpy.cdouble>`
2532
- :obj:`csingle <numpy.csingle>`
2633
- :obj:`double <numpy.double>`
2734
- :obj:`float16 <numpy.float16>`
28-
- :obj:`int <numpy.int>`
2935
- :obj:`int_ <numpy.int_>`
3036
- :obj:`intc <numpy.intc>`
37+
- :obj:`intp <numpy.intp>`
38+
- :obj:`long <numpy.long>`
39+
- :obj:`longlong <numpy.longlong>`
3140
- :obj:`single <numpy.single>`
41+
- :obj:`ubyte <numpy.ubyte>`
42+
- :obj:`uintc <numpy.uintc>`
43+
- :obj:`uintp <numpy.uintp>`
44+
- :obj:`ushort <numpy.ushort>`
45+
- :obj:`ulong <numpy.ulong>`
46+
- :obj:`ulonglong <numpy.ulonglong>`
3247
-
3348
- :obj:`e <numpy.e>`
3449
- :obj:`euler_gamma <numpy.euler_gamma>`

‎dpnp/dpnp_iface_types.py‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
__all__ = [
4141
"bool",
4242
"bool_",
43+
"byte",
4344
"cdouble",
4445
"complex128",
4546
"complex64",
@@ -57,27 +58,35 @@
5758
"iinfo",
5859
"inexact",
5960
"inf",
60-
"int",
6161
"int_",
6262
"int8",
6363
"int16",
6464
"int32",
6565
"int64",
66-
"uint8",
67-
"uint16",
68-
"uint32",
69-
"uint64",
7066
"integer",
7167
"intc",
7268
"intp",
7369
"issubdtype",
7470
"is_type_supported",
71+
"long",
72+
"longlong",
7573
"nan",
7674
"newaxis",
7775
"number",
7876
"pi",
77+
"short",
7978
"signedinteger",
8079
"single",
80+
"ubyte",
81+
"uint8",
82+
"uint16",
83+
"uint32",
84+
"uint64",
85+
"uintc",
86+
"uintp",
87+
"ushort",
88+
"ulong",
89+
"ulonglong",
8190
]
8291

8392

@@ -87,6 +96,7 @@
8796
# =============================================================================
8897
bool = numpy.bool_
8998
bool_ = numpy.bool_
99+
byte = numpy.byte
90100
cdouble = numpy.cdouble
91101
complex128 = numpy.complex128
92102
complex64 = numpy.complex64
@@ -99,22 +109,30 @@
99109
float64 = numpy.float64
100110
floating = numpy.floating
101111
inexact = numpy.inexact
102-
int = numpy.int_
103112
int_ = numpy.int_
104113
int8 = numpy.int8
105114
int16 = numpy.int16
106115
int32 = numpy.int32
107116
int64 = numpy.int64
108-
uint8 = numpy.uint8
109-
uint16 = numpy.uint16
110-
uint32 = numpy.uint32
111-
uint64 = numpy.uint64
112117
integer = numpy.integer
113118
intc = numpy.intc
114119
intp = numpy.intp
120+
long = numpy.long
121+
longlong = numpy.longlong
115122
number = numpy.number
123+
short = numpy.short
116124
signedinteger = numpy.signedinteger
117125
single = numpy.single
126+
ubyte = numpy.ubyte
127+
uint8 = numpy.uint8
128+
uint16 = numpy.uint16
129+
uint32 = numpy.uint32
130+
uint64 = numpy.uint64
131+
uintc = numpy.uintc
132+
uintp = numpy.uintp
133+
ushort = numpy.ushort
134+
ulong = numpy.ulong
135+
ulonglong = numpy.ulonglong
118136

119137

120138
# =============================================================================

‎dpnp/tests/config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import os
22

3-
all_types = int(os.getenv("DPNP_TEST_ALL_TYPES", 0))
3+
all_types = int(os.getenv("DPNP_TEST_ALL_TYPES", 0))

‎dpnp/tests/helper.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from numpy.testing import assert_allclose, assert_array_equal
66

77
import dpnp
8-
from tests import config
8+
from dpnp.tests import config
99

1010

1111
def assert_dtype_allclose(

0 commit comments

Comments
 (0)