Skip to content

Commit daa6640

Browse files
authored
Merge branch 'master' into build_target_cuda
2 parents a637585 + d2c623b commit daa6640

File tree

174 files changed

+5073
-4373
lines changed

Some content is hidden

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

174 files changed

+5073
-4373
lines changed

.github/workflows/build-sphinx.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
build-and-deploy:
2626
name: Build and Deploy Docs
2727

28-
runs-on: ubuntu-20.04
28+
runs-on: ubuntu-latest
2929

3030
permissions:
3131
# Needed to cancel any previous runs that are not completed for a given workflow
@@ -235,7 +235,7 @@ jobs:
235235
# Needed to modify a comment in the pull request's issue
236236
pull-requests: write
237237

238-
runs-on: ubuntu-20.04
238+
runs-on: ubuntu-latest
239239

240240
steps:
241241
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

.github/workflows/conda-package.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ env:
1414
# Follow oneAPI installation instruction for conda, since intel channel is not longer available
1515
# CHANNELS: '-c dppy/label/dev -c intel -c conda-forge --override-channels'
1616
CHANNELS: '-c dppy/label/dev -c https://software.repos.intel.com/python/conda/ -c conda-forge --override-channels'
17-
CONDA_BUILD_VERSION: '24.5.1'
17+
CONDA_BUILD_VERSION: '24.7.1'
1818
CONDA_INDEX_VERSION: '0.5.0'
19+
RERUN_TESTS_ON_FAILURE: 'true'
1920
RUN_TESTS_MAX_ATTEMPTS: 2
2021
TEST_ENV_NAME: 'test'
2122
TEST_SCOPE: >-
@@ -72,7 +73,7 @@ jobs:
7273
strategy:
7374
matrix:
7475
python: ['3.9', '3.10', '3.11']
75-
os: [ubuntu-20.04, windows-2019]
76+
os: [ubuntu-22.04, windows-2019]
7677

7778
permissions:
7879
# Needed to cancel any previous runs that are not completed for a given workflow
@@ -168,7 +169,7 @@ jobs:
168169
strategy:
169170
matrix:
170171
python: ['3.9', '3.10', '3.11']
171-
os: [ubuntu-20.04, ubuntu-latest]
172+
os: [ubuntu-22.04, ubuntu-latest]
172173

173174
continue-on-error: true
174175

@@ -255,14 +256,14 @@ jobs:
255256
python -c "import dpnp, dpctl; dpctl.lsplatform()"
256257
python -c "import dpnp; print(dpnp.__version__)"
257258
258-
# TODO: run the whole scope once the issues on CPU are resolved
259-
# - name: Run tests
260-
# run: |
261-
# python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
262-
# working-directory: ${{ env.tests-path }}
259+
- name: Run tests
260+
if: env.RERUN_TESTS_ON_FAILURE != 'true'
261+
run: |
262+
python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
263+
working-directory: ${{ env.tests-path }}
263264

264-
# TODO: remove once 2024.2 release is published
265265
- name: Run tests
266+
if: env.RERUN_TESTS_ON_FAILURE == 'true'
266267
id: run_tests_linux
267268
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
268269
with:
@@ -411,14 +412,14 @@ jobs:
411412
python -c "import dpnp, dpctl; dpctl.lsplatform()"
412413
python -c "import dpnp; print(dpnp.__version__)"
413414
414-
# TODO: run the whole scope once the issues on CPU are resolved
415-
# - name: Run tests
416-
# run: |
417-
# python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
418-
# working-directory: ${{ env.tests-path }}
415+
- name: Run tests
416+
if: env.RERUN_TESTS_ON_FAILURE != 'true'
417+
run: |
418+
python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
419+
working-directory: ${{ env.tests-path }}
419420

420-
# TODO: remove once 2024.2 release is published
421421
- name: Run tests
422+
if: env.RERUN_TESTS_ON_FAILURE == 'true'
422423
id: run_tests_win
423424
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
424425
with:
@@ -439,7 +440,7 @@ jobs:
439440
strategy:
440441
matrix:
441442
python: ['3.9', '3.10', '3.11']
442-
os: [ubuntu-20.04, windows-2019]
443+
os: [ubuntu-22.04, windows-2019]
443444

