Skip to content

Commit dba592c

Browse files
authored
Merge branch 'master' into revert-gh-2912
2 parents a2e65f9 + e5b5154 commit dba592c

18 files changed

Lines changed: 88 additions & 44 deletions

‎.github/workflows/check-onemath.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
strategy:
7171
fail-fast: false
7272
matrix:
73-
python: ['3.13'] # no dpctl package on PyPI with enabled python 3.14 support
73+
python: ['3.14']
7474
os: [ubuntu-latest] # windows-2022 - no DFT support for Windows in oneMKL
7575

7676
runs-on: ${{ matrix.os }}
@@ -187,7 +187,7 @@ jobs:
187187
strategy:
188188
fail-fast: false
189189
matrix:
190-
python: ['3.13'] # no dpctl package on PyPI with enabled python 3.14 support
190+
python: ['3.14']
191191
os: [ubuntu-latest] # windows-2022 - no DFT support for Windows in oneMKL
192192

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ jobs:
659659
dpnp-repo-path: '${{ github.workspace }}/source/'
660660
array-api-skips-file: '${{ github.workspace }}/source/.github/workflows/array-api-skips.txt'
661661
create-conda-channel-env: 'source/environments/create_conda_channel.yml'
662-
python-ver: '3.13' # it has to be aligned with python in create_conda_channel.yml
662+
python-ver: '3.14'
663663
conda-env-name: 'array-api-conformity'
664664
channel-path: '${{ github.workspace }}/channel/'
665665
pkg-path-in-channel: '${{ github.workspace }}/channel/linux-64/'

‎.github/workflows/generate_coverage.yaml‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,16 @@ jobs:
4646
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
4747
sudo apt update
4848
49-
# Pinned to OneAPI 2025.3 due to known 2026.0 DPC++ compiler issue with Segfault during the sycl-post-link
50-
# TODO: renmove once CMPLRLLVM-75178 is resolved and released
51-
- name: Install Intel OneAPI
49+
- name: Install latest Intel OneAPI
5250
if: env.oneapi-pkgs-env == ''
5351
run: |
54-
sudo apt install hwloc \
55-
intel-oneapi-mkl-2025.3 \
56-
intel-oneapi-umf-1.0 \
57-
intel-oneapi-mkl-devel-2025.3 \
58-
intel-oneapi-tbb-devel-2022.3 \
59-
intel-oneapi-libdpstd-devel-2022.10 \
60-
intel-oneapi-compiler-dpcpp-cpp-2025.3
52+
sudo apt install hwloc \
53+
intel-oneapi-mkl \
54+
intel-oneapi-umf \
55+
intel-oneapi-mkl-devel \
56+
intel-oneapi-tbb-devel \
57+
intel-oneapi-libdpstd-devel \
58+
intel-oneapi-compiler-dpcpp-cpp
6159
6260
- name: Checkout repo
6361
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
@@ -109,14 +107,10 @@ jobs:
109107
# with a newer version of the DPC++ compiler).
110108
# Installing dpctl via the pip manager has no such limitation, as the package has no
111109
# run dependency on the DPC++ RT pip package, so this is why the step is necessary here.
112-
# - name: Install dpctl
113-
# if: env.oneapi-pkgs-env == ''
114-
# run: |
115-
# pip install -r ${{ env.dpctl-pkg-txt }}
116-
# TODO: renmove pinning once CMPLRLLVM-75178 is resolved and released
117110
- name: Install dpctl
111+
if: env.oneapi-pkgs-env == ''
118112
run: |
119-
pip install dpctl>=0.23.0dev0 --index-url https://pypi.anaconda.org/dppy/label/coverage/simple
113+
pip install -r ${{ env.dpctl-pkg-txt }}
120114
121115
- name: Conda info
122116
run: |

‎.github/workflows/openssf-scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ jobs:
7272

