Skip to content

Commit 231deeb

Browse files
CISCCISC
authored
update workflows
1 parent 09fbe80 commit 231deeb

File tree

3 files changed

+40
-70
lines changed

3 files changed

+40
-70
lines changed

‎.github/actions/ubuntu-vulkan-cache/action.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ runs:
1010
steps:
1111
- name: Get latest Vulkan SDK version
1212
id: vulkan_sdk_version
13+
shell: bash
1314
run: |
1415
echo "VULKAN_SDK_VERSION=$(curl https://vulkan.lunarg.com/sdk/latest/linux.txt)" >> "$GITHUB_ENV"
1516

‎.github/workflows/build-linux-cross.yml‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -257,32 +257,15 @@ jobs:
257257
ubuntu-24-riscv64-cpu-spacemit-ime-cross:
258258
runs-on: ubuntu-24.04
259259

260-
env:
261-
SPACEMIT_IME_TOOLCHAIN_VERSION: "1.1.2"
262-
SPACEMIT_IME_TOOLCHAIN_PATH: "spacemit-toolchain-linux-glibc-x86_64"
263-
264260
steps:
265261
- uses: actions/checkout@v4
266262

267-
- name: Cache Toolchain
268-
uses: actions/cache@v4
269-
id: cache-spacemit-ime-cross-toolchain
270-
with:
271-
path: ./${{ env.SPACEMIT_IME_TOOLCHAIN_PATH }}
272-
key: ${{ runner.os }}-spacemit-ime-toolchain-v${{ env.SPACEMIT_IME_TOOLCHAIN_VERSION }}
273-
274-
- name: Setup Toolchain
275-
if: steps.cache-spacemit-ime-cross-toolchain.outputs.cache-hit != 'true'
276-
run: |
277-
wget --quiet --no-check-certificate https://archive.spacemit.com/toolchain/spacemit-toolchain-linux-glibc-x86_64-v${{ env.SPACEMIT_IME_TOOLCHAIN_VERSION }}.tar.xz -O ${{ env.SPACEMIT_IME_TOOLCHAIN_PATH }}.tar.xz
278-
rm -rf ${{ env.SPACEMIT_IME_TOOLCHAIN_PATH }}
279-
mkdir -p ${{ env.SPACEMIT_IME_TOOLCHAIN_PATH }}
280-
tar xf ${{ env.SPACEMIT_IME_TOOLCHAIN_PATH }}.tar.xz -C ${{ env.SPACEMIT_IME_TOOLCHAIN_PATH }} --strip-components=1
281-
rm -rf ${{ env.SPACEMIT_IME_TOOLCHAIN_PATH }}.tar.xz
263+
- name: Use SpacemiT Toolchain Cache
264+
uses: ./.github/actions/ubuntu-spacemit-cache
282265

283266
- name: Build
284267
run: |
285-
export RISCV_ROOT_PATH=${PWD}/${{ env.SPACEMIT_IME_TOOLCHAIN_PATH }}
268+
export RISCV_ROOT_PATH=${PWD}/spacemit_toolchain
286269
cmake -B build -DLLAMA_CURL=OFF \
287270
-DCMAKE_BUILD_TYPE=Release \
288271
-DGGML_OPENMP=OFF \

‎.github/workflows/build.yml‎

Lines changed: 36 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
ctest -L 'main|curl' --verbose --timeout 900
9898
9999
macOS-latest-cmake-x64:
100-
runs-on: macos-13
100+
runs-on: macos-15-intel
101101

102102
steps:
103103
- name: Clone
@@ -207,7 +207,7 @@ jobs:
207207
- name: ccache
208208
uses: ggml-org/ccache-action@v1.2.16
209209
with:
210-
key: ubuntu-cpu-cmake
210+
key: ubuntu-cpu-cmake-${{ matrix.build }}
211211
evict-old-files: 1d
212212

