Skip to content

Commit 2418548

Browse files
author
Diptorup Deb
authored
Merge pull request #1338 from IntelPython/main
Merge 0.22.0dev2 into gold/2021
2 parents 1608e43 + eaf4dd6 commit 2418548

File tree

138 files changed

+4112
-3169
lines changed

Some content is hidden

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

138 files changed

+4112
-3169
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
*.yml @diptorupd
2-
conda-recipe/* @diptorupd
3-
numba_dpex/dpnp_iface @diptorupd @chudur-budur
4-
numba_dpex/core @diptorupd
5-
numba_dpex/core/passes/parfor_lowering_pass.py @diptorupd
1+
conda-recipe/* @oleksandr-pavlyk

.github/workflows/black.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ jobs:
2727
- uses: psf/black@stable
2828
with:
2929
args: ". --check"
30-
version: "23.1.0"
30+
version: "24.1.1"

.github/workflows/conda-package.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.WHEELS_NAME }}-*.whl
9090

9191
test:
92-
name: Test ['${{ matrix.os }}', python='${{ matrix.python }}']
92+
name: Test ['${{ matrix.os }}', '${{ matrix.scope }}', python='${{ matrix.python }}']
9393

9494
needs: build
9595

@@ -106,10 +106,10 @@ jobs:
106106
os: [ubuntu-20.04, ubuntu-latest, windows-latest]
107107
experimental: [false]
108108
use_mlir: [false]
109-
run_gdb: [true, false]
109+
scope: ['tests', 'examples', 'gdb']
110110
exclude:
111111
- os: windows-latest
112-
run_gdb: true
112+
scope: 'gdb'
113113

114114
continue-on-error: ${{ matrix.experimental || matrix.use_mlir }}
115115

@@ -214,25 +214,25 @@ jobs:
214214
run: python -c "import numba_dpex"
215215

216216
- name: Run tests
217-
if: ${{!matrix.run_gdb}}
217+
if: ${{ matrix.scope == 'tests' }}
218218
env:
219219
NUMBA_DPEX_USE_MLIR: ${{ matrix.use_mlir && '1' || '0' }}
220220
run: |
221221
pytest -q -ra --disable-warnings --pyargs ${{ env.MODULE_NAME }} -vv
222222
223223
- name: Run examples
224-
if: ${{!matrix.run_gdb}}
224+
if: ${{ matrix.scope == 'examples' }}
225225
shell: bash -l {0}
226226
run: |
227227
cd ${{ env.EXAMPLES_PATH }}
228-
for script in $(find . \( -not -name "_*" -not -name "side-by-side*" -not -name "vectorize.py" -not -name "scan.py" -and -name "*.py" \))
228+
for script in $(find . \( -not -name "_*" -not -name "side-by-side*" -not -name "scan.py" -and -name "*.py" \))
229229
do
230230
echo "Executing ${script}"
231231
python ${script} || exit 1
232232
done
233233
234234
- name: Run gdb tests
235-
if: ${{matrix.run_gdb}}
235+
if: ${{ matrix.scope == 'gdb' }}
236236
env:
237237
GDB_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/fcea1bcd-6a63-4849-b304-906ff71dc2c0/l_dpcpp_dbg_p_2023.2.0.49333_offline.sh
238238
GDB_INSTALLER: l_dpcpp_dbg_p_2023.2.0.49333_offline.sh
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# This workflow uses actions that are not certified by GitHub. They are provided
2+
# by a third-party and are governed by separate terms of service, privacy
3+
# policy, and support documentation.
4+
5+
name: Scorecard supply-chain security
6+
on:
7+
# For Branch-Protection check. Only the default branch is supported. See
8+
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
9+
branch_protection_rule:
10+
# To guarantee Maintained check is occasionally updated. See
11+
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
12+
schedule:
13+
- cron: '28 2 * * 1'
14+
- cron: '28 2 * * 4'
15+
push:
16+
branches: [ "main" ]
17+
18+
# Declare default permissions as read only.
19+
permissions: read-all
20+
21+
jobs:
22+
analysis:
23+
name: Scorecard analysis
24+
runs-on: ubuntu-latest
25+
permissions:
26+
# Needed to upload the results to code-scanning dashboard.
27+
security-events: write
28+
# Needed to publish results and get a badge (see publish_results below).
29+
id-token: write
30+
# Uncomment the permissions below if installing in a private repository.
31+
# contents: read
32+
# actions: read
33+
34+
steps:
35+
- name: "Checkout code"
36+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
37+
with:
38+
persist-credentials: false
39+
40+
- name: "Run analysis"
41+
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
42+
with:
43+
results_file: results.sarif
44+
results_format: sarif
45+
# (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
46+
# - you want to enable the Branch-Protection check on a *public* repository, or
47+
# - you are installing Scorecard on a *private* repository
48+
# To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
49+
# repo_token: ${{ secrets.SCORECARD_TOKEN }}
50+
51+
# Public repositories:
52+
# - Publish results to OpenSSF REST API for easy access by consumers
53+
# - Allows the repository to include the Scorecard badge.
54+
# - See https://github.com/ossf/scorecard-action#publishing-results.
55+
# For private repositories:
56+
# - `publish_results` will always be set to `false`, regardless
57+
# of the value entered here.
58+
publish_results: true
59+
60+
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
61+
# format to the repository Actions tab.
62+
- name: "Upload artifact"
63+
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
64+
with:
65+
name: SARIF file
66+
path: results.sarif
67+
retention-days: 14
68+
69+
# Upload the results to GitHub's code scanning dashboard.
70+
- name: "Upload to code-scanning"
71+
uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
72+
with:
73+
sarif_file: results.sarif

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repos:
1313
- id: end-of-file-fixer
1414
- id: trailing-whitespace
1515
- repo: https://github.com/psf/black
16-
rev: 23.1.0
16+
rev: 24.1.1
1717
hooks:
1818
- id: black
1919
exclude: "versioneer.py|numba_dpex/_version.py"
@@ -52,7 +52,7 @@ repos:
5252
- id: pylint
5353
name: pylint
5454
entry: pylint
55-
files: ^numba_dpex/experimental|^numba_dpex/core/utils/kernel_launcher.py
55+
files: ^numba_dpex/kernel_api|^numba_dpex/experimental|^numba_dpex/core/utils/kernel_launcher.py
5656
language: system
5757
types: [python]
5858
require_serial: true

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
44
[![Join the chat at https://matrix.to/#/#Data-Parallel-Python_community:gitter.im](https://badges.gitter.im/Join%20Chat.svg)](https://app.gitter.im/#/room/#Data-Parallel-Python_community:gitter.im)
55
[![Coverity Scan Build Status](https://scan.coverity.com/projects/29068/badge.svg)](https://scan.coverity.com/projects/intelpython-numba-dpex)
6+
[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/IntelPython/numba-dpex/badge)](https://securityscorecards.dev/viewer/?uri=github.com/IntelPython/numba-dpex)
67
<img align="left" src="https://spec.oneapi.io/oneapi-logo-white-scaled.jpg" alt="oneAPI logo" width="75"/>
78
<br/>
89
<br/>

conda-recipe/meta.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set required_compiler_version = "2023.2" %}
1+
{% set required_compiler_version = "2024.0" %}
22
{% set excluded_compiler_version1 = "2024.0.1" %}
33
{% set excluded_compiler_version2 = "2024.0.2" %}
44

@@ -28,18 +28,18 @@ requirements:
2828
- scikit-build >=0.15*
2929
- ninja # [not win]
3030
- cmake >=3.26*
31-
- numba >=0.57*
32-
- dpctl >=0.14*
33-
- dpnp >=0.11*
31+
- numba >=0.59*
32+
- dpctl >=0.16*
33+
- dpnp >=0.14*
3434
- dpcpp-llvm-spirv
3535
- wheel
3636
run:
3737
- {{ pin_compatible('dpcpp-cpp-rt', min_pin='x.x', max_pin='x') }}
3838
- python
39-
- numba >=0.57*
40-
- dpctl >=0.14*
39+
- numba >=0.59*
40+
- dpctl >=0.16*
4141
- dpcpp-llvm-spirv
42-
- dpnp >=0.11*
42+
- dpnp >=0.14*
4343
- packaging
4444

4545
test:

docs/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
apidoc
22
sources/_build
3+
source/autoapi

docs/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ SPHINXOPTS ?=
77
SPHINXBUILD ?= sphinx-build
88
SOURCEDIR = ./source
99
BUILDDIR = _build
10+
AUTOAPIDIR = source/autoapi
1011

1112
# Put it first so that "make" without argument is like "make help".
1213
help:
@@ -20,4 +21,4 @@ help:
2021
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
2122

2223
clean:
23-
rm -rf "$(BUILDDIR)"
24+
rm -rf "$(BUILDDIR)" "$(AUTOAPIDIR)"

docs/_static/css/custom.css

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
span.summarylabel {
2+
background-color: var(--color-foreground-secondary);
3+
color: var(--color-background-secondary);
4+
font-size: 70%;
5+
padding-left: 2px;
6+
padding-right: 2px;
7+
border-radius: 3px;
8+
vertical-align: 15%;
9+
padding-bottom: 2px;
10+
filter: opacity(40%);
11+
}
12+
13+
table.summarytable {
14+
width: 100%;
15+
}

0 commit comments

Comments
 (0)