444445
runs-on: ${{ matrix.os }}
445446

.github/workflows/generate_coverage.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions: read-all
99
jobs:
1010
generate-coverage:
1111
name: Generate coverage and push to Coveralls.io
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-latest
1313

1414
permissions:
1515
# Needed to cancel any previous runs that are not completed for a given workflow
@@ -119,7 +119,7 @@ jobs:
119119
- name: Install coverall dependencies
120120
run: |
121121
sudo gem install coveralls-lcov
122-
pip install coveralls==3.3.1
122+
pip install coveralls==4.0.1
123123
124124
- name: Upload coverage data to coveralls.io
125125
run: |

.github/workflows/openssf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
persist-credentials: false
3939

4040
- name: "Run analysis"
41-
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
41+
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
4242
with:
4343
results_file: results.sarif
4444
results_format: sarif
@@ -68,6 +68,6 @@ jobs:
6868

6969
# Upload the results to GitHub's code scanning dashboard.
7070
- name: "Upload to code-scanning"
71-
uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
71+
uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
3030

3131
- name: Set up python
32-
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
32+
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
3333
with:
3434
python-version: '3.11'
3535

.pre-commit-config.yaml

Lines changed: 7 additions & 7 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.8'
5+
rev: '1.7.9'
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.5.0
11+
rev: v4.6.0
1212
hooks:
1313
- id: check-ast
1414
- id: check-builtin-literals
@@ -43,13 +43,13 @@ repos:
4343
- id: rst-inline-touching-normal
4444
- id: text-unicode-replacement-char
4545
- repo: https://github.com/codespell-project/codespell
46-
rev: v2.2.6
46+
rev: v2.3.0
4747
hooks:
4848
- id: codespell
4949
additional_dependencies:
5050
- tomli
5151
- repo: https://github.com/psf/black
52-
rev: 24.4.0
52+
rev: 24.4.2
5353
hooks:
5454
- id: black
5555
args: ["--check", "--diff", "--color"]
@@ -65,20 +65,20 @@ repos:
6565
name: isort (pyi)
6666
types: [pyi]
6767
- repo: https://github.com/pycqa/flake8
68-
rev: 7.0.0
68+
rev: 7.1.0
6969
hooks:
7070
- id: flake8
7171
args: ["--config=.flake8"]
7272
additional_dependencies:
7373
- flake8-docstrings==1.7.0
74-
- flake8-bugbear==24.1.17
74+
- flake8-bugbear==24.4.26
7575
- repo: https://github.com/pocc/pre-commit-hooks
7676
rev: v1.3.5
7777
hooks:
7878
- id: clang-format
7979
args: ["-i"]
8080
- repo: https://github.com/gitleaks/gitleaks
81-
rev: v8.18.2
81+
rev: v8.18.4
8282
hooks:
8383
- id: gitleaks
8484
- repo: https://github.com/jumanjihouse/pre-commit-hooks

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ include(GNUInstallDirs)
5353
include(FetchContent)
5454
FetchContent_Declare(
5555
pybind11
56-
URL https://github.com/pybind/pybind11/archive/refs/tags/v2.12.0.tar.gz
57-
URL_HASH SHA256=bf8f242abd1abcd375d516a7067490fb71abd79519a282d22b6e4d19282185a7
56+
URL https://github.com/pybind/pybind11/archive/refs/tags/v2.13.1.tar.gz
57+
URL_HASH SHA256=51631e88960a8856f9c497027f55c9f2f9115cafb08c0005439838a05ba17bfc
5858
)
5959
FetchContent_MakeAvailable(pybind11)
6060

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ In the interest of fostering an open and welcoming environment, we as
66
contributors and maintainers pledge to making participation in our project and
77
our community a harassment-free experience for everyone, regardless of age, body
88
size, disability, ethnicity, sex characteristics, gender identity and expression,
9-
level of experience, education, socio-economic status, nationality, personal
9+
level of experience, education, socioeconomic status, nationality, personal
1010
appearance, race, religion, or sexual identity and orientation.
1111

1212
## Our Standards

