Skip to content

Commit 3d9ecdc

Browse files
Merge branch 'master' into move_utils_to_headers_only
2 parents 528a7a0 + 76f4360 commit 3d9ecdc

Some content is hidden

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

43 files changed

+1479
-1505
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,9 @@ array_api_tests/test_operators_and_elementwise_functions.py::test_clip
66
# unexpected result is returned - unmute when dpctl-1986 is resolved
77
array_api_tests/test_operators_and_elementwise_functions.py::test_asin
88
array_api_tests/test_operators_and_elementwise_functions.py::test_asinh
9+
10+
# advanced indexing relating issues (waiting a fix from dpctl)
11+
array_api_tests/test_array_object.py::test_getitem_arrays_and_ints_1[1]
12+
array_api_tests/test_array_object.py::test_getitem_arrays_and_ints_1[None]
13+
array_api_tests/test_array_object.py::test_getitem_arrays_and_ints_2[1]
14+
array_api_tests/test_array_object.py::test_getitem_arrays_and_ints_2[None]

.github/workflows/build-sphinx.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,26 @@ jobs:
135135
environment-file: ${{ env.environment-file }}
136136
activate-environment: 'docs'
137137

138-
- name: Conda info
139-
run: mamba info
138+
# We can't install dpctl as a conda package when the environment is created through
139+
# installing of Intel OneAPI packages because the dpctl conda package has a runtime
140+
# dependency on DPC++ RT one. Whereas the DPC++ RT package has been already installed
141+
# by the apt command above and its version has been matched with the DPC++ compiler.
142+
# In case where we install the DPC++ compiler with the apt (including DPC++ RT) and
143+
# install the DPC++ RT conda package while resolving dependencies, this can lead
144+
# to a versioning error, i.e. compatibility issue as the DPC++ compiler only guarantees
145+
# backwards compatibility, not forward compatibility (DPC++ RT may not run a binary built
146+
# with a newer version of the DPC++ compiler).
147+
# Installing dpctl via the pip manager has no such limitation, as the package has no
148+
# run dependency on the DPC++ RT pip package, so this is why the step is necessary here.
149+
- name: Install dpctl
150+
if: env.oneapi-pkgs-env == ''
151+
run: |
152+
pip install -i https://pypi.anaconda.org/dppy/label/dev/simple dpctl==0.20.0dev0
140153
141-
- name: Conda list
142-
run: mamba list
154+
- name: Conda info
155+
run: |
156+
mamba info
157+
mamba list
143158
144159
- name: Build library
145160
run: |

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ env:
1313
environment-file-name: 'environment.yml'
1414
environment-file-loc: '${{ github.workspace }}/environments'
1515
build-with-oneapi-env: 'environments/build_with_oneapi.yml'
16+
dpctl-pkg-env: 'environments/dpctl_pkg.yml'
1617
oneapi-pkgs-env: 'environments/oneapi_pkgs.yml'
1718
test-env-name: 'test_onemkl_interfaces'
1819
rerun-tests-on-failure: 'true'
@@ -47,10 +48,11 @@ jobs:
4748

4849
- name: Merge conda env files
4950
run: |
50-
conda-merge ${{ env.build-with-oneapi-env }} ${{ env.oneapi-pkgs-env }} > ${{ env.environment-file }}
51+
conda-merge ${{ env.dpctl-pkg-env }} ${{ env.oneapi-pkgs-env }} ${{ env.build-with-oneapi-env }} > ${{ env.environment-file }}
52+
cat ${{ env.environment-file }}
5153
5254
- name: Upload artifact
53-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
55+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
5456
with:
5557
name: ${{ env.environment-file-name }}
5658
path: ${{ env.environment-file }}
@@ -81,7 +83,7 @@ jobs:
8183
fetch-depth: 0
8284

8385
- name: Download artifact
84-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
86+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
8587
with:
8688
name: ${{ env.environment-file-name }}
8789
path: ${{ env.environment-file-loc }}
@@ -174,7 +176,7 @@ jobs:
174176
fetch-depth: 0
175177

176178
- name: Download artifact
177-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
179+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
178180
with:
179181
name: ${{ env.environment-file-name }}
180182
path: ${{ env.environment-file-loc }}

.github/workflows/conda-package.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,22 +93,22 @@ jobs:
9393
continue-on-error: true
9494
run: conda build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.channels-list }} conda-recipe
9595
env:
96-
MAX_BUILD_CMPL_MKL_VERSION: '2025.1a0'
96+
MAX_BUILD_CMPL_MKL_VERSION: '2025.2a0'
9797

9898
- name: ReBuild conda package
9999
if: steps.build_conda_pkg.outcome == 'failure'
100100
run: conda build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.channels-list }} conda-recipe
101101
env:
102-
MAX_BUILD_CMPL_MKL_VERSION: '2025.1a0'
102+
MAX_BUILD_CMPL_MKL_VERSION: '2025.2a0'
103103

