From a5e13e90344ad85bee9d845669eb1e14644fc654 Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Thu, 12 Sep 2024 08:53:13 -0500 Subject: [PATCH 01/16] Changes to fix Windows build step in conda-package workflow Install conda build as a separate step This way conda build is installed in base environment of the miniforge, rather than underlying miniconda3 Correct CONDA_BLD value for build_windows set of conda-packages --- .github/workflows/conda-package.yml | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index b9a5a11ec9..66f79eeb52 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -78,19 +78,24 @@ jobs: strategy: matrix: python: ['3.9', '3.10', '3.11', '3.12'] - env: - conda-bld: C:\Miniconda\conda-bld\win-64\ steps: - uses: actions/checkout@v4.1.7 with: fetch-depth: 0 + - uses: conda-incubator/setup-miniconda@v3 with: - auto-activate-base: true - conda-build-version: "*" - activate-environment: true + miniforge-version: latest + activate-environment: test + channels: conda-forge python-version: ${{ matrix.python }} + - name: Install conda build + run: | + conda activate + conda install -y conda-build + conda list -n base + - name: Cache conda packages uses: actions/cache@v4 env: @@ -102,19 +107,26 @@ jobs: restore-keys: | ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}- ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}- + - name: Store conda paths as envs shell: bash -l {0} run: | + echo "CONDA_BLD=$CONDA/conda-bld/win-64/" | tr "\\\\" '/' >> $GITHUB_ENV echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE${{ runner.os == 'Linux' && '/' || '\\' }}" >> $GITHUB_ENV + - name: Build conda package env: OVERRIDE_INTEL_IPO: 1 # IPO requires more resources that GH actions VM provides - run: conda build --no-test --python ${{ matrix.python }} --numpy 2.0 -c conda-forge --override-channels conda-recipe + run: | + conda activate + conda build --no-test --python ${{ matrix.python }} --numpy 2 -c conda-forge --override-channels conda-recipe + - name: Upload artifact uses: actions/upload-artifact@v4.4.0 with: name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }} - path: ${{ env.conda-bld }}${{ env.PACKAGE_NAME }}-*.tar.bz2 + path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.tar.bz2 + - name: Upload wheels artifact uses: actions/upload-artifact@v4.4.0 with: From da4e52202a97679d87d9bf0bfba6e016e1293796 Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Fri, 13 Sep 2024 05:47:34 -0500 Subject: [PATCH 02/16] Use mambaforge variant --- .github/workflows/conda-package.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 66f79eeb52..e05d3ccc13 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -85,8 +85,9 @@ jobs: - uses: conda-incubator/setup-miniconda@v3 with: + miniforge-variant: Mambaforge miniforge-version: latest - activate-environment: test + activate-environment: build channels: conda-forge python-version: ${{ matrix.python }} From 002dfaea8b301a62019e8e472cef607aeebe307f Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Mon, 16 Sep 2024 13:04:46 -0500 Subject: [PATCH 03/16] Add job explicit, conservative job timeouts --- .github/workflows/conda-package.yml | 9 +++++++++ .github/workflows/cpp_style_checks.yml | 1 + .github/workflows/generate-coverage.yaml | 2 ++ .github/workflows/generate-docs.yml | 1 + .github/workflows/openssf-scorecard.yml | 1 + .github/workflows/os-llvm-sycl-build.yml | 1 + .github/workflows/pre-commit.yml | 1 + .github/workflows/python_style_checks.yml | 3 +++ 8 files changed, 19 insertions(+) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index e05d3ccc13..50ba7adaf2 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -19,6 +19,7 @@ env: jobs: build_linux: runs-on: ubuntu-22.04 + timeout-minutes: 90 strategy: matrix: @@ -74,6 +75,7 @@ jobs: build_windows: runs-on: windows-2019 + timeout-minutes: 150 strategy: matrix: @@ -137,6 +139,7 @@ jobs: test_linux: needs: build_linux runs-on: ${{ matrix.runner }} + timeout-minutes: 30 strategy: matrix: @@ -228,6 +231,7 @@ jobs: test_windows: needs: build_windows runs-on: ${{ matrix.runner }} + timeout-minutes: 60 defaults: run: shell: cmd /C CALL {0} @@ -361,6 +365,7 @@ jobs: needs: test_linux if: ${{github.ref == 'refs/heads/master' || (startsWith(github.ref, 'refs/heads/release') == true) || github.event_name == 'push' && contains(github.ref, 'refs/tags/')}} runs-on: ubuntu-22.04 + timeout-minutes: 20 strategy: matrix: python: ['3.9', '3.10', '3.11', '3.12'] @@ -397,6 +402,7 @@ jobs: needs: test_windows if: ${{github.ref == 'refs/heads/master' || (startsWith(github.ref, 'refs/heads/release') == true) || github.event_name == 'push' && contains(github.ref, 'refs/tags/')}} runs-on: windows-2019 + timeout-minutes: 20 strategy: matrix: python: ['3.9', '3.10', '3.11', '3.12'] @@ -443,6 +449,7 @@ jobs: experimental: [false] runner: [ubuntu-22.04] continue-on-error: ${{ matrix.experimental }} + timeout-minutes: 60 env: EXAMPLES_ENV_NAME: examples BUILD_ENV_NAME: build_env @@ -590,6 +597,7 @@ jobs: array-api-conformity: needs: build_linux runs-on: ${{ matrix.runner }} + timeout-minutes: 90 permissions: pull-requests: write @@ -735,6 +743,7 @@ jobs: name: Clean up anaconda packages needs: [upload_linux, upload_windows] runs-on: 'ubuntu-latest' + timeout-minutes: 30 defaults: run: shell: bash -el {0} diff --git a/.github/workflows/cpp_style_checks.yml b/.github/workflows/cpp_style_checks.yml index 3b0df1789a..103d636f0c 100644 --- a/.github/workflows/cpp_style_checks.yml +++ b/.github/workflows/cpp_style_checks.yml @@ -15,6 +15,7 @@ jobs: formatting-check: name: clang-format runs-on: ubuntu-latest + timeout-minutes: 30 steps: - uses: actions/checkout@v4.1.7 - name: Run clang-format style check for C/C++ programs. diff --git a/.github/workflows/generate-coverage.yaml b/.github/workflows/generate-coverage.yaml index 6e2de07baa..7c12702c65 100644 --- a/.github/workflows/generate-coverage.yaml +++ b/.github/workflows/generate-coverage.yaml @@ -10,6 +10,7 @@ jobs: generate-coverage: name: Generate coverage and push to Coveralls.io runs-on: ubuntu-latest + timeout-minutes: 150 permissions: pull-requests: write @@ -145,6 +146,7 @@ jobs: name: Indicate completion to coveralls.io needs: generate-coverage runs-on: ubuntu-latest + timeout-minutes: 20 container: python:3-slim steps: - name: Finished diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml index f13505fd34..7b0c2127c6 100644 --- a/.github/workflows/generate-docs.yml +++ b/.github/workflows/generate-docs.yml @@ -12,6 +12,7 @@ jobs: build-and-deploy: name: Build and Deploy Documentation runs-on: ubuntu-latest + timeout-minutes: 240 permissions: contents: write pull-requests: write diff --git a/.github/workflows/openssf-scorecard.yml b/.github/workflows/openssf-scorecard.yml index b15438c6a2..f8ab476021 100644 --- a/.github/workflows/openssf-scorecard.yml +++ b/.github/workflows/openssf-scorecard.yml @@ -22,6 +22,7 @@ jobs: analysis: name: Scorecard analysis runs-on: ubuntu-latest + timeout-minutes: 30 permissions: # Needed to upload the results to code-scanning dashboard. security-events: write diff --git a/.github/workflows/os-llvm-sycl-build.yml b/.github/workflows/os-llvm-sycl-build.yml index 02c8c7249a..e3b3b88e45 100644 --- a/.github/workflows/os-llvm-sycl-build.yml +++ b/.github/workflows/os-llvm-sycl-build.yml @@ -10,6 +10,7 @@ jobs: install-compiler: name: Build with nightly build of DPC++ toolchain runs-on: ubuntu-22.04 + timeout-minutes: 90 env: DOWNLOAD_URL_PREFIX: https://github.com/intel/llvm/releases/download diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 3c6c55b02d..1198ab2c30 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -10,6 +10,7 @@ permissions: read-all jobs: pre-commit: runs-on: ubuntu-24.04 + timeout-minutes: 30 steps: - uses: actions/checkout@v4.1.7 - uses: actions/setup-python@v5 diff --git a/.github/workflows/python_style_checks.yml b/.github/workflows/python_style_checks.yml index 9a35e00d86..205c16f705 100644 --- a/.github/workflows/python_style_checks.yml +++ b/.github/workflows/python_style_checks.yml @@ -16,6 +16,7 @@ jobs: # The isort job sorts all imports in .py, .pyx, .pxd files isort: runs-on: ubuntu-latest + timeout-minutes: 30 steps: - uses: actions/checkout@v4.1.7 - uses: actions/setup-python@v5 @@ -28,6 +29,7 @@ jobs: black: # The type of runner that the job will run on runs-on: ubuntu-latest + timeout-minutes: 30 # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -47,6 +49,7 @@ jobs: flake8: runs-on: ubuntu-latest + timeout-minutes: 30 steps: - uses: actions/checkout@v4.1.7 From cf92570241e128d2923b769c35387d51bdc2c78a Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Thu, 19 Sep 2024 13:59:34 -0500 Subject: [PATCH 04/16] Use Miniforge3 variant, instead of deprecated Mambaforge --- .github/workflows/conda-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 50ba7adaf2..91d0d15ffb 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -87,7 +87,7 @@ jobs: - uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest activate-environment: build channels: conda-forge From 5f7a54721bea136c29a73b8e3696dd352d4c9f01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 14:01:10 +0000 Subject: [PATCH 05/16] Bump actions/checkout from 4.1.7 to 4.2.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.0. - [Release notes](https://github.com/actions/checkout/releases) - [Commits](https://github.com/actions/checkout/compare/v4.1.7...v4.2.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/conda-package.yml | 10 +++++----- .github/workflows/cpp_style_checks.yml | 2 +- .github/workflows/generate-coverage.yaml | 2 +- .github/workflows/generate-docs.yml | 2 +- .github/workflows/openssf-scorecard.yml | 2 +- .github/workflows/os-llvm-sycl-build.yml | 2 +- .github/workflows/pre-commit.yml | 2 +- .github/workflows/python_style_checks.yml | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 91d0d15ffb..69715e1358 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -25,7 +25,7 @@ jobs: matrix: python: ['3.9', '3.10', '3.11', '3.12'] steps: - - uses: actions/checkout@v4.1.7 + - uses: actions/checkout@v4.2.0 with: fetch-depth: 0 @@ -81,7 +81,7 @@ jobs: matrix: python: ['3.9', '3.10', '3.11', '3.12'] steps: - - uses: actions/checkout@v4.1.7 + - uses: actions/checkout@v4.2.0 with: fetch-depth: 0 @@ -465,7 +465,7 @@ jobs: # Needed to be able to run conda index run: conda install conda-index -c conda-forge --override-channels - name: Checkout dpctl repo - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 with: fetch-depth: 0 - name: Download artifact @@ -615,7 +615,7 @@ jobs: run: | echo ${{ env.CHANNELS }} - name: Checkout dpctl repo - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 with: fetch-depth: 0 - name: Cache array API tests @@ -759,7 +759,7 @@ jobs: run: conda install anaconda-client -c conda-forge --override-channels - name: Checkout repo - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 with: repository: IntelPython/devops-tools fetch-depth: 0 diff --git a/.github/workflows/cpp_style_checks.yml b/.github/workflows/cpp_style_checks.yml index 103d636f0c..35f9539781 100644 --- a/.github/workflows/cpp_style_checks.yml +++ b/.github/workflows/cpp_style_checks.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v4.1.7 + - uses: actions/checkout@v4.2.0 - name: Run clang-format style check for C/C++ programs. uses: jidicula/clang-format-action@v4.13.0 with: diff --git a/.github/workflows/generate-coverage.yaml b/.github/workflows/generate-coverage.yaml index 7c12702c65..84e2c39d78 100644 --- a/.github/workflows/generate-coverage.yaml +++ b/.github/workflows/generate-coverage.yaml @@ -82,7 +82,7 @@ jobs: make && make install - name: Checkout repo - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 with: fetch-depth: 0 diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml index 7b0c2127c6..d19f6e202c 100644 --- a/.github/workflows/generate-docs.yml +++ b/.github/workflows/generate-docs.yml @@ -60,7 +60,7 @@ jobs: sphinxcontrib-jsmath sphinx-copybutton sphinxcontrib-spelling \ versioneer[toml]==0.29 - name: Checkout repo - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 with: fetch-depth: 0 persist-credentials: false diff --git a/.github/workflows/openssf-scorecard.yml b/.github/workflows/openssf-scorecard.yml index f8ab476021..d0cea575a6 100644 --- a/.github/workflows/openssf-scorecard.yml +++ b/.github/workflows/openssf-scorecard.yml @@ -34,7 +34,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: persist-credentials: false diff --git a/.github/workflows/os-llvm-sycl-build.yml b/.github/workflows/os-llvm-sycl-build.yml index e3b3b88e45..1132e92bbb 100644 --- a/.github/workflows/os-llvm-sycl-build.yml +++ b/.github/workflows/os-llvm-sycl-build.yml @@ -110,7 +110,7 @@ jobs: pip install numpy cython setuptools pytest scikit-build cmake ninja versioneer[toml]==0.29 - name: Checkout repo - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 with: fetch-depth: 0 diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 1198ab2c30..5317f7f656 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-24.04 timeout-minutes: 30 steps: - - uses: actions/checkout@v4.1.7 + - uses: actions/checkout@v4.2.0 - uses: actions/setup-python@v5 with: python-version: '3.12' diff --git a/.github/workflows/python_style_checks.yml b/.github/workflows/python_style_checks.yml index 205c16f705..68adcae5d9 100644 --- a/.github/workflows/python_style_checks.yml +++ b/.github/workflows/python_style_checks.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v4.1.7 + - uses: actions/checkout@v4.2.0 - uses: actions/setup-python@v5 with: python-version: '3.11' @@ -34,7 +34,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v4.1.7 + - uses: actions/checkout@v4.2.0 # Set up a Python environment for use in actions - uses: actions/setup-python@v5 with: @@ -52,7 +52,7 @@ jobs: timeout-minutes: 30 steps: - - uses: actions/checkout@v4.1.7 + - uses: actions/checkout@v4.2.0 - name: Set up Python uses: actions/setup-python@v5 with: From 73c0c8951f09091222e99be79f8da11a523ef6b6 Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Mon, 7 Oct 2024 10:13:55 -0500 Subject: [PATCH 06/16] Use Miniforge, use conda-forge Remove auto-update-code from setup-miniconda step. Create channel directory, then channel\win-64 directory. --- .github/workflows/conda-package.yml | 46 +++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 69715e1358..f1e34b1013 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -249,38 +249,63 @@ jobs: shell: pwsh run: | echo "CHANNELS=-c ${{ env.INTEL_CHANNEL }} -c conda-forge --override-channels" >> $env:GITHUB_ENV + - name: Display channels line run: | echo ${{ env.CHANNELS }} + - name: Download artifact uses: actions/download-artifact@v4 with: name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }} + - uses: conda-incubator/setup-miniconda@v3 with: - auto-update-conda: true - conda-build-version: '*' - miniconda-version: 'latest' + miniforge-version: latest + channels: conda-forge,nodefaults activate-environment: ${{ env.TEST_ENV_NAME }} python-version: ${{ matrix.python }} + + - name: Remove defaults channel + run: conda config --remove channels defaults + + - name: Install conda-index + run: | + conda install -n base conda-index + - name: Create conda channel with the artifact bit shell: cmd /C CALL {0} run: | + @echo on echo ${{ env.workdir }} + mkdir ${{ env.workdir }}\channel mkdir ${{ env.workdir }}\channel\win-64 move ${{ env.PACKAGE_NAME }}-*.tar.bz2 ${{ env.workdir }}\channel\win-64 - dir ${{ env.workdir }}\channel\win-64 + dir ${{ env.workdir }}\channel\win-64\ + - name: Index the channel shell: cmd /C CALL {0} - run: conda index ${{ env.workdir }}\channel + run: | + @echo on + conda index ${{ env.workdir }}\channel + + - name: List content of the channels + shell: cmd /C CALL {0} + run: | + dir ${{ env.workdir }}\channel + dir ${{ env.workdir }}\channel\win-64 - name: Dump dpctl version info from created channel into ver.json shell: cmd /C CALL {0} run: | + @echo on conda search ${{ env.PACKAGE_NAME }} -c ${{ env.workdir }}/channel --override-channels --info --json > ${{ env.workdir }}\ver.json + dir ${{ env.workdir }} + - name: Output content of produced ver.json shell: pwsh run: Get-Content -Path ${{ env.workdir }}\ver.json + - name: Collect dependencies shell: cmd /C CALL {0} run: | @@ -292,9 +317,11 @@ jobs: SET PACKAGE_VERSION=%%F ) conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }} --only-deps --dry-run > lockfile + - name: Display lockfile content shell: pwsh run: Get-Content -Path .\lockfile + - name: Cache conda packages uses: actions/cache@v4 env: @@ -306,9 +333,11 @@ jobs: restore-keys: | ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}- ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}- + - name: Install opencl_rt shell: cmd /C CALL {0} run: conda install -n ${{ env.TEST_ENV_NAME }} opencl_rt -c ${{ env.INTEL_CHANNEL }} --override-channels + - name: Install dpctl shell: cmd /C CALL {0} run: | @@ -322,12 +351,14 @@ jobs: ) SET TEST_DEPENDENCIES=pytest"<8" pytest-cov cython setuptools conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }} + - name: Report content of test environment shell: cmd /C CALL {0} run: | echo "Value of CONDA enviroment variable was: " %CONDA% echo "Value of CONDA_PREFIX enviroment variable was: " %CONDA_PREFIX% conda info && conda list -n ${{ env.TEST_ENV_NAME }} + - name: Configure Intel OpenCL CPU RT shell: pwsh run: | @@ -336,23 +367,28 @@ jobs: # Check the variable assisting OpenCL CPU driver to find TBB DLLs which are not located where it expects them by default $cl_cfg="$env:CONDA_PREFIX\Library\lib\cl.cfg" Get-Content -Tail 5 -Path $cl_cfg + - name: Smoke test, step 1 shell: cmd /C CALL {0} run: >- conda activate ${{ env.TEST_ENV_NAME }} && python -c "import sys; print(sys.executable)" + - name: Smoke test, step 2 shell: cmd /C CALL {0} run: >- conda activate ${{ env.TEST_ENV_NAME }} && python -m dpctl -f + - name: Create empty temporary directory to run tests from shell: cmd /C CALL {0} # create temporary empty folder to runs tests from # https://github.com/pytest-dev/pytest/issues/11904 run: >- mkdir "${{ env.workdir }}\test_tmp" + - name: List content of workdir folder shell: cmd /C CALL {0} run: dir "${{ env.workdir }}" + - name: Run tests shell: cmd /C CALL {0} env: From bb07469aae6ab39b39a52774cd44b744189a1e00 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 13:36:17 +0000 Subject: [PATCH 07/16] Bump actions/checkout from 4.2.0 to 4.2.1 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/actions/checkout/releases) - [Commits](https://github.com/actions/checkout/compare/v4.2.0...v4.2.1) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/conda-package.yml | 10 +++++----- .github/workflows/cpp_style_checks.yml | 2 +- .github/workflows/generate-coverage.yaml | 2 +- .github/workflows/generate-docs.yml | 2 +- .github/workflows/openssf-scorecard.yml | 2 +- .github/workflows/os-llvm-sycl-build.yml | 2 +- .github/workflows/pre-commit.yml | 2 +- .github/workflows/python_style_checks.yml | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index f1e34b1013..9b9a4bd325 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -25,7 +25,7 @@ jobs: matrix: python: ['3.9', '3.10', '3.11', '3.12'] steps: - - uses: actions/checkout@v4.2.0 + - uses: actions/checkout@v4.2.1 with: fetch-depth: 0 @@ -81,7 +81,7 @@ jobs: matrix: python: ['3.9', '3.10', '3.11', '3.12'] steps: - - uses: actions/checkout@v4.2.0 + - uses: actions/checkout@v4.2.1 with: fetch-depth: 0 @@ -501,7 +501,7 @@ jobs: # Needed to be able to run conda index run: conda install conda-index -c conda-forge --override-channels - name: Checkout dpctl repo - uses: actions/checkout@v4.2.0 + uses: actions/checkout@v4.2.1 with: fetch-depth: 0 - name: Download artifact @@ -651,7 +651,7 @@ jobs: run: | echo ${{ env.CHANNELS }} - name: Checkout dpctl repo - uses: actions/checkout@v4.2.0 + uses: actions/checkout@v4.2.1 with: fetch-depth: 0 - name: Cache array API tests @@ -795,7 +795,7 @@ jobs: run: conda install anaconda-client -c conda-forge --override-channels - name: Checkout repo - uses: actions/checkout@v4.2.0 + uses: actions/checkout@v4.2.1 with: repository: IntelPython/devops-tools fetch-depth: 0 diff --git a/.github/workflows/cpp_style_checks.yml b/.github/workflows/cpp_style_checks.yml index 35f9539781..5f52e7146b 100644 --- a/.github/workflows/cpp_style_checks.yml +++ b/.github/workflows/cpp_style_checks.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v4.2.0 + - uses: actions/checkout@v4.2.1 - name: Run clang-format style check for C/C++ programs. uses: jidicula/clang-format-action@v4.13.0 with: diff --git a/.github/workflows/generate-coverage.yaml b/.github/workflows/generate-coverage.yaml index 84e2c39d78..f614b6d488 100644 --- a/.github/workflows/generate-coverage.yaml +++ b/.github/workflows/generate-coverage.yaml @@ -82,7 +82,7 @@ jobs: make && make install - name: Checkout repo - uses: actions/checkout@v4.2.0 + uses: actions/checkout@v4.2.1 with: fetch-depth: 0 diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml index d19f6e202c..e0409ba6ac 100644 --- a/.github/workflows/generate-docs.yml +++ b/.github/workflows/generate-docs.yml @@ -60,7 +60,7 @@ jobs: sphinxcontrib-jsmath sphinx-copybutton sphinxcontrib-spelling \ versioneer[toml]==0.29 - name: Checkout repo - uses: actions/checkout@v4.2.0 + uses: actions/checkout@v4.2.1 with: fetch-depth: 0 persist-credentials: false diff --git a/.github/workflows/openssf-scorecard.yml b/.github/workflows/openssf-scorecard.yml index d0cea575a6..667426303c 100644 --- a/.github/workflows/openssf-scorecard.yml +++ b/.github/workflows/openssf-scorecard.yml @@ -34,7 +34,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: persist-credentials: false diff --git a/.github/workflows/os-llvm-sycl-build.yml b/.github/workflows/os-llvm-sycl-build.yml index 1132e92bbb..02fcec9eec 100644 --- a/.github/workflows/os-llvm-sycl-build.yml +++ b/.github/workflows/os-llvm-sycl-build.yml @@ -110,7 +110,7 @@ jobs: pip install numpy cython setuptools pytest scikit-build cmake ninja versioneer[toml]==0.29 - name: Checkout repo - uses: actions/checkout@v4.2.0 + uses: actions/checkout@v4.2.1 with: fetch-depth: 0 diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 5317f7f656..d0dee85101 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-24.04 timeout-minutes: 30 steps: - - uses: actions/checkout@v4.2.0 + - uses: actions/checkout@v4.2.1 - uses: actions/setup-python@v5 with: python-version: '3.12' diff --git a/.github/workflows/python_style_checks.yml b/.github/workflows/python_style_checks.yml index 68adcae5d9..b44915d773 100644 --- a/.github/workflows/python_style_checks.yml +++ b/.github/workflows/python_style_checks.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v4.2.0 + - uses: actions/checkout@v4.2.1 - uses: actions/setup-python@v5 with: python-version: '3.11' @@ -34,7 +34,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v4.2.0 + - uses: actions/checkout@v4.2.1 # Set up a Python environment for use in actions - uses: actions/setup-python@v5 with: @@ -52,7 +52,7 @@ jobs: timeout-minutes: 30 steps: - - uses: actions/checkout@v4.2.0 + - uses: actions/checkout@v4.2.1 - name: Set up Python uses: actions/setup-python@v5 with: From 7a4bef3b429f17580074818a278a3b7cf780c528 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 13:36:23 +0000 Subject: [PATCH 08/16] Bump actions/upload-artifact from 4.4.0 to 4.4.3 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.0 to 4.4.3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4.4.0...v4.4.3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/conda-package.yml | 8 ++++---- .github/workflows/generate-docs.yml | 2 +- .github/workflows/openssf-scorecard.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 9b9a4bd325..7e32b4b2ec 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -63,12 +63,12 @@ jobs: $CHANNELS \ conda-recipe - name: Upload artifact - uses: actions/upload-artifact@v4.4.0 + uses: actions/upload-artifact@v4.4.3 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@v4.4.0 + uses: actions/upload-artifact@v4.4.3 with: name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }} path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.PACKAGE_NAME }}-*.whl @@ -125,13 +125,13 @@ jobs: conda build --no-test --python ${{ matrix.python }} --numpy 2 -c conda-forge --override-channels conda-recipe - name: Upload artifact - uses: actions/upload-artifact@v4.4.0 + uses: actions/upload-artifact@v4.4.3 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@v4.4.0 + uses: actions/upload-artifact@v4.4.3 with: name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }} path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.PACKAGE_NAME }}-*.whl diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml index e0409ba6ac..6d6458353a 100644 --- a/.github/workflows/generate-docs.yml +++ b/.github/workflows/generate-docs.yml @@ -105,7 +105,7 @@ jobs: git push tokened_docs gh-pages - name: Save built docs as an artifact if: ${{ github.event.pull_request && github.event.pull_request.head.repo.fork && github.event.action != 'closed'}} - uses: actions/upload-artifact@v4.4.0 + uses: actions/upload-artifact@v4.4.3 with: name: ${{ env.PACKAGE_NAME }} rendered documentation path: ~/docs diff --git a/.github/workflows/openssf-scorecard.yml b/.github/workflows/openssf-scorecard.yml index 667426303c..880020e3d4 100644 --- a/.github/workflows/openssf-scorecard.yml +++ b/.github/workflows/openssf-scorecard.yml @@ -61,7 +61,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 + uses: actions/upload-artifact@184d73b71b93c222403b2e7f1ffebe4508014249 # v4.4.0 with: name: SARIF file path: results.sarif From 974fabaed3f9ac64bd540a818f0fac80237a1749 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 13:55:30 +0000 Subject: [PATCH 09/16] Bump actions/checkout from 4.2.1 to 4.2.2 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.1 to 4.2.2. - [Release notes](https://github.com/actions/checkout/releases) - [Commits](https://github.com/actions/checkout/compare/v4.2.1...v4.2.2) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/conda-package.yml | 10 +++++----- .github/workflows/cpp_style_checks.yml | 2 +- .github/workflows/generate-coverage.yaml | 2 +- .github/workflows/generate-docs.yml | 2 +- .github/workflows/openssf-scorecard.yml | 2 +- .github/workflows/os-llvm-sycl-build.yml | 2 +- .github/workflows/pre-commit.yml | 2 +- .github/workflows/python_style_checks.yml | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 7e32b4b2ec..0b51e429dd 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -25,7 +25,7 @@ jobs: matrix: python: ['3.9', '3.10', '3.11', '3.12'] steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: fetch-depth: 0 @@ -81,7 +81,7 @@ jobs: matrix: python: ['3.9', '3.10', '3.11', '3.12'] steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: fetch-depth: 0 @@ -501,7 +501,7 @@ jobs: # Needed to be able to run conda index run: conda install conda-index -c conda-forge --override-channels - name: Checkout dpctl repo - uses: actions/checkout@v4.2.1 + uses: actions/checkout@v4.2.2 with: fetch-depth: 0 - name: Download artifact @@ -651,7 +651,7 @@ jobs: run: | echo ${{ env.CHANNELS }} - name: Checkout dpctl repo - uses: actions/checkout@v4.2.1 + uses: actions/checkout@v4.2.2 with: fetch-depth: 0 - name: Cache array API tests @@ -795,7 +795,7 @@ jobs: run: conda install anaconda-client -c conda-forge --override-channels - name: Checkout repo - uses: actions/checkout@v4.2.1 + uses: actions/checkout@v4.2.2 with: repository: IntelPython/devops-tools fetch-depth: 0 diff --git a/.github/workflows/cpp_style_checks.yml b/.github/workflows/cpp_style_checks.yml index 5f52e7146b..09be6e1943 100644 --- a/.github/workflows/cpp_style_checks.yml +++ b/.github/workflows/cpp_style_checks.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 - name: Run clang-format style check for C/C++ programs. uses: jidicula/clang-format-action@v4.13.0 with: diff --git a/.github/workflows/generate-coverage.yaml b/.github/workflows/generate-coverage.yaml index f614b6d488..36f5c4d7b1 100644 --- a/.github/workflows/generate-coverage.yaml +++ b/.github/workflows/generate-coverage.yaml @@ -82,7 +82,7 @@ jobs: make && make install - name: Checkout repo - uses: actions/checkout@v4.2.1 + uses: actions/checkout@v4.2.2 with: fetch-depth: 0 diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml index 6d6458353a..96078c4214 100644 --- a/.github/workflows/generate-docs.yml +++ b/.github/workflows/generate-docs.yml @@ -60,7 +60,7 @@ jobs: sphinxcontrib-jsmath sphinx-copybutton sphinxcontrib-spelling \ versioneer[toml]==0.29 - name: Checkout repo - uses: actions/checkout@v4.2.1 + uses: actions/checkout@v4.2.2 with: fetch-depth: 0 persist-credentials: false diff --git a/.github/workflows/openssf-scorecard.yml b/.github/workflows/openssf-scorecard.yml index 880020e3d4..ab00f3e727 100644 --- a/.github/workflows/openssf-scorecard.yml +++ b/.github/workflows/openssf-scorecard.yml @@ -34,7 +34,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: persist-credentials: false diff --git a/.github/workflows/os-llvm-sycl-build.yml b/.github/workflows/os-llvm-sycl-build.yml index 02fcec9eec..7648bbb42b 100644 --- a/.github/workflows/os-llvm-sycl-build.yml +++ b/.github/workflows/os-llvm-sycl-build.yml @@ -110,7 +110,7 @@ jobs: pip install numpy cython setuptools pytest scikit-build cmake ninja versioneer[toml]==0.29 - name: Checkout repo - uses: actions/checkout@v4.2.1 + uses: actions/checkout@v4.2.2 with: fetch-depth: 0 diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index d0dee85101..3526a52fb2 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-24.04 timeout-minutes: 30 steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 - uses: actions/setup-python@v5 with: python-version: '3.12' diff --git a/.github/workflows/python_style_checks.yml b/.github/workflows/python_style_checks.yml index b44915d773..72febc2a0e 100644 --- a/.github/workflows/python_style_checks.yml +++ b/.github/workflows/python_style_checks.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 - uses: actions/setup-python@v5 with: python-version: '3.11' @@ -34,7 +34,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 # Set up a Python environment for use in actions - uses: actions/setup-python@v5 with: @@ -52,7 +52,7 @@ jobs: timeout-minutes: 30 steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 - name: Set up Python uses: actions/setup-python@v5 with: From 8169679c67d6461ddc5abf0ac8e3dc2868913855 Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Tue, 29 Oct 2024 13:18:09 -0500 Subject: [PATCH 10/16] Fix conda-package wf, step test_examples_linux --- .github/workflows/conda-package.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 0b51e429dd..68ee8be744 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -12,8 +12,9 @@ env: PACKAGE_NAME: dpctl MODULE_NAME: dpctl TEST_ENV_NAME: test_dpctl - VER_SCRIPT1: "import json; f = open('ver.json', 'r'); j = json.load(f); f.close(); " - VER_SCRIPT2: "d = j['dpctl'][0]; print('='.join((d[s] for s in ('version', 'build'))))" + VER_SCRIPT1: "import json; f = open('ver.json', 'r'); j = json.load(f); f.close(); d = j['dpctl'][0];" + VER_SCRIPT2: "print('='.join((d[s] for s in ('version', 'build'))))" + VER_SCRIPT3: "print(' '.join(d['depends']))" INTEL_CHANNEL: "https://software.repos.intel.com/python/conda/" jobs: @@ -546,12 +547,14 @@ jobs: run: | CHANNELS="${{ env.CHANNELS }}" . $CONDA/etc/profile.d/conda.sh - conda create -n ${{ env.EXAMPLES_ENV_NAME }} -y pytest python=${{ matrix.python }} setuptools"<72.2.0" $CHANNELS - conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y cmake $CHANNELS || exit 1 - conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y ninja $CHANNELS || exit 1 - conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y pybind11 cython scikit-build $CHANNELS || exit 1 - conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y mkl-dpcpp mkl-devel-dpcpp dpcpp_cpp_rt $CHANNELS || exit 1 - conda create -y -n ${{ env.BUILD_ENV_NAME }} $CHANNELS gcc_linux-64 gxx_linux-64 ${{ env.DPCPP_CMPLR }} sysroot_linux-64">=2.28" + export DPCTL_DEPENDS=$(python -c "${VER_SCRIPT1} ${VER_SCRIPT3}") + echo "Dpctl dependencies: ${DPCTL_DEPENDS}" + conda create -n ${{ env.EXAMPLES_ENV_NAME }} -y pytest python=${{ matrix.python }} setuptools"<72.2.0" $DPCTL_DEPENDS $CHANNELS + conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y cmake $DPCTL_DEPENDS $CHANNELS || exit 1 + conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y ninja $DPCTL_DEPENDS $CHANNELS || exit 1 + conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y pybind11 cython scikit-build $DPCTL_DEPENDS $CHANNELS || exit 1 + conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y mkl-dpcpp mkl-devel-dpcpp dpcpp_cpp_rt $DPCTL_DEPENDS $CHANNELS || exit 1 + conda create -y -n ${{ env.BUILD_ENV_NAME }} $CHANNELS gcc_linux-64 gxx_linux-64 ${{ env.DPCPP_CMPLR }} $DPCTL_DEPENDS sysroot_linux-64">=2.28" - name: Install dpctl shell: bash -l {0} run: | From b7c9ec6ebdbfb460858d6143802dac7219fea750 Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Tue, 29 Oct 2024 13:23:17 -0500 Subject: [PATCH 11/16] Test_windows step to check if script exists before attempting to run it --- .github/workflows/conda-package.yml | 34 +++++++++++++++++++---------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 68ee8be744..84f6818b10 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -14,7 +14,7 @@ env: TEST_ENV_NAME: test_dpctl VER_SCRIPT1: "import json; f = open('ver.json', 'r'); j = json.load(f); f.close(); d = j['dpctl'][0];" VER_SCRIPT2: "print('='.join((d[s] for s in ('version', 'build'))))" - VER_SCRIPT3: "print(' '.join(d['depends']))" + VER_SCRIPT3: "print(' '.join(map(lambda s: chr(34) + s + chr(34), [comp for comp in d['depends'] if 'dpcpp' in comp][1:])))" INTEL_CHANNEL: "https://software.repos.intel.com/python/conda/" jobs: @@ -364,7 +364,11 @@ jobs: shell: pwsh run: | $script_path="$env:CONDA_PREFIX\Scripts\set-intel-ocl-icd-registry.ps1" - &$script_path + if (Test-Path $script_path) { + &$script_path + } else { + Write-Warning "File $script_path was NOT found!" + } # Check the variable assisting OpenCL CPU driver to find TBB DLLs which are not located where it expects them by default $cl_cfg="$env:CONDA_PREFIX\Library\lib\cl.cfg" Get-Content -Tail 5 -Path $cl_cfg @@ -541,20 +545,28 @@ jobs: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}- ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}- - name: Install example requirements - shell: bash -l {0} + shell: bash -ex -l {0} env: - DPCPP_CMPLR: dpcpp_linux-64">=2024.2" + DPCPP_CMPLR: "dpcpp_linux-64>=2024.2" run: | CHANNELS="${{ env.CHANNELS }}" . $CONDA/etc/profile.d/conda.sh - export DPCTL_DEPENDS=$(python -c "${VER_SCRIPT1} ${VER_SCRIPT3}") + DPCTL_DEPENDS="$(python -c "${VER_SCRIPT1} ${VER_SCRIPT3}")" echo "Dpctl dependencies: ${DPCTL_DEPENDS}" - conda create -n ${{ env.EXAMPLES_ENV_NAME }} -y pytest python=${{ matrix.python }} setuptools"<72.2.0" $DPCTL_DEPENDS $CHANNELS - conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y cmake $DPCTL_DEPENDS $CHANNELS || exit 1 - conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y ninja $DPCTL_DEPENDS $CHANNELS || exit 1 - conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y pybind11 cython scikit-build $DPCTL_DEPENDS $CHANNELS || exit 1 - conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y mkl-dpcpp mkl-devel-dpcpp dpcpp_cpp_rt $DPCTL_DEPENDS $CHANNELS || exit 1 - conda create -y -n ${{ env.BUILD_ENV_NAME }} $CHANNELS gcc_linux-64 gxx_linux-64 ${{ env.DPCPP_CMPLR }} $DPCTL_DEPENDS sysroot_linux-64">=2.28" + conda create -n ${{ env.EXAMPLES_ENV_NAME }} -y pytest python=${{ matrix.python }} "setuptools<72.2.0" $CHANNELS + echo "Environment created" + conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y cmake ninja $CHANNELS || exit 1 + echo "Cmake and Ninja installed" + conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y pybind11 cython scikit-build $CHANNELS || exit 1 + echo "scikit-build installed" + conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y mkl-dpcpp \ + mkl-devel-dpcpp dpcpp_cpp_rt "${DPCTL_DEPENDS}" \ + $CHANNELS || exit 1 + echo "IPL installed" + conda create -y -n ${{ env.BUILD_ENV_NAME }} $CHANNELS gcc_linux-64 gxx_linux-64 \ + ${{ env.DPCPP_CMPLR }} "${DPCTL_DEPENDS}" \ + "sysroot_linux-64>=2.28" + echo "Compiler installed" - name: Install dpctl shell: bash -l {0} run: | From 9abcef56e968a517f806e0ddbe965988c9937488 Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Wed, 6 Nov 2024 08:53:03 -0600 Subject: [PATCH 12/16] Delete remove defaults channel step from test_windows job --- .github/workflows/conda-package.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 84f6818b10..1d50038a04 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -267,9 +267,6 @@ jobs: activate-environment: ${{ env.TEST_ENV_NAME }} python-version: ${{ matrix.python }} - - name: Remove defaults channel - run: conda config --remove channels defaults - - name: Install conda-index run: | conda install -n base conda-index From e9d2f59ffb94c1d5dc5c43f5c4284dbdeff2df20 Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Wed, 6 Nov 2024 10:50:55 -0600 Subject: [PATCH 13/16] Use nodefaults channel for build_windows and cleanup-packages jobs --- .github/workflows/conda-package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 1d50038a04..dc85422a22 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -91,7 +91,7 @@ jobs: miniforge-variant: Miniforge3 miniforge-version: latest activate-environment: build - channels: conda-forge + channels: conda-forge,nodefaults python-version: ${{ matrix.python }} - name: Install conda build @@ -800,7 +800,7 @@ jobs: with: run-post: false channel-priority: "disabled" - channels: conda-forge + channels: conda-forge,nodefaults python-version: '3.11' - name: Install anaconda-client From 6d1b9a30904208f0046e5fa9fddab85103c44d87 Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Mon, 18 Nov 2024 10:54:11 -0600 Subject: [PATCH 14/16] Remove use of nodefaults channel, use conda-remove-defaults: true instead This change is prompted by CI warning: ``` 'nodefaults' channel detected: will remove 'defaults' if added implicitly. In the future, 'nodefaults' as a way of removing 'defaults' won't be supported. Please set 'conda-remove-defaults' = 'true' to remove this warning. ``` --- .github/workflows/conda-package.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index dc85422a22..1c7ace5e59 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -91,7 +91,8 @@ jobs: miniforge-variant: Miniforge3 miniforge-version: latest activate-environment: build - channels: conda-forge,nodefaults + channels: conda-forge + conda-remove-defaults: true python-version: ${{ matrix.python }} - name: Install conda build @@ -263,7 +264,8 @@ jobs: - uses: conda-incubator/setup-miniconda@v3 with: miniforge-version: latest - channels: conda-forge,nodefaults + channels: conda-forge + conda-remove-defaults: true activate-environment: ${{ env.TEST_ENV_NAME }} python-version: ${{ matrix.python }} @@ -800,7 +802,8 @@ jobs: with: run-post: false channel-priority: "disabled" - channels: conda-forge,nodefaults + channels: conda-forge + conda-remove-defaults: true python-version: '3.11' - name: Install anaconda-client From b2ae7e02892909029baf97076ba782ed5caf763e Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Tue, 19 Nov 2024 08:17:07 -0600 Subject: [PATCH 15/16] Set channels and conda-remove-defaults in upload_windows step as well --- .github/workflows/conda-package.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 1c7ace5e59..87fceb1830 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -459,6 +459,9 @@ jobs: - uses: conda-incubator/setup-miniconda@v3 with: + miniforge-version: latest + channels: conda-forge + conda-remove-defaults: true auto-activate-base: true activate-environment: "" From 77f6c49e04a86242e7984bcab5766b9a0e72096b Mon Sep 17 00:00:00 2001 From: Nikita Grigorian Date: Mon, 9 Sep 2024 21:43:56 -0700 Subject: [PATCH 16/16] Update black version used in Python style check workflow --- .github/workflows/python_style_checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python_style_checks.yml b/.github/workflows/python_style_checks.yml index 72febc2a0e..cea76ef554 100644 --- a/.github/workflows/python_style_checks.yml +++ b/.github/workflows/python_style_checks.yml @@ -45,7 +45,7 @@ jobs: with: src: "." options: "--check" - version: "22.12.0" + version: "24.4.2" flake8: runs-on: ubuntu-latest