Skip to content

Commit 2f2235f

Browse files
Merge master into tests_cuda
2 parents 1a3142f + e8c088c commit 2f2235f

File tree

348 files changed

+386
-368
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

348 files changed

+386
-368
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
strategy:
3434
matrix:
35-
python: ['3.12']
35+
python: ['3.13']
3636
os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL
3737

3838
permissions:
@@ -125,7 +125,7 @@ jobs:
125125

126126
strategy:
127127
matrix:
128-
python: ['3.12']
128+
python: ['3.13']
129129
os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL
130130

131131
permissions:

.github/workflows/conda-package.yml

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ env:
1313
# Follow oneAPI installation instruction for conda, since intel channel is not longer available
1414
# CHANNELS: '-c dppy/label/dev -c intel -c conda-forge --override-channels'
1515
CHANNELS: '-c dppy/label/dev -c https://software.repos.intel.com/python/conda/ -c conda-forge --override-channels'
16+
CONDA_BUILD_INDEX_ENV_PY_VER: '3.12' # conda does not support python 3.13
1617
CONDA_BUILD_VERSION: '24.11.2'
1718
CONDA_INDEX_VERSION: '0.5.0'
1819
RERUN_TESTS_ON_FAILURE: 'true'
@@ -28,7 +29,7 @@ jobs:
2829

2930
strategy:
3031
matrix:
31-
python: ['3.9', '3.10', '3.11', '3.12']
32+
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
3233
os: [ubuntu-22.04, windows-2019]
3334

3435
permissions:
@@ -61,7 +62,7 @@ jobs:
6162
use-mamba: 'true'
6263
channels: conda-forge
6364
conda-remove-defaults: 'true'
64-
python-version: ${{ matrix.python }}
65+
python-version: ${{ env.CONDA_BUILD_INDEX_ENV_PY_VER}}
6566
activate-environment: 'build'
6667

6768
# Sometimes `mamba install ...` fails due to slow download speed rate, so disable the check in mamba
@@ -83,13 +84,13 @@ jobs:
8384
MAX_BUILD_CMPL_MKL_VERSION: '2025.1a0'
8485

8586
- name: Upload artifact
86-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
87+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
8788
with:
8889
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
8990
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.tar.bz2
9091

9192
- name: Upload wheels artifact
92-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
93+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
9394
with:
9495
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
9596
path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.PACKAGE_NAME }}-*.whl
@@ -107,7 +108,7 @@ jobs:
107108

108109
strategy:
109110
matrix:
110-
python: ['3.9', '3.10', '3.11', '3.12']
111+
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
111112

112113
continue-on-error: true
113114

@@ -136,7 +137,7 @@ jobs:
136137
use-mamba: 'true'
137138
channels: conda-forge
138139
conda-remove-defaults: 'true'
139-
python-version: ${{ matrix.python }}
140+
python-version: ${{ env.CONDA_BUILD_INDEX_ENV_PY_VER}}
140141
activate-environment: ${{ env.TEST_ENV_NAME }}
141142

142143
- name: Install conda-index
@@ -158,8 +159,13 @@ jobs:
158159
echo PACKAGE_VERSION=${PACKAGE_VERSION}
159160
echo "PACKAGE_VERSION=$PACKAGE_VERSION" >> $GITHUB_ENV
160161
162+
# conda-index does not support python 3.13
163+
- name: Remove conda-index
164+
run: mamba remove conda-index
165+
161166
- name: Install dpnp
162-
run: mamba install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} pytest python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
167+
run: |
168+
mamba install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} pytest python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
163169
env:
164170
TEST_CHANNELS: '-c ${{ env.channel-path }} ${{ env.CHANNELS }}'
165171
MAMBA_NO_LOW_SPEED_LIMIT: 1
@@ -205,7 +211,7 @@ jobs:
205211

206212
strategy:
207213
matrix:
208-
python: ['3.9', '3.10', '3.11', '3.12']
214+
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
209215

210216
continue-on-error: true
211217

@@ -244,7 +250,7 @@ jobs:
244250
use-mamba: 'true'
245251
channels: conda-forge
246252
conda-remove-defaults: 'true'
247-
python-version: ${{ matrix.python }}
253+
python-version: ${{ env.CONDA_BUILD_INDEX_ENV_PY_VER}}
248254
activate-environment: ${{ env.TEST_ENV_NAME }}
249255