104104
- name: Upload artifact
105-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
105+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
106106
with:
107107
name: ${{ env.package-name }} ${{ runner.os }} Python ${{ matrix.python }}
108108
path: ${{ env.CONDA_BLD }}${{ env.package-name }}-*.conda
109109

110110
- name: Upload wheels artifact
111-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
111+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
112112
with:
113113
name: ${{ env.package-name }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
114114
path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.package-name }}-*.whl
@@ -146,7 +146,7 @@ jobs:
146146
path: ${{ env.dpnp-repo-path }}
147147

148148
- name: Download artifact
149-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
149+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
150150
with:
151151
name: ${{ env.package-name }} ${{ runner.os }} Python ${{ matrix.python }}
152152
path: ${{ env.pkg-path-in-channel }}
@@ -278,7 +278,7 @@ jobs:
278278
path: ${{ env.dpnp-repo-path }}
279279

280280
- name: Download artifact
281-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
281+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
282282
with:
283283
name: ${{ env.package-name }} ${{ runner.os }} Python ${{ matrix.python }}
284284
path: ${{ env.pkg-path-in-channel }}
@@ -442,12 +442,12 @@ jobs:
442442
fetch-depth: ${{ env.fetch-depth }}
443443

444444
- name: Download artifact
445-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
445+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
446446
with:
447447
name: ${{ env.package-name }} ${{ runner.os }} Python ${{ matrix.python }}
448448

449449
- name: Download wheels artifact
450-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
450+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
451451
with:
452452
name: ${{ env.package-name }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
453453

@@ -530,7 +530,7 @@ jobs:
530530
path: ${{ env.dpnp-repo-path }}
531531

532532
- name: Download artifact
533-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
533+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
534534
with:
535535
name: ${{ env.package-name }} ${{ runner.os }} Python ${{ env.python-ver }}
536536
path: ${{ env.pkg-path-in-channel }}
@@ -625,6 +625,7 @@ jobs:
625625
python -m pytest --json-report --json-report-file=${{ env.json-report-file }} --disable-deadline --skips-file ${{ env.array-api-skips-file }} array_api_tests || true
626626
env:
627627
ARRAY_API_TESTS_MODULE: 'dpnp'
628+
ARRAY_API_TESTS_VERSION: '2024.12'
628629
SYCL_CACHE_PERSISTENT: 1
629630
working-directory: ${{ env.array-api-tests-path }}
630631

.github/workflows/generate_coverage.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,22 @@ jobs:
9494
environment-file: ${{ env.environment-file }}
9595
activate-environment: 'coverage'
9696

97+
# We can't install dpctl as a conda package when the environment is created through
98+
# installing of Intel OneAPI packages because the dpctl conda package has a runtime
99+
# dependency on DPC++ RT one. Whereas the DPC++ RT package has beedn already installed
100+
# by the apt command above and its version has been matched with the DPC++ compiler.
101+
# In case where we install the DPC++ compiler with the apt (including DPC++ RT) and
102+
# install the DPC++ RT conda package while resolving dependencies, this can lead
103+
# to a versioning error, i.e. compatibility issue as the DPC++ compiler only guarantees
104+
# backwards compatibility, not forward compatibility (DPC++ RT may not run a binary built
105+
# with a newer version of the DPC++ compiler).
106+
# Installing dpctl via the pip manager has no such limitation, as the package has no
107+
# run dependency on the DPC++ RT pip package, so this is why the step is necessary here.
108+
- name: Install dpctl
109+
if: env.oneapi-pkgs-env == ''
110+
run: |
111+
pip install -i https://pypi.anaconda.org/dppy/label/dev/simple dpctl==0.20.0dev0
112+
97113
- name: Conda info
98114
run: |
99115
mamba info

.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@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
63+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
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@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
71+
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
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
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3030

3131
- name: Set up python
32-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
32+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
3333
with:
3434
python-version: '3.13'
3535

.pre-commit-config.yaml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
44
- repo: https://github.com/PyCQA/bandit
5-
rev: '1.7.9'
5+
rev: '1.8.3'
66
hooks:
77
- id: bandit
88
pass_filenames: false
99
args: ["-r", "dpnp", "-lll"]
1010
- repo: https://github.com/pre-commit/pre-commit-hooks
11-
rev: v4.6.0
11+
rev: v5.0.0
1212
hooks:
1313
- id: check-ast
1414
- id: check-builtin-literals
@@ -44,17 +44,18 @@ repos:
4444
- id: rst-inline-touching-normal
4545
- id: text-unicode-replacement-char
4646
- repo: https://github.com/codespell-project/codespell
47-
rev: v2.3.0
47+
rev: v2.4.1
4848
hooks:
4949
- id: codespell
50+
args: ["-L", "abd"] # ignore "abd" used in einsum tests
5051
additional_dependencies:
5152
- tomli
5253
- repo: https://github.com/psf/black
53-
rev: 24.4.2
54+
rev: 25.1.0
5455
hooks:
5556
- id: black
5657
- repo: https://github.com/pycqa/isort
57-
rev: 5.13.2
58+
rev: 6.0.1
5859
hooks:
5960
- id: isort
6061
name: isort (python)
@@ -65,20 +66,20 @@ repos:
6566
name: isort (pyi)
6667
types: [pyi]
6768
- repo: https://github.com/pycqa/flake8
68-
rev: 7.1.0
69+
rev: 7.1.2
6970
hooks:
7071
- id: flake8
7172
args: ["--config=.flake8"]
7273
additional_dependencies:
7374
- flake8-docstrings==1.7.0
74-
- flake8-bugbear==24.4.26
75+
- flake8-bugbear==24.12.12
7576
- repo: https://github.com/pocc/pre-commit-hooks
7677
rev: v1.3.5
7778
hooks:
7879
- id: clang-format
7980
args: ["-i"]
8081
- repo: https://github.com/gitleaks/gitleaks
81-
rev: v8.18.4
82+
rev: v8.24.0
8283
hooks:
8384
- id: gitleaks
8485
- repo: https://github.com/jumanjihouse/pre-commit-hooks
@@ -102,3 +103,8 @@ repos:
102103
"--disable=unused-wildcard-import"
103104
]
104105
files: '^dpnp/(dpnp_iface.*|fft|linalg)'
106+
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
107+
rev: v2.14.0
108+
hooks:
109+
- id: pretty-format-toml
110+
args: [--autofix]

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515