7373
# Upload the results to GitHub's code scanning dashboard.
7474
- name: "Upload to code-scanning"
75-
uses: github/codeql-action/upload-sarif@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
75+
uses: github/codeql-action/upload-sarif@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
7676
with:
7777
sarif_file: results.sarif

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ repos:
5757
hooks:
5858
- id: pyupgrade
5959
- repo: https://github.com/codespell-project/codespell
60-
rev: v2.4.2
60+
rev: v2.4.3
6161
hooks:
6262
- id: codespell
6363
args: ["-L", "abd"] # ignore "abd" used in einsum tests
@@ -69,7 +69,7 @@ repos:
6969
- id: black
7070
exclude: "dpnp/_version.py"
7171
- repo: https://github.com/pycqa/isort
72-
rev: 9.0.0a3
72+
rev: 9.0.0b1
7373
hooks:
7474
- id: isort
7575
name: isort (python)
@@ -89,7 +89,7 @@ repos:
8989
- flake8-docstrings==1.7.0
9090
- flake8-bugbear==25.11.29
9191
- repo: https://github.com/pre-commit/mirrors-clang-format
92-
rev: v22.1.5
92+
rev: v22.1.8
9393
hooks:
9494
- id: clang-format
9595
args: ["-i"]

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ This release is compatible with NumPy 2.5.
3636
* Replaced references to the `dpnp.amax`/`dpnp.amin` aliases with the canonical `dpnp.max`/`dpnp.min` in docstrings and code internally [#2990](https://github.com/IntelPython/dpnp/pull/2990)
3737
* Aligned the signature of `dpnp.tensor.expand_dims` with the Python array API by making `axis` a required argument [#2988](https://github.com/IntelPython/dpnp/pull/2988)
3838
* Removed dead code branches guarded by outdated oneMKL and DPC++ compiler version checks [#2999](https://github.com/IntelPython/dpnp/pull/2999)
39+
* Replaced the deprecated `nd_item::barrier()` member calls in the `accumulators` and `gemm` kernels with the SYCL 2020 `sycl::group_barrier()` free function [#3006](https://github.com/IntelPython/dpnp/pull/3006)
3940

4041
### Deprecated
4142

‎dpnp/CMakeLists.txt‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,12 @@ function(build_dpnp_cython_ext _trgt _src _dest)
4242
endif()
4343

4444
if(DPNP_GENERATE_COVERAGE)
45-
target_compile_definitions(${_trgt} PRIVATE CYTHON_TRACE=1 CYTHON_TRACE_NOGIL=1)
45+
# Pass CYTHON_USE_SYS_MONITORING=0 to force Cython's legacy (settrace-based)
46+
# line tracing instead of the sys.monitoring path
47+
target_compile_definitions(
48+
${_trgt}
49+
PRIVATE CYTHON_TRACE=1 CYTHON_TRACE_NOGIL=1 CYTHON_USE_SYS_MONITORING=0
50+
)
4651
target_compile_options(${_trgt} PRIVATE "-fno-sycl-use-footer")
4752
endif()
4853

@@ -110,7 +115,13 @@ function(build_dpnp_tensor_ext _trgt _src _dest)
110115
endif()
111116
target_link_libraries(${_trgt} PRIVATE Python::NumPy)
112117
if(DPNP_GENERATE_COVERAGE)
113-
target_compile_definitions(${_trgt} PRIVATE CYTHON_TRACE=1 CYTHON_TRACE_NOGIL=1)
118+
# Pass CYTHON_USE_SYS_MONITORING=0 to force Cython's legacy (settrace-based)
119+
# line tracing instead of the sys.monitoring path
120+
# See https://github.com/cython/cython/issues/6658.
121+
target_compile_definitions(
122+
${_trgt}
123+
PRIVATE CYTHON_TRACE=1 CYTHON_TRACE_NOGIL=1 CYTHON_USE_SYS_MONITORING=0
124+
)
114125
if(BUILD_DPNP_TENSOR_SYCL)
115126
target_compile_options(${_trgt} PRIVATE -fno-sycl-use-footer)
116127
endif()

‎dpnp/tensor/_slicing.pyx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
# distutils: language = c++
3030
# cython: language_level=3
31+
# cython: linetrace=True
3132

3233
from operator import index
3334
from cpython.buffer cimport PyObject_CheckBuffer

‎dpnp/tensor/_stride_utils.pyx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
# distutils: language = c++
3030
# cython: language_level=3
31+
# cython: linetrace=True
3132

3233
from cpython.mem cimport PyMem_Free, PyMem_Malloc
3334
from cpython.ref cimport Py_INCREF

‎dpnp/tensor/_types.pyx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
# distutils: language = c++
3030
# cython: language_level=3
31+
# cython: linetrace=True
3132

3233
import numpy as np
3334

0 commit comments

Comments
 (0)