213213
- name: Build Dependencies
@@ -362,11 +362,11 @@ jobs:
362362
id: checkout
363363
uses: actions/checkout@v4
364364

365-
- name: ccache
366-
uses: ggml-org/ccache-action@v1.2.16
367-
with:
368-
key: ubuntu-latest-cmake-rpc
369-
evict-old-files: 1d
365+
# - name: ccache
366+
# uses: ggml-org/ccache-action@v1.2.16
367+
# with:
368+
# key: ubuntu-latest-cmake-rpc
369+
# evict-old-files: 1d
370370

371371
- name: Dependencies
372372
id: depends
@@ -387,8 +387,9 @@ jobs:
387387
cd build
388388
ctest -L main --verbose
389389
390-
ubuntu-22-cmake-vulkan:
391-
runs-on: ubuntu-22.04
390+
ubuntu-24-cmake-vulkan:
391+
runs-on: ubuntu-24.04
392+
needs: build-cache
392393

393394
steps:
394395
- name: Clone
@@ -398,20 +399,24 @@ jobs:
398399
- name: ccache
399400
uses: ggml-org/ccache-action@v1.2.16
400401
with:
401-
key: ubuntu-22-cmake-vulkan
402+
key: ubuntu-24-cmake-vulkan
402403
evict-old-files: 1d
403404

404405
- name: Dependencies
405406
id: depends
406407
run: |
407-
wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
408-
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list https://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list
408+
sudo add-apt-repository -y ppa:kisak/kisak-mesa
409409
sudo apt-get update -y
410-
sudo apt-get install -y build-essential mesa-vulkan-drivers vulkan-sdk libcurl4-openssl-dev
410+
sudo apt-get install -y build-essential mesa-vulkan-drivers libxcb-xinput0 libxcb-xinerama0 libxcb-cursor-dev libcurl4-openssl-dev
411+
412+
- name: Use Vulkan SDK Cache
413+
id: cache_vulkan_sdk
414+
uses: ./.github/actions/ubuntu-vulkan-cache
411415

412416
- name: Build
413417
id: cmake_build
414418
run: |
419+
source ./vulkan_sdk/setup-env.sh
415420
cmake -B build \
416421
-DGGML_VULKAN=ON
417422
cmake --build build --config Release -j $(nproc)
@@ -421,6 +426,7 @@ jobs:
421426
run: |
422427
cd build
423428
export GGML_VK_VISIBLE_DEVICES=0
429+
export GGML_VK_DISABLE_F16=1
424430
# This is using llvmpipe and runs slower than other backends
425431
ctest -L main --verbose --timeout 4200
426432
@@ -487,7 +493,7 @@ jobs:
487493
id: depends
488494
run: |
489495
sudo apt-get update
490-
sudo apt-get install -y build-essential git cmake rocblas-dev hipblas-dev libcurl4-openssl-dev
496+
sudo apt-get install -y build-essential git cmake rocblas-dev hipblas-dev libcurl4-openssl-dev rocwmma-dev
491497
492498
- name: ccache
493499
uses: ggml-org/ccache-action@v1.2.16
@@ -1059,7 +1065,7 @@ jobs:
10591065
shell: bash
10601066

10611067
env:
1062-
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/7cd9bba0-7aab-4e30-b3ae-2221006a4a05/intel-oneapi-base-toolkit-2025.1.1.34_offline.exe
1068+
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/24751ead-ddc5-4479-b9e6-f9fe2ff8b9f2/intel-deep-learning-essentials-2025.2.1.25_offline.exe
10631069
WINDOWS_DPCPP_MKL: intel.oneapi.win.cpp-dpcpp-common:intel.oneapi.win.mkl.devel:intel.oneapi.win.dnnl:intel.oneapi.win.tbb.devel
10641070
ONEAPI_ROOT: "C:/Program Files (x86)/Intel/oneAPI"
10651071
steps:
@@ -1097,38 +1103,16 @@ jobs:
10971103
id: checkout
10981104
uses: actions/checkout@v4
10991105

