8000 Merge branch 'master' into bump-conda-versions · IntelPython/dpnp@fa37051 · GitHub
[go: up one dir, main page]
Skip to content

Commit fa37051

Browse files
antonwolfyantonwolfy
authored
Merge branch 'master' into bump-conda-versions
2 parents 6bd748b + a4aa964 commit fa37051

File tree

8 files changed

+46
-20
lines changed

8 files changed

+46
-20
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ jobs:
6868
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
6969
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
7070
python: ['3.12']
71-
os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL
71+
os: [ubuntu-22.04] # windows-2022 - no DFT support for Windows in oneMKL
7272

7373
runs-on: ${{ matrix.os }}
7474

7575
defaults:
7676
run:
77-
shell: ${{ matrix.os == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
77+
shell: ${{ matrix.os == 'windows-2022' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
7878

7979
steps:
8080
- name: Checkout DPNP repo
@@ -158,13 +158,13 @@ jobs:
158158
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
159159
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
160160
python: ['3.12']
161-
os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL
161+
os: [ubuntu-22.04] # windows-2022 - no DFT support for Windows in oneMKL
162162

163163
runs-on: ${{ matrix.os }}
164164

165165
defaults:
166166
run:
167-
shell: ${{ matrix.os == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
167+
shell: ${{ matrix.os == 'windows-2022' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
168168

169169
env:
170170
onemkl-source-dir: '${{ github.workspace }}/onemkl/'

‎.github/workflows/conda-package.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
3535
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
3636
python: ['3.9', '3.10', '3.11', '3.12']
37-
os: [ubuntu-22.04, windows-2019]
37+
os: [ubuntu-22.04, windows-2022]
3838

3939
permissions:
4040
# Needed to cancel any previous runs that are not completed for a given workflow
@@ -44,7 +44,7 @@ jobs:
4444

4545
defaults:
4646
run:
47-
shell: ${{ matrix.os == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
47+
shell: ${{ matrix.os == 'windows-2022' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
4848

4949
env:
5050
build-conda-pkg-env: 'environments/build_conda_pkg.yml'
@@ -260,7 +260,7 @@ jobs:
260260
matrix:
261261
# python 3.13 is blocked due to MKL issue
262262
python: ['3.9', '3.10', '3.11', '3.12']
263-
os: [windows-2019]
263+
os: [windows-2022]
264264

265265
env:
266266
dpnp-repo-path: '${{ github.workspace }}\source'
@@ -410,13 +410,13 @@ jobs:
410410
matrix:
411411
# python 3.13 is blocked due to MKL issue
412412
python: ['3.9', '3.10', '3.11', '3.12']
413-
os: [ubuntu-22.04, windows-2019]
413+
os: [ubuntu-22.04, windows-2022]
414414

415415
runs-on: ${{ matrix.os }}
416416

417417
defaults:
418418
run:
419-
shell: ${{ matrix.os == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
419+
shell: ${{ matrix.os == 'windows-2022' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
420420

421421
env:
422422
upload-conda-pkg-env: 'environments/upload_cleanup_conda_pkg.yml'

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
defaults:
3131
run:
32-
shell: ${{ matrix.runner == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
32+
shell: ${{ matrix.runner == 'windows-2022' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
3333

3434
permissions:
3535
# Needed to cancel any previous runs that are not completed for a given workflow
@@ -41,7 +41,7 @@ jobs:
4141
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
4242
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
4343
python: ['3.9', '3.10', '3.11', '3.12']
44-
runner: [ubuntu-22.04, ubuntu-24.04, windows-2019]
44+
runner: [ubuntu-22.04, ubuntu-24.04, windows-2022]
4545

4646
steps:
4747
- name: Cancel Previous Runs
@@ -98,7 +98,7 @@ jobs:
9898
run: mamba list
9999

100100
- name: Activate OCL CPU RT
101-
if: matrix.runner == 'windows-2019'
101+
if: matrix.runner == 'windows-2022'
102102
shell: pwsh
103103
run: |
104104
$script_path="$env:CONDA_PREFIX\Scripts\set-intel-ocl-icd-registry.ps1"
@@ -125,7 +125,7 @@ jobs:
125125
SYCL_CACHE_PERSISTENT: 1
126126

127127
- name: ReRun tests on Linux
128-
if: steps.run_tests.outcome == 'failure' && matrix.runner != 'windows-2019'
128+
if: steps.run_tests.outcome == 'failure' && matrix.runner != 'windows-2022'
129129
id: run_tests_linux
130130
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
131131
with:
@@ -142,7 +142,7 @@ jobs:
142142
SYCL_CACHE_PERSISTENT: 1
143143

144144
- name: ReRun tests on Windows
145-
if: steps.run_tests.outcome == 'failure' && matrix.runner == 'windows-2019'
145+
if: steps.run_tests.outcome == 'failure' && matrix.runner == 'windows-2022'
146146
id: run_tests_win
147147
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
148148
with:

‎CHANGELOG.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,16 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## [0.18.0] - 05/DD/2025
7+
## [0.19.0] - MM/DD/2025
8+
9+
### Added
10+
11+
### Changed
12+
13+
### Fixed
14+
15+
16+
## [0.18.0] - 06/DD/2025
817

918
This release achieves 100% compliance with Python Array API specification (revision [2024.12](https://data-apis.org/array-api/2024.12/)).
1019
The release provides enhanced compatibility with NumPy 2.2.5. Window and mathematical routines are complemented by a set of new functions.
@@ -52,6 +61,7 @@ Moreover, it adds support to build `dpnp` from the source for AMD GPUs.
5261
* Added handling of empty string passed to a test env variable defining data type scope as a `False` value [#2415](https://github.com/IntelPython/dpnp/pull/2415)
5362
* Resolved build issues on non-Intel targets in `dpnp.i0` and `dpnp.kaiser` [#2439](https://github.com/IntelPython/dpnp/pull/2439)
5463
* Ensure consistency in the `dpnp.linalg.LinAlgError` exception raised on singular input matrices for both non-batched and batched cases in `dpnp.linalg.inv` [#2458] (https://github.com/IntelPython/dpnp/pull/2458)
64+
* Updated test f/w to correct a check of array interface while converting to `numpy.ndarray` for comparison [#2467] (https://github.com/IntelPython/dpnp/pull/2467)
5565

5666

5767
## [0.17.0] - 02/26/2025

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.21...3.27 FATAL_ERROR)
22

33
project(dpnp
4-
VERSION 0.18
4+
VERSION 0.19
55
LANGUAGES CXX
66
DESCRIPTION "NumPy-like API accelerated by SYCL."
77
)

‎conda-recipe/conda_build_config.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,18 @@
11
numpy:
2-
- 1.23
2+
- '1.25'
3+
c_compiler: # [linux]
4+
- gcc # [linux]
5+
cxx_compiler: # [linux]
6+
- gxx # [linux]
7+
cxx_compiler_version: # [linux]
8+
- '14' # [linux]
9+
c_stdlib: # [linux]
10+
- sysroot # [linux]
11+
c_stdlib_version: # [linux]
12+
- '2.28' # [linux]
13+
c_stdlib: # [win]
14+
- vs # [win]
15+
cxx_compiler: # [win]
16+
- vs2022 # [win]
17+
c_compiler: # [win]
18+
- vs2022 # [win]

‎conda-recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ requirements:
3737
- tbb-devel
3838
build:
3939
- {{ compiler('cxx') }}
40+
- {{ stdlib('c') }}
4041
- {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }},<{{ max_compiler_and_mkl_version }}
41-
- sysroot_linux-64 >=2.28 # [linux]
4242
run:
4343
- python
4444
- {{ pin_compatible('dpctl', min_pin='x.x.x', max_pin=None) }}

‎dpnp/dpnp_utils/dpnp_algo_utils.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ cdef ERROR_PREFIX = "DPNP error:"
7676

7777

7878
def convert_item(item):
79-
if getattr(item, "__sycl_usm_array_interface__", False):
79+
if hasattr(item, "__sycl_usm_array_interface__"):
8080
item_converted = dpnp.asnumpy(item)
81-
elif getattr(item, "__array_interface__", False): # detect if it is a container (TODO any better way?)
81+
elif hasattr(item, "__array_interface__"): # detect if it is a container (TODO any better way?)
8282
mod_name = getattr(item, "__module__", 'none')
8383
if (mod_name != 'numpy'):
8484
item_converted = dpnp.asnumpy(item)

0 commit comments

Comments
 (0)
0