Skip to content

Commit

Permalink
Merge pull request #1706 from IntelPython/merge_to_gold
Browse files Browse the repository at this point in the history
Merge `0.13.1dev4` from master to gold
  • Loading branch information
antonwolfy authored Feb 10, 2024
2 parents 8e0a535 + 6127741 commit 1bf9ea7
Show file tree
Hide file tree
Showing 94 changed files with 9,068 additions and 2,521 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
38 changes: 27 additions & 11 deletions .github/workflows/build-sphinx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ on:
pull_request:
types: [opened, synchronize, reopened, closed]

permissions: read-all

env:
GH_BOT_NAME: 'github-actions[bot]'
GH_BOT_EMAIL: 'github-actions[bot]@users.noreply.github.com'
Expand All @@ -25,13 +27,21 @@ jobs:

runs-on: ubuntu-20.04

permissions:
# Needed to cancel any previous runs that are not completed for a given workflow
actions: write
# Needed to deploy static files to GitHub Pages
contents: write
# Needed to add a comment to a pull request's issue
pull-requests: write

env:
python-ver: '3.9'
CHANNELS: '-c dppy/label/dev -c intel -c conda-forge --override-channels'

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

Expand All @@ -42,7 +52,7 @@ jobs:
echo "$GITHUB_CONTEXT"
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@v1.3.1
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
with:
docker-images: false

Expand Down Expand Up @@ -76,13 +86,13 @@ jobs:
sudo apt-get install -y nvidia-cuda-toolkit clinfo
- name: Checkout repo
uses: actions/checkout@v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
fetch-depth: 0

# https://github.com/marketplace/actions/setup-miniconda
- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v3.0.1
uses: conda-incubator/setup-miniconda@11b562958363ec5770fef326fe8ef0366f8cbf8a # v3.0.1
with:
auto-update-conda: true
python-version: ${{ env.python-ver }}
Expand All @@ -93,7 +103,7 @@ jobs:
- name: Install sphinx dependencies
run: |
conda install sphinx sphinx_rtd_theme
pip install sphinxcontrib-googleanalytics
pip install sphinxcontrib-googleanalytics==0.4
- name: Install dpnp dependencies
run: |
Expand Down Expand Up @@ -125,7 +135,7 @@ jobs:
# https://github.com/marketplace/actions/doxygen-action
- name: Build backend docs
uses: mattnotmitt/doxygen-action@v1.9.5
uses: mattnotmitt/doxygen-action@cbe72c8e402e8a3faa1f0b247ef90aa6c8e4ce74 # v1.9.8
with:
working-directory: 'dpnp/backend/doc'

Expand All @@ -136,7 +146,7 @@ jobs:
# The step is only used to build docs while pushing a PR to "master"
- name: Deploy docs
if: env.GH_EVENT_PUSH_UPSTREAM
uses: peaceiris/actions-gh-pages@v3.9.3
uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ${{ env.PUBLISH_DIR }}
Expand All @@ -149,7 +159,7 @@ jobs:
# The step is only used to build docs while pushing to PR branch
- name: Publish pull-request docs
if: env.GH_EVENT_OPEN_PR_UPSTREAM
uses: peaceiris/actions-gh-pages@v3.9.3
uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ${{ env.PUBLISH_DIR }}
Expand All @@ -166,7 +176,7 @@ jobs:
if: env.GH_EVENT_OPEN_PR_UPSTREAM
env:
PR_NUM: ${{ github.event.number }}
uses: mshick/add-pr-comment@v2.8.1
uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2.8.2
with:
message: |
View rendered docs @ https://intelpython.github.io/dpnp/pull/${{ env.PR_NUM }}/index.html
Expand All @@ -180,10 +190,16 @@ jobs:
needs: build-and-deploy

permissions:
# Needed to remove docs for closed pull request from the repo
contents: write
# Needed to modify a comment in the pull request's issue
pull-requests: write

runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
fetch-depth: 0

Expand All @@ -202,7 +218,7 @@ jobs:
git push tokened_docs gh-pages
- name: Modify the comment with URL to official documentation
uses: mshick/add-pr-comment@v2.8.1
uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2.8.2
with:
find: |
View rendered docs @.+
Expand Down
42 changes: 24 additions & 18 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: dpnp
MODULE_NAME: dpnp
Expand Down Expand Up @@ -58,6 +60,10 @@ jobs:
python: ['3.9', '3.10', '3.11']
os: [ubuntu-20.04, windows-latest]

permissions:
# Needed to cancel any previous runs that are not completed for a given workflow
actions: write

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

defaults:
Expand All @@ -68,17 +74,17 @@ jobs:

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

- name: Checkout DPNP repo
uses: actions/checkout@v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
fetch-depth: 0

- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v3.0.1
uses: conda-incubator/setup-miniconda@11b562958363ec5770fef326fe8ef0366f8cbf8a # v3.0.1
with:
auto-update-conda: true
python-version: ${{ matrix.python }}
Expand All @@ -96,10 +102,10 @@ jobs:
(echo CONDA_BLD=%CONDA_PREFIX%\conda-bld\win-64\) >> %GITHUB_ENV%
- name: Install conda-build
run: conda install conda-build
run: conda install conda-build=3.28.4

- name: Cache conda packages
uses: actions/cache@v4
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
env:
CACHE_NUMBER: 1 # Increase to reset cache
with:
Expand All @@ -114,7 +120,7 @@ jobs:
run: conda build --no-test --python ${{ matrix.python }} ${{ env.CHANNELS }} conda-recipe

- name: Upload artifact
uses: actions/upload-artifact@v4.3.0
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.tar.bz2
Expand Down Expand Up @@ -147,7 +153,7 @@ jobs:

steps:
- name: Download artifact
uses: actions/download-artifact@v4.1.1
uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
path: ${{ env.pkg-path-in-channel }}
Expand All @@ -158,7 +164,7 @@ jobs:
tar -xvf ${{ env.pkg-path-in-channel }}/${{ env.PACKAGE_NAME }}-*.tar.bz2 -C ${{ env.extracted-pkg-path }}
- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v3.0.1
uses: conda-incubator/setup-miniconda@11b562958363ec5770fef326fe8ef0366f8cbf8a # v3.0.1
with:
auto-update-conda: true
python-version: ${{ matrix.python }}
Expand All @@ -167,7 +173,7 @@ jobs:

# Needed to be able to run conda index
- name: Install conda-build
run: conda install conda-build
run: conda install conda-build=3.28.4

- name: Create conda channel
run: conda index ${{ env.channel-path }}
Expand All @@ -190,7 +196,7 @@ jobs:
TEST_CHANNELS: '-c ${{ env.channel-path }} ${{ env.CHANNELS }}'

- name: Cache conda packages
uses: actions/cache@v4
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
env:
CACHE_NUMBER: 1 # Increase to reset cache
with:
Expand Down Expand Up @@ -248,7 +254,7 @@ jobs:

steps:
- name: Download artifact
uses: actions/download-artifact@v4.1.1
uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
path: ${{ env.pkg-path-in-channel }}
Expand All @@ -268,7 +274,7 @@ jobs:
dir ${{ env.extracted-pkg-path }}
- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v3.0.1
uses: conda-incubator/setup-miniconda@11b562958363ec5770fef326fe8ef0366f8cbf8a # v3.0.1
with:
auto-update-conda: true
python-version: ${{ matrix.python }}
Expand All @@ -283,7 +289,7 @@ jobs:
# Needed to be able to run conda index
- name: Install conda-build
run: conda install conda-build
run: conda install conda-build=3.28.4

- name: Create conda channel
run: conda index ${{ env.channel-path }}
Expand Down Expand Up @@ -314,7 +320,7 @@ jobs:
run: more lockfile

- name: Cache conda packages
uses: actions/cache@v4
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
env:
CACHE_NUMBER: 1 # Increase to reset cache
with:
Expand Down Expand Up @@ -382,12 +388,12 @@ jobs:
steps:
- name: Download artifact
uses: actions/download-artifact@v4.1.1
uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}

- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v3.0.1
uses: conda-incubator/setup-miniconda@11b562958363ec5770fef326fe8ef0366f8cbf8a # v3.0.1
with:
auto-update-conda: true
python-version: ${{ matrix.python }}
Expand All @@ -410,7 +416,7 @@ jobs:
run:
shell: bash -el {0}
steps:
- uses: conda-incubator/setup-miniconda@v3.0.1
- uses: conda-incubator/setup-miniconda@11b562958363ec5770fef326fe8ef0366f8cbf8a # v3.0.1
with:
run-post: false
channel-priority: "disabled"
Expand All @@ -421,7 +427,7 @@ jobs:
run: conda install anaconda-client

- name: Checkout repo
uses: actions/checkout@v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
repository: IntelPython/devops-tools
fetch-depth: 0
Expand Down
20 changes: 13 additions & 7 deletions .github/workflows/generate_coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,17 @@ on:
push:
branches: [master]

permissions: read-all

jobs:
generate-coverage:
name: Generate coverage and push to Coveralls.io
runs-on: ubuntu-20.04

permissions:
# Needed to cancel any previous runs that are not completed for a given workflow
actions: write

defaults:
run:
shell: bash -l {0}
Expand All @@ -19,17 +25,17 @@ jobs:

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

- name: Checkout repo
uses: actions/checkout@v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
fetch-depth: 0

- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v3.0.1
uses: conda-incubator/setup-miniconda@11b562958363ec5770fef326fe8ef0366f8cbf8a # v3.0.1
with:
auto-update-conda: true
python-version: ${{ env.python-ver }}
Expand All @@ -54,7 +60,7 @@ jobs:
- name: Build dpnp with coverage
id: build_coverage
uses: nick-fields/retry@v2.9.0
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
with:
shell: bash
timeout_minutes: 60
Expand All @@ -73,7 +79,7 @@ jobs:
- name: Install coverall dependencies
run: |
sudo gem install coveralls-lcov
pip install coveralls==3.2.0
pip install coveralls==3.3.1
- name: Upload coverage data to coveralls.io
run: |
Expand All @@ -96,7 +102,7 @@ jobs:
steps:
- name: Finished
run: |
pip3 install --upgrade coveralls
coveralls --finish
pip3 install --upgrade coveralls==3.3.1
coveralls --service=github --finish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Loading

0 comments on commit 1bf9ea7

Please sign in to comment.