Skip to content

Commit

Permalink
Merge branch 'master' into pin_dpcpp_2023_2
Browse files Browse the repository at this point in the history
  • Loading branch information
antonwolfy authored Feb 1, 2024
2 parents dde40fc + 66677aa commit 5de4181
Show file tree
Hide file tree
Showing 223 changed files with 13,831 additions and 7,327 deletions.
64 changes: 34 additions & 30 deletions .github/workflows/conda-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ on:
- master
pull_request:

permissions: read-all

env:
PACKAGE_NAME: dpctl
MODULE_NAME: dpctl
Expand All @@ -20,15 +22,15 @@ jobs:
matrix:
python: ['3.9', '3.10', '3.11']
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set pkgs_dirs
run: |
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
- name: Cache conda packages
uses: actions/cache@v3
uses: actions/cache@v4
env:
CACHE_NUMBER: 3 # Increase to reset cache
with:
Expand Down Expand Up @@ -58,12 +60,12 @@ jobs:
$CHANNELS \
conda-recipe
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.tar.bz2
- name: Upload wheels artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.PACKAGE_NAME }}-*.whl
Expand All @@ -77,18 +79,18 @@ jobs:
env:
conda-bld: C:\Miniconda\conda-bld\win-64\
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
auto-activate-base: true
conda-build-version: "*"
activate-environment: true
python-version: ${{ matrix.python }}

- name: Cache conda packages
uses: actions/cache@v3
uses: actions/cache@v4
env:
CACHE_NUMBER: 3 # Increase to reset cache
with:
Expand All @@ -107,12 +109,12 @@ jobs:
OVERRIDE_INTEL_IPO: 1 # IPO requires more resources that GH actions VM provides
run: conda build --no-test --python ${{ matrix.python }} -c intel -c conda-forge --override-channels conda-recipe
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
path: ${{ env.conda-bld }}${{ env.PACKAGE_NAME }}-*.tar.bz2
- name: Upload wheels artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.PACKAGE_NAME }}-*.whl
Expand All @@ -132,7 +134,7 @@ jobs:

steps:
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
- name: Add conda to system path
Expand All @@ -159,7 +161,7 @@ jobs:
run: |
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
- name: Cache conda packages
uses: actions/cache@v3
uses: actions/cache@v4
env:
CACHE_NUMBER: 3 # Increase to reset cache
with:
Expand Down Expand Up @@ -217,10 +219,10 @@ jobs:

steps:
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
conda-build-version: '*'
Expand Down Expand Up @@ -260,7 +262,7 @@ jobs:
shell: pwsh
run: Get-Content -Path .\lockfile
- name: Cache conda packages
uses: actions/cache@v3
uses: actions/cache@v4
env:
CACHE_NUMBER: 3 # Increase to reset cache
with:
Expand Down Expand Up @@ -324,12 +326,12 @@ jobs:
python: ['3.9', '3.10', '3.11']
steps:
- name: Download conda artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}

- name: Download wheel artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}

Expand Down Expand Up @@ -360,16 +362,16 @@ jobs:
python: ['3.9', '3.10', '3.11']
steps:
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}

- name: Download wheel artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}

- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
auto-activate-base: true
activate-environment: ""
Expand Down Expand Up @@ -409,11 +411,11 @@ jobs:
# Needed to be able to run conda index
run: conda install conda-build python=${{ matrix.python }}
- name: Checkout dpctl repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
- name: Add conda to system path
Expand All @@ -435,7 +437,7 @@ jobs:
run: |
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
- name: Cache conda packages
uses: actions/cache@v3
uses: actions/cache@v4
env:
CACHE_NUMBER: 3 # Increase to reset cache
with:
Expand Down Expand Up @@ -539,6 +541,8 @@ jobs:
array-api-conformity:
needs: build_linux
runs-on: ${{ matrix.runner }}
permissions:
pull-requests: write

strategy:
matrix:
Expand All @@ -550,12 +554,12 @@ jobs:
CHANNELS: -c intel -c conda-forge --override-channels
steps:
- name: Checkout dpctl repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Cache array API tests
id: cache-array-api-tests
uses: actions/cache@v3
uses: actions/cache@v4
env:
ARRAY_CACHE: 3
with:
Expand All @@ -574,7 +578,7 @@ jobs:
git clone --recurse-submodules https://github.com/data-apis/array-api-tests array-api-tests
cd array-api-tests
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
- name: Add conda to system path
Expand All @@ -601,7 +605,7 @@ jobs:
run: |
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
- name: Cache conda packages
uses: actions/cache@v3
uses: actions/cache@v4
env:
CACHE_NUMBER: 3 # Increase to reset cache
with:
Expand Down Expand Up @@ -642,7 +646,7 @@ jobs:
python -c "import dpctl; dpctl.lsplatform()"
export ARRAY_API_TESTS_MODULE=dpctl.tensor
cd /home/runner/work/array-api-tests
pytest --json-report --json-report-file=$FILE --skips-file ${GITHUB_WORKSPACE}/.github/workflows/array-api-skips.txt array_api_tests/ || true
pytest --json-report --json-report-file=$FILE --disable-deadline --skips-file ${GITHUB_WORKSPACE}/.github/workflows/array-api-skips.txt array_api_tests/ || true
- name: Set Github environment variables
shell: bash -l {0}
run: |
Expand All @@ -668,7 +672,7 @@ jobs:
run: echo "::notice ${{ env.MESSAGE }}"
- name: Post result to PR
if: ${{ github.event.pull_request && !github.event.pull_request.head.repo.fork }}
uses: mshick/add-pr-comment@v1
uses: mshick/add-pr-comment@v2
with:
message: |
${{ env.MESSAGE }}
Expand All @@ -684,7 +688,7 @@ jobs:
run:
shell: bash -el {0}
steps:
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
run-post: false
channel-priority: "disabled"
Expand All @@ -695,7 +699,7 @@ jobs:
run: conda install anaconda-client

- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: IntelPython/devops-tools
fetch-depth: 0
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/cpp_style_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,21 @@ on:
push:
branches: [master]

permissions: read-all

jobs:
formatting-check:
name: clang-format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run clang-format style check for C/C++ programs.
uses: jidicula/clang-format-action@v3.5.1
uses: jidicula/clang-format-action@v4.11.0
with:
clang-format-version: '11'
check-path: 'libsyclinterface'
- name: Run clang-format style check for api headers.
uses: jidicula/clang-format-action@v3.5.1
uses: jidicula/clang-format-action@v4.11.0
with:
clang-format-version: '11'
check-path: 'dpctl/apis'
14 changes: 9 additions & 5 deletions .github/workflows/generate-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@ on:
push:
branches: [master]

permissions: read-all

jobs:
generate-coverage:
name: Generate coverage and push to Coveralls.io
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
permissions:
pull-requests: write

env:
ONEAPI_ROOT: /opt/intel/oneapi
Expand All @@ -17,7 +21,7 @@ jobs:

steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@0.12.1
with:
access_token: ${{ github.token }}

Expand Down Expand Up @@ -46,14 +50,14 @@ jobs:
sudo apt-get install ninja-build
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'
architecture: x64

- name: Cache Gtest
id: cache-gtest
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
/home/runner/work/googletest-1.13.0/install
Expand All @@ -77,7 +81,7 @@ jobs:
make && make install
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
Loading

0 comments on commit 5de4181

Please sign in to comment.