1616
### Changed
1717

18+
* Improved performance of `dpnp.nansum`, `dpnp.nanprod`, `dpnp.nancumsum`, and `dpnp.nancumprod` by reusing `dpnp.nan_to_num` function in implementation of the functions [#2339](https://github.com/IntelPython/dpnp/pull/2339)
1819
* Allowed input array of `uint64` dtype in `dpnp.bincount` [#2361](https://github.com/IntelPython/dpnp/pull/2361)
20+
* The vector norms `ord={None, 1, 2, inf}` and the matrix norms `ord={None, 1, 2, inf, "fro", "nuc"}` now consistently return zero for empty arrays, which are arrays with at least one axis of size zero. This change affects `dpnp.linalg.norm`, `dpnp.linalg.vector_norm`, and `dpnp.linalg.matrix_norm`. Previously, dpnp would either raise errors or return zero depending on the parameters provided [#2371](https://github.com/IntelPython/dpnp/pull/2371)
21+
* Extended `dpnp.fft.fftfreq` and `dpnp.fft.rfftfreq` functions to support `dtype` keyword per Python Array API spec 2024.12 [#2384](https://github.com/IntelPython/dpnp/pull/2384)
22+
* Updated `dpnp.fix` to return output with the same data-type of input [#2392](https://github.com/IntelPython/dpnp/pull/2392)
1923

2024
### Fixed
2125

26+
* Resolved an issue with an incorrect result returned due to missing dependency from the strided kernel on a copy event in `dpnp.erf` [#2378](https://github.com/IntelPython/dpnp/pull/2378)
27+
* Updated `conda create` commands build and install instructions of `Quick start guide` to avoid a compilation error [#2395](https://github.com/IntelPython/dpnp/pull/2395)
28+
2229

2330
## [0.17.0] - 02/26/2025
2431

doc/quick_start_guide.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,18 @@ On Linux:
8888

8989
.. code-block:: bash
9090
91-
conda create -n build-env dpctl cython dpcpp_linux-64 mkl-devel-dpcpp tbb-devel onedpl-devel cmake scikit-build ninja pytest -c https://software.repos.intel.com/python/conda/ -c conda-forge
91+
conda create -n build-env dpctl cython dpcpp_linux-64 mkl-devel-dpcpp tbb-devel \
92+
onedpl-devel cmake scikit-build ninja pytest intel-gpu-ocl-icd-system \
93+
-c dppy/label/dev -c https://software.repos.intel.com/python/conda/ -c conda-forge
9294
conda activate build-env
9395
9496
On Windows:
9597

9698
.. code-block:: bash
9799
98-
conda create -n build-env dpctl cython dpcpp_win-64 mkl-devel-dpcpp tbb-devel onedpl-devel cmake scikit-build ninja pytest -c https://software.repos.intel.com/python/conda/ -c conda-forge
100+
conda create -n build-env dpctl cython dpcpp_win-64 mkl-devel-dpcpp tbb-devel \
101+
onedpl-devel cmake scikit-build ninja pytest intel-gpu-ocl-icd-system \
102+
-c dppy/label/dev -c https://software.repos.intel.com/python/conda/ -c conda-forge
99103
conda activate build-env
100104
101105
To build and install the package on Linux OS, run:

0 commit comments

Comments
 (0)