Skip to content

Commit 806ee3c

Browse files
authored
Merge branch 'master' into align-astype-signature-with-array-api
2 parents ae0ed1b + f56a43f commit 806ee3c

19 files changed

+509
-324
lines changed

.github/workflows/array-api-skips.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
11
# array API tests to be skipped
22

3-
# missing unique-like functions
4-
array_api_tests/test_has_names.py::test_has_names[set-unique_all]
5-
array_api_tests/test_has_names.py::test_has_names[set-unique_counts]
6-
array_api_tests/test_has_names.py::test_has_names[set-unique_inverse]
7-
array_api_tests/test_has_names.py::test_has_names[set-unique_values]
8-
array_api_tests/test_set_functions.py::test_unique_all
9-
array_api_tests/test_set_functions.py::test_unique_counts
10-
array_api_tests/test_set_functions.py::test_unique_inverse
11-
array_api_tests/test_set_functions.py::test_unique_values
12-
array_api_tests/test_signatures.py::test_func_signature[unique_all]
13-
array_api_tests/test_signatures.py::test_func_signature[unique_counts]
14-
array_api_tests/test_signatures.py::test_func_signature[unique_inverse]
15-
array_api_tests/test_signatures.py::test_func_signature[unique_values]
16-
173
# hypothesis found failures
184
array_api_tests/test_operators_and_elementwise_functions.py::test_clip
195

.github/workflows/check-mkl-interfaces.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ env:
2020
onedpl-devel
2121
setuptools
2222
python
23-
numpy">=2.0"
23+
numpy
2424
cython
2525
cmake
2626
ninja
@@ -32,7 +32,9 @@ jobs:
3232

3333
strategy:
3434
matrix:
35-
python: ['3.13']
35+
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
36+
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
37+
python: ['3.12']
3638
os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL
3739

3840
permissions:
@@ -125,7 +127,9 @@ jobs:
125127

126128
strategy:
127129
matrix:
128-
python: ['3.13']
130+
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
131+
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
132+
python: ['3.12']
129133
os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL
130134

131135
permissions:

.github/workflows/conda-package.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ env:
1616
CONDA_BUILD_INDEX_ENV_PY_VER: '3.12' # conda does not support python 3.13
1717
CONDA_BUILD_VERSION: '25.1.1'
1818
CONDA_INDEX_VERSION: '0.5.0'
19-
LATEST_PYTHON: '3.13'
19+
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
20+
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
21+
LATEST_PYTHON: '3.12'
2022
RERUN_TESTS_ON_FAILURE: 'true'
2123
RUN_TESTS_MAX_ATTEMPTS: 2
2224
TEST_ENV_NAME: 'test'
@@ -31,7 +33,9 @@ jobs:
3133
strategy:
3234
fail-fast: false
3335
matrix:
34-
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
36+
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
37+
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
38+
python: ['3.9', '3.10', '3.11', '3.12']
3539
os: [ubuntu-22.04, windows-2019]
3640

3741
permissions:
@@ -124,7 +128,8 @@ jobs:
124128
strategy:
125129
fail-fast: false
126130
matrix:
127-
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
131+
# python 3.13 is blocked due to MKL issue
132+
python: ['3.9', '3.10', '3.11', '3.12']
128133
os: [ubuntu-latest]
129134

130135
env:
@@ -253,7 +258,8 @@ jobs:
253258
strategy:
254259
fail-fast: false
255260
matrix:
256-
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
261+
# python 3.13 is blocked due to MKL issue
262+
python: ['3.9', '3.10', '3.11', '3.12']
257263
os: [windows-2019]
258264

259265
env:
@@ -389,7 +395,8 @@ jobs:
389395

390396
strategy:
391397
matrix:
392-
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
398+
# python 3.13 is blocked due to MKL issue
399+
python: ['3.9', '3.10', '3.11', '3.12']
393400
os: [ubuntu-22.04, windows-2019]
394401

395402
runs-on: ${{ matrix.os }}

.github/workflows/cron-run-tests.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ jobs:
3737
strategy:
3838
fail-fast: false
3939
matrix:
40-
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
40+
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
41+
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
42+
python: ['3.9', '3.10', '3.11', '3.12']
4143
runner: [ubuntu-22.04, ubuntu-24.04, windows-2019]
4244

4345
steps:

doc/reference/creation.rst renamed to doc/reference/array-creation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. _routines.creation:
1+
.. _routines.array-creation:
22

33
Array creation routines
44
=======================

doc/reference/manipulation.rst renamed to doc/reference/array-manipulation.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ Adding and removing elements
135135
dpnp.append
136136
dpnp.resize
137137
dpnp.trim_zeros
138-
dpnp.unique
139138
dpnp.pad
140139

141140

File renamed without changes.

doc/reference/misc.rst renamed to doc/reference/other.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Utility
1010
:toctree: generated/
1111
:nosignatures:
1212

13-
dpnp.broadcast_shapes
1413
dpnp.byte_bounds
1514
dpnp.get_include
1615
dpnp.show_config
1716
dpnp.show_runtime
17+
dpnp.broadcast_shapes

doc/reference/routines.rst

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,19 @@ These functions cover a subset of
1111
.. toctree::
1212
:maxdepth: 2
1313

14-
creation
15-
manipulation
16-
binary
14+
array-creation
15+
array-manipulation
16+
bitwise
1717
dtype
1818
fft
1919
functional
2020
indexing
2121
linalg
2222
logic
2323
math
24+
other
2425
.. polynomials
2526
random
26-
sorting
27+
set
28+
sort
2729
statistics

doc/reference/set.rst

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
Set routines
2+
============
3+
4+
.. https://numpy.org/doc/stable/reference/routines.set.html
5+
6+
Making proper sets
7+
------------------
8+
.. autosummary::
9+
:toctree: generated/
10+
:nosignatures:
11+
12+
dpnp.unique
13+
dpnp.unique_all
14+
dpnp.unique_counts
15+
dpnp.unique_inverse
16+
dpnp.unique_values
17+
18+
Boolean operations
19+
------------------
20+
.. autosummary::
21+
:toctree: generated/
22+
:nosignatures:
23+
24+
dpnp.in1d
25+
dpnp.intersect1d
26+
dpnp.isin
27+
dpnp.setdiff1d
28+
dpnp.setxor1d
29+
dpnp.union1d

0 commit comments

Comments
 (0)