From 4ea6a9b1cbe1ee3e1c3bea80802555f54ee51724 Mon Sep 17 00:00:00 2001 From: Neo Zhang Jianyu Date: Thu, 21 Nov 2024 11:33:16 +0800 Subject: [PATCH 1/6] Update build.yml --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6ef0770f3fa..becd7dbdbbe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -962,7 +962,11 @@ jobs: fetch-depth: 0 - name: Install - run: scripts/install-oneapi.bat $WINDOWS_BASEKIT_URL $WINDOWS_DPCPP_MKL + run: | + echo ${{ github.event_name }} + echo ${{ github.ref }} + echo ${{ github.event.inputs.create_release }} + scripts/install-oneapi.bat $WINDOWS_BASEKIT_URL $WINDOWS_DPCPP_MKL - name: Build id: cmake_build From 8bb6ae0bbf4b5ede61bf415725454ba768cbd44a Mon Sep 17 00:00:00 2001 From: Neo Zhang Jianyu Date: Thu, 21 Nov 2024 13:07:08 +0800 Subject: [PATCH 2/6] 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 becd7dbdbbe..e42053f4503 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -966,6 +966,9 @@ jobs: echo ${{ github.event_name }} echo ${{ github.ref }} echo ${{ github.event.inputs.create_release }} + echo ${{ github.base_ref }} + echo ${{ github.event }} + echo ${{ github }} scripts/install-oneapi.bat $WINDOWS_BASEKIT_URL $WINDOWS_DPCPP_MKL - name: Build From 244704f7dd8c7abb03bfefc77d1a2856206901db Mon Sep 17 00:00:00 2001 From: Neo Zhang Jianyu Date: Thu, 21 Nov 2024 13:23:32 +0800 Subject: [PATCH 3/6] Update build.yml --- .github/workflows/build.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e42053f4503..001c42a2650 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -962,13 +962,7 @@ jobs: fetch-depth: 0 - name: Install - run: | - echo ${{ github.event_name }} - echo ${{ github.ref }} - echo ${{ github.event.inputs.create_release }} - echo ${{ github.base_ref }} - echo ${{ github.event }} - echo ${{ github }} + run: | scripts/install-oneapi.bat $WINDOWS_BASEKIT_URL $WINDOWS_DPCPP_MKL - name: Build @@ -988,9 +982,9 @@ jobs: echo "name=${SAFE_NAME}-b${BUILD_NUMBER}-${SHORT_HASH}" >> $GITHUB_OUTPUT fi - - name: Pack artifacts + - name: Build the release package id: pack_artifacts - if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }} + if: ${{ ( github.event_name == 'pull_request' && github.base_ref == 'master' ) }} run: | echo "cp oneAPI running time dll files in ${{ env.ONEAPI_ROOT }} to ./build/bin" cp "${{ env.ONEAPI_ROOT }}/mkl/latest/bin/mkl_sycl_blas.4.dll" ./build/bin @@ -1006,8 +1000,8 @@ jobs: echo "cp oneAPI running time dll files to ./build/bin done" 7z a llama-${{ steps.tag.outputs.name }}-bin-win-sycl-x64.zip ./build/bin/* - - name: Upload artifacts - if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }} + - name: Upload the release package + if: ${{ ( github.event_name == 'pull_request' && github.base_ref == 'master' ) }} uses: actions/upload-artifact@v4 with: path: llama-${{ steps.tag.outputs.name }}-bin-win-sycl-x64.zip From 536247ec4503b3f0ae317aee317d0269a6661110 Mon Sep 17 00:00:00 2001 From: feng ding Date: Mon, 25 Nov 2024 11:37:02 +0800 Subject: [PATCH 4/6] correct file list --- .github/workflows/build.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 001c42a2650..b4a4c8c5c0f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -987,16 +987,19 @@ jobs: if: ${{ ( github.event_name == 'pull_request' && github.base_ref == 'master' ) }} run: | echo "cp oneAPI running time dll files in ${{ env.ONEAPI_ROOT }} to ./build/bin" - cp "${{ env.ONEAPI_ROOT }}/mkl/latest/bin/mkl_sycl_blas.4.dll" ./build/bin + cp "${{ env.ONEAPI_ROOT }}/mkl/latest/bin/mkl_sycl_blas.5.dll" ./build/bin cp "${{ env.ONEAPI_ROOT }}/mkl/latest/bin/mkl_core.2.dll" ./build/bin cp "${{ env.ONEAPI_ROOT }}/mkl/latest/bin/mkl_tbb_thread.2.dll" ./build/bin - cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/pi_win_proxy_loader.dll" ./build/bin - cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/pi_level_zero.dll" ./build/bin - cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/sycl7.dll" ./build/bin + cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/ur*.dll" ./build/bin + cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/sycl8.dll" ./build/bin cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/svml_dispmd.dll" ./build/bin cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/libmmd.dll" ./build/bin cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/libiomp5md.dll" ./build/bin + + cp "${{ env.ONEAPI_ROOT }}/dnnl/latest/bin/dnnl.dll" ./build/bin + cp "${{ env.ONEAPI_ROOT }}/tbb/latest/bin/tbb12.dll" ./build/bin + echo "cp oneAPI running time dll files to ./build/bin done" 7z a llama-${{ steps.tag.outputs.name }}-bin-win-sycl-x64.zip ./build/bin/* From df1788d891aaa999c446d1bf30a4065197a81aec Mon Sep 17 00:00:00 2001 From: feng ding Date: Mon, 25 Nov 2024 12:05:04 +0800 Subject: [PATCH 5/6] correct file lst --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b4a4c8c5c0f..b8f6ab8e3e8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -991,7 +991,11 @@ jobs: cp "${{ env.ONEAPI_ROOT }}/mkl/latest/bin/mkl_core.2.dll" ./build/bin cp "${{ env.ONEAPI_ROOT }}/mkl/latest/bin/mkl_tbb_thread.2.dll" ./build/bin - cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/ur*.dll" ./build/bin + cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/ur_adapter_level_zero.dll" ./build/bin + cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/ur_adapter_opencl.dll" ./build/bin + cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/ur_loader.dll" ./build/bin + cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/ur_win_proxy_loader.dll" ./build/bin + cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/sycl8.dll" ./build/bin cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/svml_dispmd.dll" ./build/bin cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/libmmd.dll" ./build/bin From bc0fe38102341275e47236454ca5546960aaa36d Mon Sep 17 00:00:00 2001 From: feng ding Date: Mon, 25 Nov 2024 12:08:24 +0800 Subject: [PATCH 6/6] rm teal space --- .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 b8f6ab8e3e8..b45f7bb8b11 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -962,7 +962,7 @@ jobs: fetch-depth: 0 - name: Install - run: | + run: | scripts/install-oneapi.bat $WINDOWS_BASEKIT_URL $WINDOWS_DPCPP_MKL - name: Build