From 95d09e48392339e6b0ddabaa9a0d75dd56245596 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Fri, 30 Jul 2021 07:01:47 -0500 Subject: [PATCH 1/4] Add matrix for python version --- .github/workflows/conda-package.yml | 46 +++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index cc3475d3d4..f158465fb2 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -4,10 +4,14 @@ on: push env: PACKAGE_NAME: dpctl + MODULE_NAME: dpctl jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + python: ["3.8"] steps: - uses: actions/checkout@v2 with: @@ -23,7 +27,10 @@ jobs: with: path: ~/.conda/pkgs key: - ${{ runner.os }}-conda-build-${{ env.CACHE_NUMBER }}-${{hashFiles('**/meta.yaml') }} + ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-${{hashFiles('**/meta.yaml') }} + restore-keys: | + ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}- + ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}- - name: Add conda to system path run: echo $CONDA/bin >> $GITHUB_PATH @@ -32,7 +39,7 @@ jobs: - name: Build conda package run: | CHANNELS="-c intel -c defaults --override-channels" - VERSIONS="--python 3.8" + VERSIONS="--python ${{ matrix.python }}" TEST="--no-test" conda build \ @@ -43,17 +50,24 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v2 with: - name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} + name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }} path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.tar.bz2 test: needs: build runs-on: ubuntu-latest + + strategy: + matrix: + python: ["3.8"] + env: + CHANNELS: -c intel -c defaults --override-channels + steps: - name: Download artifact uses: actions/download-artifact@v2 with: - name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} + name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }} - name: Add conda to system path run: echo $CONDA/bin >> $GITHUB_PATH - name: Install conda-build @@ -65,10 +79,11 @@ jobs: conda index $GITHUB_WORKSPACE/channel # Test channel conda search $PACKAGE_NAME -c $GITHUB_WORKSPACE/channel --override-channels + - name: Collect dependencies run: | - CHANNELS="-c $GITHUB_WORKSPACE/channel -c intel -c defaults --override-channels" - conda install $PACKAGE_NAME $CHANNELS --only-deps --dry-run > lockfile + CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}" + conda install $PACKAGE_NAME python=${{ matrix.python }} $CHANNELS --only-deps --dry-run > lockfile - name: Set pkgs_dirs run: | echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc @@ -79,28 +94,35 @@ jobs: with: path: ~/.conda/pkgs key: - ${{ runner.os }}-conda-test-${{ env.CACHE_NUMBER }}-${{hashFiles('lockfile') }} - - name: Install ${{ env.PACKAGE_NAME }} + ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-${{hashFiles('lockfile') }} + restore-keys: | + ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}- + ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}- + + - name: Install dpctl run: | - CHANNELS="-c $GITHUB_WORKSPACE/channel -c intel -c defaults --override-channels" - conda install $PACKAGE_NAME pytest $CHANNELS + CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}" + conda install $PACKAGE_NAME pytest python=${{ matrix.python }} $CHANNELS # Test installed packages conda list - name: Run tests run: | # echo "libintelocl.so" | tee /etc/OpenCL/vendors/intel-cpu.icd export OCL_ICD_FILENAMES=libintelocl.so - python -m pytest --pyargs $PACKAGE_NAME + python -m pytest --pyargs $MODULE_NAME upload: needs: test if: ${{ github.ref == 'refs/heads/master' }} runs-on: ubuntu-latest + strategy: + matrix: + python: ["3.8"] steps: - name: Download artifact uses: actions/download-artifact@v2 with: - name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} + name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }} - name: Install anaconda-client run: conda install anaconda-client From d7b0608b389e16f2ac154717676588b5d04e7333 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Fri, 30 Jul 2021 13:22:29 -0500 Subject: [PATCH 2/4] Run tests on Gen9 --- .github/workflows/conda-package.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index f158465fb2..1abb46c5f5 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: ["3.8"] + python: [3.8] steps: - uses: actions/checkout@v2 with: @@ -55,11 +55,14 @@ jobs: test: needs: build - runs-on: ubuntu-latest + runs-on: ${{ matrix.runner }} strategy: matrix: - python: ["3.8"] + python: [3.8] + runner: + - ubuntu-latest + - [self-hosted, gen9] env: CHANNELS: -c intel -c defaults --override-channels @@ -109,6 +112,7 @@ jobs: run: | # echo "libintelocl.so" | tee /etc/OpenCL/vendors/intel-cpu.icd export OCL_ICD_FILENAMES=libintelocl.so + clinfo -l python -m pytest --pyargs $MODULE_NAME upload: @@ -117,7 +121,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: ["3.8"] + python: [3.8] steps: - name: Download artifact uses: actions/download-artifact@v2 From 72e7e41ba300377b65a3fbaa2d6c6a5b361ff8c6 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Fri, 30 Jul 2021 13:33:12 -0500 Subject: [PATCH 3/4] Continue w/o GPU --- .github/workflows/conda-package.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 1abb46c5f5..e8f4431a33 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -60,9 +60,13 @@ jobs: strategy: matrix: python: [3.8] - runner: - - ubuntu-latest - - [self-hosted, gen9] + experimental: [false] + runner: [ubuntu-latest] + include: + - python: 3.8 + experimental: true + runner: [self-hosted, gen9] + continue-on-error: ${{ matrix.experimental }} env: CHANNELS: -c intel -c defaults --override-channels From b9a19d122d0d2840e170b046ab1084f9b46e3b5a Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Mon, 2 Aug 2021 02:12:00 -0500 Subject: [PATCH 4/4] Remove clinfo --- .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 e8f4431a33..406aaf1095 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -116,7 +116,7 @@ jobs: run: | # echo "libintelocl.so" | tee /etc/OpenCL/vendors/intel-cpu.icd export OCL_ICD_FILENAMES=libintelocl.so - clinfo -l + # clinfo -l python -m pytest --pyargs $MODULE_NAME upload: