Skip to content

Commit 5a89877

Browse files
[SYCL] Fix building Win package for oneAPI 2025.0 update (ggml-org#10483)
* fix build package for 2025.0 * debug * debug * fix * rm debug --------- Co-authored-by: arthw <[email protected]>
1 parent d9d54e4 commit 5a89877

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

.github/workflows/build.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ jobs:
952952

953953
env:
954954
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/b380d914-366b-4b77-a74a-05e3c38b3514/intel-oneapi-base-toolkit-2025.0.0.882_offline.exe
955-
WINDOWS_DPCPP_MKL: intel.oneapi.win.cpp-dpcpp-common:intel.oneapi.win.mkl.devel
955+
WINDOWS_DPCPP_MKL: intel.oneapi.win.cpp-dpcpp-common:intel.oneapi.win.mkl.devel:intel.oneapi.win.dnnl:intel.oneapi.win.tbb.devel
956956
ONEAPI_ROOT: "C:/Program Files (x86)/Intel/oneAPI"
957957
steps:
958958
- name: Clone
@@ -962,7 +962,8 @@ jobs:
962962
fetch-depth: 0
963963

964964
- name: Install
965-
run: scripts/install-oneapi.bat $WINDOWS_BASEKIT_URL $WINDOWS_DPCPP_MKL
965+
run: |
966+
scripts/install-oneapi.bat $WINDOWS_BASEKIT_URL $WINDOWS_DPCPP_MKL
966967
967968
- name: Build
968969
id: cmake_build
@@ -981,27 +982,34 @@ jobs:
981982
echo "name=${SAFE_NAME}-b${BUILD_NUMBER}-${SHORT_HASH}" >> $GITHUB_OUTPUT
982983
fi
983984
984-
- name: Pack artifacts
985+
- name: Build the release package
985986
id: pack_artifacts
986-
if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
987+
if: ${{ ( github.event_name == 'pull_request' && github.base_ref == 'master' ) }}
987988
run: |
988989
echo "cp oneAPI running time dll files in ${{ env.ONEAPI_ROOT }} to ./build/bin"
990+
989991
cp "${{ env.ONEAPI_ROOT }}/mkl/latest/bin/mkl_sycl_blas.5.dll" ./build/bin
990992
cp "${{ env.ONEAPI_ROOT }}/mkl/latest/bin/mkl_core.2.dll" ./build/bin
991993
cp "${{ env.ONEAPI_ROOT }}/mkl/latest/bin/mkl_tbb_thread.2.dll" ./build/bin
992994
995+
cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/ur_adapter_level_zero.dll" ./build/bin
996+
cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/ur_adapter_opencl.dll" ./build/bin
993997
cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/ur_loader.dll" ./build/bin
994998
cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/ur_win_proxy_loader.dll" ./build/bin
995-
cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/ur_adapter_level_zero.dll" ./build/bin
999+
9961000
cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/sycl8.dll" ./build/bin
9971001
cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/svml_dispmd.dll" ./build/bin
9981002
cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/libmmd.dll" ./build/bin
9991003
cp "${{ env.ONEAPI_ROOT }}/compiler/latest/bin/libiomp5md.dll" ./build/bin
1004+
1005+
cp "${{ env.ONEAPI_ROOT }}/dnnl/latest/bin/dnnl.dll" ./build/bin
1006+
cp "${{ env.ONEAPI_ROOT }}/tbb/latest/bin/tbb12.dll" ./build/bin
1007+
10001008
echo "cp oneAPI running time dll files to ./build/bin done"
10011009
7z a llama-${{ steps.tag.outputs.name }}-bin-win-sycl-x64.zip ./build/bin/*
10021010
1003-
- name: Upload artifacts
1004-
if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
1011+
- name: Upload the release package
1012+
if: ${{ ( github.event_name == 'pull_request' && github.base_ref == 'master' ) }}
10051013
uses: actions/upload-artifact@v4
10061014
with:
10071015
path: llama-${{ steps.tag.outputs.name }}-bin-win-sycl-x64.zip

0 commit comments

Comments
 (0)