250256
- name: Store conda paths as envs
@@ -279,6 +285,10 @@ jobs:
279285
echo PACKAGE_VERSION: %PACKAGE_VERSION%
280286
(echo PACKAGE_VERSION=%PACKAGE_VERSION%) >> %GITHUB_ENV%
281287
288+
# conda-index does not support python 3.13
289+
- name: Remove conda-index
290+
run: mamba remove conda-index
291+
282292
- name: Install dpnp
283293
run: |
284294
@echo on
@@ -331,7 +341,7 @@ jobs:
331341

332342
strategy:
333343
matrix:
334-
python: ['3.9', '3.10', '3.11', '3.12']
344+
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
335345
os: [ubuntu-22.04, windows-2019]
336346

337347
runs-on: ${{ matrix.os }}
@@ -406,7 +416,7 @@ jobs:
406416
channels: conda-forge
407417
conda-remove-defaults: 'true'
408418
run-post: 'false'
409-
python-version: '3.12'
419+
python-version: '3.13'
410420
activate-environment: 'cleanup'
411421

412422
- name: Install anaconda-client

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
strategy:
3636
matrix:
37-
python: ['3.9', '3.10', '3.11', '3.12']
37+
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
3838
runner: [ubuntu-22.04, ubuntu-24.04, windows-2019]
3939

4040
continue-on-error: false
@@ -45,6 +45,17 @@ jobs:
4545
with:
4646
access_token: ${{ github.token }}
4747

48+
- name: Find the latest tag
49+
id: find_latest_tag
50+
uses: oprypin/find-latest-tag@dd2729fe78b0bb55523ae2b2a310c6773a652bd1 # 1.1.2
51+
with:
52+
repository: IntelPython/dpnp
53+
releases-only: false
54+
55+
- name: Print latest tag
56+
run: |
57+
echo "Latest tag is ${{ steps.find_latest_tag.outputs.tag }}"
58+
4859
- name: Setup miniconda
4960
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
5061
with:
@@ -57,7 +68,7 @@ jobs:
5768

5869
- name: Install dpnp
5970
run: |
60-
mamba install ${{ env.PACKAGE_NAME }} pytest ${{ env.CHANNELS }}
71+
mamba install ${{ env.PACKAGE_NAME }}=${{ steps.find_latest_tag.outputs.tag }} pytest ${{ env.CHANNELS }}
6172
env:
6273
MAMBA_NO_LOW_SPEED_LIMIT: 1
6374

.github/workflows/openssf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ jobs:
6060
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6161
# format to the repository Actions tab.
6262
- name: "Upload artifact"
63-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
63+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
6464
with:
6565
name: SARIF file
6666
path: results.sarif
6767
retention-days: 14
6868

6969
# Upload the results to GitHub's code scanning dashboard.
7070
- name: "Upload to code-scanning"
71-
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
71+
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
7272
with:
7373
sarif_file: results.sarif

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Set up python
3232
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
3333
with:
34-
python-version: '3.12'
34+
python-version: '3.13'
3535

3636
- name: Run pre-commit checks
3737
uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2016-2024, Intel Corporation
1+
Copyright (c) 2016-2025, Intel Corporation
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

benchmarks/pytest_benchmark/test_random.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# cython: language_level=3
22
# -*- coding: utf-8 -*-
33
# *****************************************************************************
4-
# Copyright (c) 2016-2024, Intel Corporation
4+
# Copyright (c) 2016-2025, Intel Corporation
55
# All rights reserved.
66
#
77
# Redistribution and use in source and binary forms, with or without

conda-recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ requirements:
1212
host:
1313
- python
1414
- setuptools
15-
- numpy
15+
- numpy >=1.23
1616
- cython
1717
- cmake >=3.21
1818
- ninja

doc/docstring_template.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# cython: language_level=3
22
# -*- coding: utf-8 -*-
33
# *****************************************************************************
4-
# Copyright (c) 2016-2024, Intel Corporation
4+
# Copyright (c) 2016-2025, Intel Corporation
55
# All rights reserved.
66
#
77
# Redistribution and use in source and binary forms, with or without

doc/reference/logic.rst

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ Truth value testing
1212

1313
dpnp.all
1414
dpnp.any
15-
dpnp.in1d
16-
dpnp.isin
1715

1816

19-
Infinities and NaNs
20-
-------------------
17+
Array contents
18+
--------------
2119

2220
.. autosummary::
2321
:toctree: generated/
@@ -45,7 +43,7 @@ Array type testing
4543
dpnp.isscalar
4644

4745

48-
Logic operations
46+
Logical operations
4947
----------------
5048

5149
.. autosummary::

0 commit comments

Comments
 (0)