conda-recipe/meta.yaml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
{% set required_compiler_and_mkl_version = "2024.0" %}
2-
{% set excluded_compiler_version1 = "2024.0.1" %}
3-
{% set excluded_compiler_version2 = "2024.0.2" %}
4-
{% set excluded_compiler_version3 = "2024.0.3" %}
5-
{% set required_dpctl_version = "0.17.0" %}
1+
{% set required_compiler_and_mkl_version = "2024.2" %}
2+
{% set required_dpctl_version = "0.18.0*" %}
63

74
package:
85
name: dpnp
@@ -27,14 +24,18 @@ requirements:
2724
- scikit-build
2825
build:
2926
- {{ compiler('cxx') }}
30-
- {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }},!={{ excluded_compiler_version1 }},!={{ excluded_compiler_version2 }},!={{ excluded_compiler_version3 }} # [win]
31-
- {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }},!={{ excluded_compiler_version1 }},!={{ excluded_compiler_version2 }} # [linux]
27+
- {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }}
3228
- sysroot_linux-64 >=2.28 # [linux]
3329
run:
3430
- python
3531
- {{ pin_compatible('dpctl', min_pin='x.x.x', max_pin=None) }}
3632
- {{ pin_compatible('dpcpp-cpp-rt', min_pin='x.x', max_pin='x') }}
37-
- {{ pin_compatible('mkl-dpcpp', min_pin='x.x', max_pin='x') }}
33+
- {{ pin_compatible('onemkl-sycl-blas', min_pin='x.x', max_pin='x') }}
34+
- {{ pin_compatible('onemkl-sycl-dft', min_pin='x.x', max_pin='x') }}
35+
- {{ pin_compatible('onemkl-sycl-lapack', min_pin='x.x', max_pin='x') }}
36+
- {{ pin_compatible('onemkl-sycl-rng', min_pin='x.x', max_pin='x') }}
37+
- {{ pin_compatible('onemkl-sycl-stats', min_pin='x.x', max_pin='x') }}
38+
- {{ pin_compatible('onemkl-sycl-vm', min_pin='x.x', max_pin='x') }}
3839
- {{ pin_compatible('numpy', min_pin='x.x', max_pin='x') }}
3940

4041
build:

doc/quick_start_guide.rst

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,14 @@ in the next installation section.
3737
Installation
3838
============
3939

40-
Install Package from Anaconda
41-
-----------------------------
40+
Install Package from Intel(R) channel
41+
-------------------------------------------
4242

43-
It is recommended to use conda packages from the ``anaconda.org/intel``
44-
channel. You will need one of the commands below:
43+
You will need one of the commands below:
4544

46-
* Conda: ``conda install dpnp -c intel -c conda-forge``
45+
* Conda: ``conda install dpnp -c https://software.repos.intel.com/python/conda/ -c conda-forge``
4746

48-
* Pip: ``pip install -i https://pypi.anaconda.org/intel/simple dpnp``
47+
* Pip: ``python -m pip install --index-url https://pypi.anaconda.org/intel/simple dpnp``
4948

5049
These commands install dpnp package along with its dependencies, including
5150
``dpctl`` package with `Data Parallel Control Library`_ and all required
@@ -69,7 +68,7 @@ And to build dpnp package from the sources:
6968

7069
.. code-block:: bash
7170
72-
conda build conda-recipe -c intel -c conda-forge
71+
conda build conda-recipe -c https://software.repos.intel.com/python/conda/ -c conda-forge
7372
7473
Finally, to install the result package:
7574

@@ -89,14 +88,14 @@ On Linux:
8988

9089
.. code-block:: bash
9190
92-
conda create -n build-env dpctl cython dpcpp_linux-64 mkl-devel-dpcpp tbb-devel onedpl-devel cmake scikit-build ninja pytest -c intel -c conda-forge
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
9392
conda activate build-env
9493
9594
On Windows:
9695

9796
.. code-block:: bash
9897
99-
conda create -n build-env dpctl cython dpcpp_win-64 mkl-devel-dpcpp tbb-devel onedpl-devel cmake scikit-build ninja pytest -c intel -c conda-forge
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
10099
conda activate build-env
101100
102101
To build and install the package on Linux OS, run:

doc/reference/manipulation.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ Adding and removing elements
131131
dpnp.resize
132132
dpnp.unique
133133
dpnp.trim_zeros
134+
dpnp.pad
134135

135136

136137
Rearranging elements

0 commit comments

Comments
 (0)