Skip to content

Commit 8e0a535

Browse files
antonwolfyantonwolfy
authored
Merge pull request #1676 from IntelPython/merge_to_gold
Merge `0.13.1dev3` from master to gold
2 parents e62d607 + dea26e2 commit 8e0a535

File tree

247 files changed

+8776
-3325
lines changed

Some content is hidden

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

247 files changed

+8776
-3325
lines changed

‎.github/workflows/build-sphinx.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
steps:
3333
- name: Cancel Previous Runs
34-
uses: styfle/cancel-workflow-action@0.11.0
34+
uses: styfle/cancel-workflow-action@0.12.0
3535
with:
3636
access_token: ${{ github.token }}
3737

@@ -42,7 +42,7 @@ jobs:
4242
echo "$GITHUB_CONTEXT"
4343
4444
- name: Free Disk Space (Ubuntu)
45-
uses: jlumbroso/free-disk-space@main
45+
uses: jlumbroso/free-disk-space@v1.3.1
4646
with:
4747
docker-images: false
4848

@@ -76,13 +76,13 @@ jobs:
7676
sudo apt-get install -y nvidia-cuda-toolkit clinfo
7777
7878
- name: Checkout repo
79-
uses: actions/checkout@v3.5.2
79+
uses: actions/checkout@v4.1.1
8080
with:
8181
fetch-depth: 0
8282

8383
# https://github.com/marketplace/actions/setup-miniconda
8484
- name: Setup miniconda
85-
uses: conda-incubator/setup-miniconda@v2.2.0
85+
uses: conda-incubator/setup-miniconda@v3.0.1
8686
with:
8787
auto-update-conda: true
8888
python-version: ${{ env.python-ver }}
@@ -97,7 +97,7 @@ jobs:
9797
9898
- name: Install dpnp dependencies
9999
run: |
100-
conda install numpy"<1.24" dpctl">=0.15.1dev2" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64"<2024.0.1" \
100+
conda install numpy"<1.24" dpctl">=0.15.1dev3" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64"<2024.0.1" \
101101
cmake cython pytest ninja scikit-build sysroot_linux-64">=2.28" ${{ env.CHANNELS }}
102102
103103
- name: Install cuPy dependencies
@@ -110,8 +110,7 @@ jobs:
110110
run: conda list
111111

112112
- name: Build library
113-
run: |
114-
CC=icx CXX=icpx python setup.py develop -G Ninja -- -DDPCTL_MODULE_PATH=$(python -m dpctl --cmakedir)
113+
run: python scripts/build_locally.py
115114

116115
- name: Build docs
117116
run: make html
@@ -184,7 +183,7 @@ jobs:
184183
runs-on: ubuntu-20.04
185184

186185
steps:
187-
- uses: actions/checkout@v3.5.2
186+
- uses: actions/checkout@v4.1.1
188187
with:
189188
fetch-depth: 0
190189

‎.github/workflows/conda-package.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ env:
3030
test_umath.py
3131
test_usm_type.py
3232
third_party/cupy/core_tests
33+
third_party/cupy/linalg_tests/test_decomposition.py
34+
third_party/cupy/linalg_tests/test_norms.py
3335
third_party/cupy/linalg_tests/test_product.py
3436
third_party/cupy/linalg_tests/test_solve.py
3537
third_party/cupy/logic_tests/test_comparison.py
@@ -66,17 +68,17 @@ jobs:
6668

6769
steps:
6870
- name: Cancel Previous Runs
69-
uses: styfle/cancel-workflow-action@0.11.0
71+
uses: styfle/cancel-workflow-action@0.12.0
7072
with:
7173
access_token: ${{ github.token }}
7274

7375
- name: Checkout DPNP repo
74-
uses: actions/checkout@v3.5.2
76+
uses: actions/checkout@v4.1.1
7577
with:
7678
fetch-depth: 0
7779

7880
- name: Setup miniconda
79-
uses: conda-incubator/setup-miniconda@v2.2.0
81+
uses: conda-incubator/setup-miniconda@v3.0.1
8082
with:
8183
auto-update-conda: true
8284
python-version: ${{ matrix.python }}
@@ -97,7 +99,7 @@ jobs:
9799
run: conda install conda-build
98100

