From 6a3c7fe02256b4849a935c7684c345cc0ec5dc75 Mon Sep 17 00:00:00 2001 From: Zhang Date: Sun, 12 May 2024 15:41:24 +0800 Subject: [PATCH 1/6] add oneapi running time dlls to release package --- .github/workflows/build.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d747e688437a..1a50985552e2e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -932,6 +932,17 @@ jobs: id: pack_artifacts if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }} run: | + echo "cp oneAPI running time dll files to ./build/bin" + cp ${ONEAPI_ROOT}/mkl/latest/bin/mkl_sycl_blas.4.dll ./build/bin + cp ${ONEAPI_ROOT}/mkl/latest/bin/mkl_core.2.dlll ./build/bin + cp ${ONEAPI_ROOT}/mkl/latest/bin/mkl_tbb_thread.2.dll ./build/bin + + cp ${ONEAPI_ROOT}/compiler/latest/bin/pi_win_proxy_loader.dll ./build/bin + cp ${ONEAPI_ROOT}/compiler/latest/bin/pi_level_zero.dll ./build/bin + cp ${ONEAPI_ROOT}/compiler/latest/bin/sycl7.dll ./build/bin + cp ${ONEAPI_ROOT}/compiler/latest/bin/svml_dispmd.dll ./build/bin + cp ${ONEAPI_ROOT}/compiler/latest/bin/libmmd.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/* - name: Upload artifacts From 22e9d24a1c6506cea240103cb0deb68f1c1f1dce Mon Sep 17 00:00:00 2001 From: Zhang Date: Sun, 12 May 2024 16:04:26 +0800 Subject: [PATCH 2/6] fix path --- .github/workflows/build.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a50985552e2e..63f970f59fe4d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -932,16 +932,16 @@ jobs: id: pack_artifacts if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }} run: | - echo "cp oneAPI running time dll files to ./build/bin" - cp ${ONEAPI_ROOT}/mkl/latest/bin/mkl_sycl_blas.4.dll ./build/bin - cp ${ONEAPI_ROOT}/mkl/latest/bin/mkl_core.2.dlll ./build/bin - cp ${ONEAPI_ROOT}/mkl/latest/bin/mkl_tbb_thread.2.dll ./build/bin - - cp ${ONEAPI_ROOT}/compiler/latest/bin/pi_win_proxy_loader.dll ./build/bin - cp ${ONEAPI_ROOT}/compiler/latest/bin/pi_level_zero.dll ./build/bin - cp ${ONEAPI_ROOT}/compiler/latest/bin/sycl7.dll ./build/bin - cp ${ONEAPI_ROOT}/compiler/latest/bin/svml_dispmd.dll ./build/bin - cp ${ONEAPI_ROOT}/compiler/latest/bin/libmmd.dll ./build/bin + echo "cp oneAPI running time dll files in ${{ ONEAPI_ROOT }} to ./build/bin" + cp ${{ ONEAPI_ROOT }}/mkl/latest/bin/mkl_sycl_blas.4.dll ./build/bin + cp ${{ ONEAPI_ROOT }}/mkl/latest/bin/mkl_core.2.dlll ./build/bin + cp ${{ ONEAPI_ROOT }}/mkl/latest/bin/mkl_tbb_thread.2.dll ./build/bin + + cp ${{ ONEAPI_ROOT }}/compiler/latest/bin/pi_win_proxy_loader.dll ./build/bin + cp ${{ ONEAPI_ROOT }}/compiler/latest/bin/pi_level_zero.dll ./build/bin + cp ${{ ONEAPI_ROOT }}/compiler/latest/bin/sycl7.dll ./build/bin + cp ${{ ONEAPI_ROOT }}/compiler/latest/bin/svml_dispmd.dll ./build/bin + cp ${{ ONEAPI_ROOT }}/compiler/latest/bin/libmmd.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 9b28d860a527cf6a9c3caf0e5509418f147ab840 Mon Sep 17 00:00:00 2001 From: Zhang Date: Sun, 12 May 2024 16:08:53 +0800 Subject: [PATCH 3/6] fix path --- .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 63f970f59fe4d..303e23dbc6fa1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -932,7 +932,7 @@ jobs: id: pack_artifacts if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }} run: | - echo "cp oneAPI running time dll files in ${{ ONEAPI_ROOT }} to ./build/bin" + echo "cp oneAPI running time dll files in ${ONEAPI_ROOT} to ./build/bin" cp ${{ ONEAPI_ROOT }}/mkl/latest/bin/mkl_sycl_blas.4.dll ./build/bin cp ${{ ONEAPI_ROOT }}/mkl/latest/bin/mkl_core.2.dlll ./build/bin cp ${{ ONEAPI_ROOT }}/mkl/latest/bin/mkl_tbb_thread.2.dll ./build/bin From a7a5f42c075425dd7872c4199cef5931712c49b2 Mon Sep 17 00:00:00 2001 From: Zhang Date: Sun, 12 May 2024 16:13:13 +0800 Subject: [PATCH 4/6] fix path --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 303e23dbc6fa1..d6859a9802225 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -932,6 +932,7 @@ jobs: id: pack_artifacts if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }} run: | + source "C:/Program Files (x86)/Intel/oneAPI/setvars.bat" intel64 --force echo "cp oneAPI running time dll files in ${ONEAPI_ROOT} to ./build/bin" cp ${{ ONEAPI_ROOT }}/mkl/latest/bin/mkl_sycl_blas.4.dll ./build/bin cp ${{ ONEAPI_ROOT }}/mkl/latest/bin/mkl_core.2.dlll ./build/bin From d2ca97bc898ac3cee44de2c067e7d872a873572a Mon Sep 17 00:00:00 2001 From: Zhang Date: Sun, 12 May 2024 16:17:32 +0800 Subject: [PATCH 5/6] fix path --- .github/workflows/build.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d6859a9802225..3a46a064728e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -900,7 +900,7 @@ jobs: env: WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/62641e01-1e8d-4ace-91d6-ae03f7f8a71f/w_BaseKit_p_2024.0.0.49563_offline.exe WINDOWS_DPCPP_MKL: intel.oneapi.win.cpp-dpcpp-common:intel.oneapi.win.mkl.devel - + ONEAPI_ROOT: "C:/Program Files (x86)/Intel/oneAPI" steps: - name: Clone id: checkout @@ -932,17 +932,16 @@ jobs: id: pack_artifacts if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }} run: | - source "C:/Program Files (x86)/Intel/oneAPI/setvars.bat" intel64 --force - echo "cp oneAPI running time dll files in ${ONEAPI_ROOT} to ./build/bin" - cp ${{ ONEAPI_ROOT }}/mkl/latest/bin/mkl_sycl_blas.4.dll ./build/bin - cp ${{ ONEAPI_ROOT }}/mkl/latest/bin/mkl_core.2.dlll ./build/bin - cp ${{ ONEAPI_ROOT }}/mkl/latest/bin/mkl_tbb_thread.2.dll ./build/bin - - cp ${{ ONEAPI_ROOT }}/compiler/latest/bin/pi_win_proxy_loader.dll ./build/bin - cp ${{ ONEAPI_ROOT }}/compiler/latest/bin/pi_level_zero.dll ./build/bin - cp ${{ ONEAPI_ROOT }}/compiler/latest/bin/sycl7.dll ./build/bin - cp ${{ ONEAPI_ROOT }}/compiler/latest/bin/svml_dispmd.dll ./build/bin - cp ${{ ONEAPI_ROOT }}/compiler/latest/bin/libmmd.dll ./build/bin + 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_core.2.dlll ./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/svml_dispmd.dll ./build/bin + cp ${{ env.ONEAPI_ROOT }}/compiler/latest/bin/libmmd.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 6cf75b27111eb8d533cb12ea1e8340f3049cdfa4 Mon Sep 17 00:00:00 2001 From: Zhang Date: Sun, 12 May 2024 19:55:15 +0800 Subject: [PATCH 6/6] fix path --- .github/workflows/build.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3a46a064728e1..7b05fff0b724d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -932,16 +932,16 @@ jobs: id: pack_artifacts if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }} 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_core.2.dlll ./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/svml_dispmd.dll ./build/bin - cp ${{ env.ONEAPI_ROOT }}/compiler/latest/bin/libmmd.dll ./build/bin + 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_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/svml_dispmd.dll" ./build/bin + cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/libmmd.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/*