Skip to content

Commit a0e13dc

Browse files
authored
build: fix the build failures of Windows HIP release job (ggml-org#15984)
* build: fix the cache keys for Windows HIP release job Update the cache keys to include the HIP SDK version, preventing the use of outdated ROCm installation caches. * build: sync changes from release.yml to build.yml - Update HIP SDK version to 25.Q3 and ROCm version to 6.4.2 - Update the cache keys to reflect the new versions * build: remove Windows HIP release for gfx1151 since the current stable rocWMMA does not support gfx1151.
1 parent a14bd35 commit a0e13dc

File tree

2 files changed

+20
-14
lines changed

2 files changed

+20
-14
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ jobs:
127127
-DCMAKE_BUILD_RPATH="@loader_path" \
128128
-DLLAMA_FATAL_WARNINGS=ON \
129129
-DGGML_METAL=OFF \
130-
-DGGML_RPC=ON
130+
-DGGML_RPC=ON \
131+
-DCMAKE_OSX_DEPLOYMENT_TARGET=13.3
131132
cmake --build build --config Release -j $(sysctl -n hw.logicalcpu)
132133
133134
- name: Test
@@ -1051,9 +1052,13 @@ jobs:
10511052
run: examples/sycl/win-build-sycl.bat
10521053

10531054
windows-latest-cmake-hip:
1054-
if: ${{ github.event.inputs.create_release != 'true' }}
10551055
runs-on: windows-2022
10561056

1057+
env:
1058+
# The ROCm version must correspond to the version used in the HIP SDK.
1059+
ROCM_VERSION: "6.4.2"
1060+
HIPSDK_INSTALLER_VERSION: "25.Q3"
1061+
10571062
steps:
10581063
- name: Clone
10591064
id: checkout
@@ -1062,24 +1067,22 @@ jobs:
10621067
- name: Clone rocWMMA repository
10631068
id: clone_rocwmma
10641069
run: |
1065-
git clone https://github.com/rocm/rocwmma --branch rocm-6.2.4 --depth 1
1070+
git clone https://github.com/rocm/rocwmma --branch rocm-${{ env.ROCM_VERSION }} --depth 1
10661071
10671072
- name: Cache ROCm Installation
10681073
id: cache-rocm
10691074
uses: actions/cache@v4
10701075
with:
10711076
path: C:\Program Files\AMD\ROCm
1072-
key: rocm-6.1-${{ runner.os }}-v1
1073-
restore-keys: |
1074-
rocm-6.1-${{ runner.os }}-
1077+
key: rocm-${{ env.HIPSDK_INSTALLER_VERSION }}-${{ runner.os }}
10751078

10761079
- name: Install ROCm
10771080
if: steps.cache-rocm.outputs.cache-hit != 'true'
10781081
id: depends
10791082
run: |
10801083
$ErrorActionPreference = "Stop"
10811084
write-host "Downloading AMD HIP SDK Installer"
1082-
Invoke-WebRequest -Uri "https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-24.Q3-WinSvr2022-For-HIP.exe" -OutFile "${env:RUNNER_TEMP}\rocm-install.exe"
1085+
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"
10831086
write-host "Installing AMD HIP SDK"
10841087
$proc = Start-Process "${env:RUNNER_TEMP}\rocm-install.exe" -ArgumentList '-install' -NoNewWindow -PassThru
10851088
$completed = $proc.WaitForExit(600000)

.github/workflows/release.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -529,11 +529,16 @@ jobs:
529529
windows-hip:
530530
runs-on: windows-2022
531531

532+
env:
533+
# The ROCm version must correspond to the version used in the HIP SDK.
534+
ROCM_VERSION: "6.4.2"
535+
HIPSDK_INSTALLER_VERSION: "25.Q3"
536+
532537
strategy:
533538
matrix:
534539
include:
535540
- name: "radeon"
536-
gpu_targets: "gfx1200;gfx1201;gfx1151;gfx1100;gfx1101;gfx1102;gfx1030;gfx1031;gfx1032"
541+
gpu_targets: "gfx1200;gfx1201;gfx1100;gfx1101;gfx1102;gfx1030;gfx1031;gfx1032"
537542

538543
steps:
539544
- name: Clone
@@ -543,21 +548,19 @@ jobs:
543548
- name: Clone rocWMMA repository
544549
id: clone_rocwmma
545550
run: |
546-
git clone https://github.com/rocm/rocwmma --branch rocm-6.2.4 --depth 1
551+
git clone https://github.com/rocm/rocwmma --branch rocm-${{ env.ROCM_VERSION }} --depth 1
547552
548553
- name: Cache ROCm Installation
549554
id: cache-rocm
550555
uses: actions/cache@v4
551556
with:
552557
path: C:\Program Files\AMD\ROCm
553-
key: rocm-6.1-${{ runner.os }}-v1
554-
restore-keys: |
555-
rocm-6.1-${{ runner.os }}-
558+
key: rocm-${{ env.HIPSDK_INSTALLER_VERSION }}-${{ runner.os }}
556559

557560
- name: ccache
558561
uses: ggml-org/[email protected]
559562
with:
560-
key: windows-latest-cmake-hip-${{ matrix.name }}-x64
563+
key: windows-latest-cmake-hip-${{ env.HIPSDK_INSTALLER_VERSION }}-${{ matrix.name }}-x64
561564
evict-old-files: 1d
562565

563566
- name: Install ROCm
@@ -566,7 +569,7 @@ jobs:
566569
run: |
567570
$ErrorActionPreference = "Stop"
568571
write-host "Downloading AMD HIP SDK Installer"
569-
Invoke-WebRequest -Uri "https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-25.Q3-WinSvr2022-For-HIP.exe" -OutFile "${env:RUNNER_TEMP}\rocm-install.exe"
572+
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"
570573
write-host "Installing AMD HIP SDK"
571574
$proc = Start-Process "${env:RUNNER_TEMP}\rocm-install.exe" -ArgumentList '-install' -NoNewWindow -PassThru
572575
$completed = $proc.WaitForExit(600000)

0 commit comments

Comments
 (0)