99101
- name: Cache conda packages
100-
uses: actions/cache@v3.3.0
102+
uses: actions/cache@v4
101103
env:
102104
CACHE_NUMBER: 1 # Increase to reset cache
103105
with:
@@ -112,7 +114,7 @@ jobs:
112114
run: conda build --no-test --python ${{ matrix.python }} ${{ env.CHANNELS }} conda-recipe
113115

114116
- name: Upload artifact
115-
uses: actions/upload-artifact@v3.1.2
117+
uses: actions/upload-artifact@v4.3.0
116118
with:
117119
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
118120
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.tar.bz2
@@ -145,7 +147,7 @@ jobs:
145147

146148
steps:
147149
- name: Download artifact
148-
uses: actions/download-artifact@v3.0.2
150+
uses: actions/download-artifact@v4.1.1
149151
with:
150152
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
151153
path: ${{ env.pkg-path-in-channel }}
@@ -156,7 +158,7 @@ jobs:
156158
tar -xvf ${{ env.pkg-path-in-channel }}/${{ env.PACKAGE_NAME }}-*.tar.bz2 -C ${{ env.extracted-pkg-path }}
157159
158160
- name: Setup miniconda
159-
uses: conda-incubator/setup-miniconda@v2.2.0
161+
uses: conda-incubator/setup-miniconda@v3.0.1
160162
with:
161163
auto-update-conda: true
162164
python-version: ${{ matrix.python }}
@@ -188,7 +190,7 @@ jobs:
188190
TEST_CHANNELS: '-c ${{ env.channel-path }} ${{ env.CHANNELS }}'
189191

190192
- name: Cache conda packages
191-
uses: actions/cache@v3.3.0
193+
uses: actions/cache@v4
192194
env:
193195
CACHE_NUMBER: 1 # Increase to reset cache
194196
with:
@@ -246,7 +248,7 @@ jobs:
246248

247249
steps:
248250
- name: Download artifact
249-
uses: actions/download-artifact@v3.0.2
251+
uses: actions/download-artifact@v4.1.1
250252
with:
251253
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
252254
path: ${{ env.pkg-path-in-channel }}
@@ -266,7 +268,7 @@ jobs:
266268
dir ${{ env.extracted-pkg-path }}
267269
268270
- name: Setup miniconda
269-
uses: conda-incubator/setup-miniconda@v2.2.0
271+
uses: conda-incubator/setup-miniconda@v3.0.1
270272
with:
271273
auto-update-conda: true
272274
python-version: ${{ matrix.python }}
@@ -312,7 +314,7 @@ jobs:
312314
run: more lockfile
313315

314316
- name: Cache conda packages
315-
uses: actions/cache@v3.3.0
317+
uses: actions/cache@v4
316318
env:
317319
CACHE_NUMBER: 1 # Increase to reset cache
318320
with:
@@ -380,12 +382,12 @@ jobs:
380382
381383
steps:
382384
- name: Download artifact
383-
uses: actions/download-artifact@v3.0.2
385+
uses: actions/download-artifact@v4.1.1
384386
with:
385387
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
386388

387389
- name: Setup miniconda
388-
uses: conda-incubator/setup-miniconda@v2.2.0
390+
uses: conda-incubator/setup-miniconda@v3.0.1
389391
with:
390392
auto-update-conda: true
391393
python-version: ${{ matrix.python }}
@@ -408,7 +410,7 @@ jobs:
408410
run:
409411
shell: bash -el {0}
410412
steps:
411-
- uses: conda-incubator/setup-miniconda@v2
413+
- uses: conda-incubator/setup-miniconda@v3.0.1
412414
with:
413415
run-post: false
414416
channel-priority: "disabled"
@@ -419,7 +421,7 @@ jobs:
419421
run: conda install anaconda-client
420422

421423
- name: Checkout repo
422-
uses: actions/checkout@v3.5.2
424+
uses: actions/checkout@v4.1.1
423425
with:
424426
repository: IntelPython/devops-tools
425427
fetch-depth: 0

‎.github/workflows/generate_coverage.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ jobs:
1919

2020
steps:
2121
- name: Cancel Previous Runs
22-
uses: styfle/cancel-workflow-action@0.11.0
22+
uses: styfle/cancel-workflow-action@0.12.0
2323
with:
2424
access_token: ${{ github.token }}
2525

2626
- name: Checkout repo
27-
uses: actions/checkout@v3.5.2
27+
uses: actions/checkout@v4.1.1
2828
with:
2929
fetch-depth: 0
3030

3131
- name: Setup miniconda
32-
uses: conda-incubator/setup-miniconda@v2.2.0
32+
uses: conda-incubator/setup-miniconda@v3.0.1
3333
with:
3434
auto-update-conda: true
3535
python-version: ${{ env.python-ver }}
@@ -44,7 +44,7 @@ jobs:
4444
run: |
4545
# use DPC++ compiler 2023.2 to work around an issue with crash
4646
conda install cython llvm cmake">=3.21" scikit-build ninja pytest pytest-cov coverage[toml] \
47-
dpctl">=0.15.1dev2" dpcpp_linux-64"=2023.2" sysroot_linux-64">=2.28" mkl-devel-dpcpp tbb-devel"=2021.10" \
47+
dpctl">=0.15.1dev3" dpcpp_linux-64"=2023.2" sysroot_linux-64">=2.28" mkl-devel-dpcpp tbb-devel"=2021.10" \
4848
onedpl-devel ${{ env.CHANNELS }}
4949
5050
- name: Conda info

‎.github/workflows/pre-commit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
sudo ln -s /usr/bin/clang-format-12 /usr/bin/clang-format
1717
clang-format --version
1818
19-
- uses: actions/checkout@v3.5.2
20-
- uses: actions/setup-python@v4.6.1
19+
- uses: actions/checkout@v4.1.1
20+
- uses: actions/setup-python@v5
2121
with:
2222
python-version: '3.11'
2323
- uses: pre-commit/action@v3.0.0

‎.pre-commit-config.yaml

Lines changed: 6 additions & 6 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.5'
5+
rev: '1.7.7'
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.4.0
11+
rev: v4.5.0
1212
hooks:
1313
- id: check-ast
1414
- id: check-builtin-literals
@@ -43,12 +43,12 @@ repos:
4343
- id: rst-inline-touching-normal
4444
- id: text-unicode-replacement-char
4545
- repo: https://github.com/psf/black
46-
rev: 23.7.0
46+
rev: 23.12.1
4747
hooks:
4848
- id: black
4949
args: ["--check", "--diff", "--color"]
5050
- repo: https://github.com/pycqa/isort
51-
rev: 5.12.0
51+
rev: 5.13.2
5252
hooks:
5353
- id: isort
5454
name: isort (python)
@@ -59,13 +59,13 @@ repos:
5959
name: isort (pyi)
6060
types: [pyi]
6161
- repo: https://github.com/pycqa/flake8
62-
rev: 6.1.0
62+
rev: 7.0.0
6363
hooks:
6464
- id: flake8
6565
args: ["--config=.flake8"]
6666
additional_dependencies:
6767
- flake8-docstrings==1.7.0
68-
- flake8-bugbear==23.6.5
68+
- flake8-bugbear==24.1.17
6969
- repo: https://github.com/pocc/pre-commit-hooks
7070
rev: v1.3.5
7171
hooks:

‎CMakeLists.txt

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
1212
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
1313
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
1414

15-
if (NOT DEFINED DPCTL_MODULE_PATH)
16-
if (DEFINED ENV{DPCTL_MODULE_PATH})
17-
set(DPCTL_MODULE_PATH $ENV{DPCTL_MODULE_PATH})
18-
else ()
19-
message(FATAL_ERROR "Specify DPCTL_MODULE_PATH, either via cmake or as environment varibale")
20-
endif()
21-
endif()
22-
23-
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${DPCTL_MODULE_PATH})
24-
2515

