From 3725dcb7fb5bcc9eddfac04d004b0acb290c153e Mon Sep 17 00:00:00 2001 From: Sergey Maydanov Date: Fri, 14 Apr 2023 20:53:46 -0500 Subject: [PATCH 1/8] Update build.yml --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f346110..c57fd1d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,11 @@ on: push: branches: - main + - release* pull_request: + branches: + - main + - release* env: PACKAGE_NAME: game-of-life-demo From 7fa28ba88cfc95ea19e37ce616e208e0b7230939 Mon Sep 17 00:00:00 2001 From: Sergey Maydanov Date: Fri, 14 Apr 2023 20:59:19 -0500 Subject: [PATCH 2/8] Update build.yml --- .github/workflows/build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c57fd1d..e7a3ea1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,11 +4,7 @@ on: push: branches: - main - - release* pull_request: - branches: - - main - - release* env: PACKAGE_NAME: game-of-life-demo @@ -205,7 +201,6 @@ jobs: env: workdir: '${{ github.workspace }}' CHANNELS: -c intel -c main --override-channels - steps: - uses: actions/checkout@v3 with: From a1ffcefca04ebf1d68871b19ab5f7c9c4ba73034 Mon Sep 17 00:00:00 2001 From: Sergey Maydanov Date: Tue, 18 Apr 2023 10:27:10 -0500 Subject: [PATCH 3/8] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7a3ea1..616b8eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -254,7 +254,7 @@ jobs: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}- ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}- - name: Run tests (numpy) - 0 shell: cmd /C CALL {0} + shell: cmd /C CALL {0} run: >- conda activate test-env && pytest ./game_of_life_demo/tests --variant numpy - name: Run tests (dpnp) From a2990579085c08bca84521e26508f8fce63e04bf Mon Sep 17 00:00:00 2001 From: Sergey Maydanov Date: Tue, 18 Apr 2023 11:38:42 -0500 Subject: [PATCH 4/8] Update build.yml --- .github/workflows/build.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 616b8eb..ae62903 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -202,7 +202,8 @@ jobs: workdir: '${{ github.workspace }}' CHANNELS: -c intel -c main --override-channels steps: - - uses: actions/checkout@v3 + - name: Checkout sources + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Download artifact @@ -253,6 +254,11 @@ jobs: restore-keys: | ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}- ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}- + - name: Install dependencies + shell: cmd /C CALL {0} + run: | + SET "TEST_DEPENDENCIES=pytest pytest-cov" + conda install -n test-env ${{ env.PACKAGE_NAME }} %TEST_DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }} - name: Run tests (numpy) shell: cmd /C CALL {0} run: >- From d500cb2e0a887331e750691fd85f9d0b689e9164 Mon Sep 17 00:00:00 2001 From: Sergey Maydanov Date: Tue, 18 Apr 2023 11:40:11 -0500 Subject: [PATCH 5/8] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae62903..ac1c4cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -255,8 +255,8 @@ jobs: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}- ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}- - name: Install dependencies - shell: cmd /C CALL {0} - run: | + shell: cmd /C CALL {0} + run: | SET "TEST_DEPENDENCIES=pytest pytest-cov" conda install -n test-env ${{ env.PACKAGE_NAME }} %TEST_DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }} - name: Run tests (numpy) From 84c02b5cbfbd464cec615542ab0e0b209632e7d8 Mon Sep 17 00:00:00 2001 From: Sergey Maydanov Date: Tue, 18 Apr 2023 12:08:40 -0500 Subject: [PATCH 6/8] Update build.yml --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ac1c4cd..7a5a022 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -254,6 +254,9 @@ 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 dpctl_test opencl_rt -c intel --override-channels - name: Install dependencies shell: cmd /C CALL {0} run: | From f55de2c8d2d71a6b694a7f8b042ee2f82cffe047 Mon Sep 17 00:00:00 2001 From: Sergey Maydanov Date: Tue, 18 Apr 2023 12:15:38 -0500 Subject: [PATCH 7/8] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a5a022..0a188de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -255,8 +255,8 @@ jobs: ${{ 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 dpctl_test opencl_rt -c intel --override-channels + shell: cmd /C CALL {0} + run: conda install -n test-env opencl_rt -c intel --override-channels - name: Install dependencies shell: cmd /C CALL {0} run: | From 548a170c108003d0dc37e8099e928fa5d16c0495 Mon Sep 17 00:00:00 2001 From: Sergey Maydanov Date: Tue, 18 Apr 2023 15:04:15 -0500 Subject: [PATCH 8/8] Update build.yml --- .github/workflows/build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a188de..a98cbec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -262,6 +262,14 @@ jobs: run: | SET "TEST_DEPENDENCIES=pytest pytest-cov" conda install -n test-env ${{ env.PACKAGE_NAME }} %TEST_DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }} + - name: Configure Intel OpenCL CPU RT + shell: pwsh + run: | + $script_path="$env:CONDA_PREFIX\Scripts\set-intel-ocl-icd-registry.ps1" + &$script_path + # 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: Run tests (numpy) shell: cmd /C CALL {0} run: >-