1100-
- name: Clone rocWMMA repository
1101-
id: clone_rocwmma
1106+
- name: Grab rocWMMA package
1107+
id: grab_rocwmma
11021108
run: |
1103-
git clone https://github.com/rocm/rocwmma --branch rocm-${{ env.ROCM_VERSION }} --depth 1
1109+
curl -o rocwmma.deb "https://repo.radeon.com/rocm/apt/${{ env.ROCM_VERSION }}/pool/main/r/rocwmma-dev/rocwmma-dev_1.7.0.60402-120~24.04_amd64.deb"
1110+
7z x rocwmma.deb
1111+
7z x data.tar
11041112
1105-
- name: Cache ROCm Installation
1113+
- name: Use ROCm Installation Cache
11061114
id: cache-rocm
1107-
uses: actions/cache@v4
1108-
with:
1109-
path: C:\Program Files\AMD\ROCm
1110-
key: rocm-${{ env.HIPSDK_INSTALLER_VERSION }}-${{ runner.os }}
1111-
1112-
- name: Install ROCm
1113-
if: steps.cache-rocm.outputs.cache-hit != 'true'
1114-
id: depends
1115-
run: |
1116-
$ErrorActionPreference = "Stop"
1117-
write-host "Downloading AMD HIP SDK Installer"
1118-
Invoke-WebRequest -Uri "https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-${{ env.HIPSDK_INSTALLER_VERSION }}-WinSvr2022-For-HIP.exe" -OutFile "${env:RUNNER_TEMP}\rocm-install.exe"
1119-
write-host "Installing AMD HIP SDK"
1120-
$proc = Start-Process "${env:RUNNER_TEMP}\rocm-install.exe" -ArgumentList '-install' -NoNewWindow -PassThru
1121-
$completed = $proc.WaitForExit(600000)
1122-
if (-not $completed) {
1123-
Write-Error "ROCm installation timed out after 10 minutes. Killing the process"
1124-
$proc.Kill()
1125-
exit 1
1126-
}
1127-
if ($proc.ExitCode -ne 0) {
1128-
Write-Error "ROCm installation failed with exit code $($proc.ExitCode)"
1129-
exit 1
1130-
}
1131-
write-host "Completed AMD HIP SDK installation"
1115+
uses: ./.github/actions/windows-rocm-cache
11321116

11331117
- name: Verify ROCm
11341118
id: verify
@@ -1161,8 +1145,9 @@ jobs:
11611145
cmake -G "Unix Makefiles" -B build -S . `
11621146
-DCMAKE_C_COMPILER="${env:HIP_PATH}\bin\clang.exe" `
11631147
-DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" `
1164-
-DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/rocwmma/library/include/" `
1148+
-DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/opt/rocm-${{ env.ROCM_VERSION }}/include/" `
11651149
-DCMAKE_BUILD_TYPE=Release `
1150+
-DROCM_DIR="${env:HIP_PATH}" `
11661151
-DGGML_HIP=ON `
11671152
-DGGML_HIP_ROCWMMA_FATTN=ON `
11681153
-DGGML_RPC=ON `
@@ -1222,11 +1207,12 @@ jobs:
12221207
- name: Clone
12231208
uses: actions/checkout@v4
12241209

1225-
- name: ccache
1226-
uses: ggml-org/ccache-action@v1.2.16
1227-
with:
1228-
key: android-build
1229-
evict-old-files: 1d
1210+
# Disabled due to size (400MB) and always 0 cache hits
1211+
# - name: ccache
1212+
# uses: ggml-org/ccache-action@v1.2.16
1213+
# with:
1214+
# key: android-build
1215+
# evict-old-files: 1d
12301216

12311217
- name: Set up JDK
12321218
uses: actions/setup-java@v3

0 commit comments

Comments
 (0)