2616
find_package(IntelSYCL REQUIRED PATHS ${CMAKE_SOURCE_DIR}/dpnp/backend/cmake/Modules NO_DEFAULT_PATH)
2717
find_package(TBB QUIET)
@@ -78,9 +68,9 @@ find_package(NumPy REQUIRED)
7868

7969
set(CYTHON_FLAGS "-t -w \"${CMAKE_SOURCE_DIR}\"")
8070
find_package(Cython REQUIRED)
81-
find_package(Dpctl REQUIRED)
8271

83-
message(STATUS "Dpctl_INCLUDE_DIRS=" ${Dpctl_INCLUDE_DIRS})
72+
find_package(Dpctl REQUIRED)
73+
message(STATUS "Dpctl_INCLUDE_DIR=" ${Dpctl_INCLUDE_DIR})
8474
message(STATUS "Dpctl_TENSOR_INCLUDE_DIR=" ${Dpctl_TENSOR_INCLUDE_DIR})
8575

8676
if(WIN32)

‎LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2016-2023, Intel Corporation
1+
Copyright (c) 2016-2024, 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-2023, Intel Corporation
4+
# Copyright (c) 2016-2024, Intel Corporation
55
# All rights reserved.
66
#
77
# Redistribution and use in source and binary forms, with or without

‎conda-recipe/bld.bat

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@ set "MKLROOT=%PREFIX%/Library"
1515
set "TBB_ROOT_HINT=%PREFIX%/Library"
1616
set "DPL_ROOT_HINT=%PREFIX%/Library"
1717

18-
%PYTHON% -m dpctl --cmakedir > Output
19-
set /p DPCTL_CMAKE_DIR= < Output
20-
2118
set "SKBUILD_ARGS=-G Ninja -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
22-
set "SKBUILD_ARGS=%SKBUILD_ARGS% -DDPCTL_MODULE_PATH:PATH=%DPCTL_CMAKE_DIR% "
2319
set "SKBUILD_ARGS=%SKBUILD_ARGS% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
2420

2521
FOR %%V IN (14.0.0 14 15.0.0 15 16.0.0 16 17.0.0 17) DO @(

‎conda-recipe/build.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ export CMAKE_GENERATOR="Ninja"
1212
export TBB_ROOT_HINT=$PREFIX
1313
export DPL_ROOT_HINT=$PREFIX
1414
export MKL_ROOT_HINT=$PREFIX
15-
SKBUILD_ARGS="-- -DDPCTL_MODULE_PATH=$($PYTHON -m dpctl --cmakedir) "
16-
SKBUILD_ARGS="${SKBUILD_ARGS} -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
15+
SKBUILD_ARGS="-- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
1716
SKBUILD_ARGS="${SKBUILD_ARGS} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
1817

1918
# Build wheel package

‎conda-recipe/meta.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{% set required_compiler_and_mkl_version = "2024.0" %}
2-
{% set required_dpctl_version = "0.15.1dev2" %}
1+
{% set required_compiler_and_mkl_version = "2024.1" %}
2+
{% set required_dpctl_version = "0.15.1dev3" %}
33

44
package:
55
name: dpnp
@@ -48,7 +48,8 @@ test:
4848
- tests
4949
- setup.cfg
5050
commands:
51-
- python -c "import dpnp"
51+
- python -c "import dpnp; print(dpnp.__version__)"
52+
- python -m dpctl -f
5253
- pytest -s
5354

5455
about:

‎doc/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
# -- Project information -----------------------------------------------------
2929

3030
project = "Data Parallel Extension for NumPy"
31-
copyright = "2020-2023, Intel Corporation"
31+
copyright = "2020-2024, Intel Corporation"
3232
author = "Intel"
3333

3434
version = dpnp.__version__.strip(".dirty")

‎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-2023, Intel Corporation
4+
# Copyright (c) 2016-2024, Intel Corporation
55
# All rights reserved.
66
#
77
# Redistribution and use in source and binary forms, with or without

‎doc/reference/math.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ Miscellaneous
205205
dpnp.sqrt
206206
dpnp.cbrt
207207
dpnp.square
208+
dpnp.rsqrt
208209
dpnp.abs
209210
dpnp.absolute
210211
dpnp.fabs

0 commit comments

Comments
 (0)