Skip to content

Commit df36a71

Browse files
committed
Fix Windows ROCm tarball extraction and compiler paths
- Add --strip-components=1 to tar to remove top-level directory (therock-dist-windows-gfx1151-7.11.0rc2/) - Update clang/clang++ paths to lib/llvm/bin/ (actual location in tarball) - Clang is at lib/llvm/bin/clang.exe, not bin/clang.exe - This matches the actual directory structure of the extracted tarball
1 parent d59988d commit df36a71

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

.github/workflows/build.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
Invoke-WebRequest -Uri "https://repo.amd.com/rocm/tarball/therock-dist-windows-gfx1151-${{ env.ROCM_VERSION }}.tar.gz" -OutFile "${env:RUNNER_TEMP}\rocm.tar.gz"
7777
write-host "Extracting ROCm tarball"
7878
mkdir C:\TheRock\build -Force
79-
tar -xzf "${env:RUNNER_TEMP}\rocm.tar.gz" -C C:\TheRock\build
79+
tar -xzf "${env:RUNNER_TEMP}\rocm.tar.gz" -C C:\TheRock\build --strip-components=1
8080
write-host "Completed ROCm extraction"
8181
8282
- name: Setup ROCm Environment
@@ -93,17 +93,16 @@ jobs:
9393
run: |
9494
mkdir build
9595
cd build
96-
$env:CMAKE_PREFIX_PATH="${env:HIP_PATH};${env:HIP_PATH}\lib\cmake\hip"
9796
cmake .. `
9897
-G "Unix Makefiles" `
98+
-DCMAKE_PREFIX_PATH="${env:HIP_PATH}" `
9999
-DSD_HIPBLAS=ON `
100100
-DSD_BUILD_SHARED_LIBS=ON `
101101
-DGGML_NATIVE=OFF `
102-
-DCMAKE_C_COMPILER=clang `
103-
-DCMAKE_CXX_COMPILER=clang++ `
104-
-DCMAKE_HIP_COMPILER="${env:HIP_PATH}\bin\clang.exe" `
102+
-DCMAKE_C_COMPILER="${env:HIP_PATH}\lib\llvm\bin\clang.exe" `
103+
-DCMAKE_CXX_COMPILER="${env:HIP_PATH}\lib\llvm\bin\clang++.exe" `
104+
-DCMAKE_HIP_COMPILER="${env:HIP_PATH}\lib\llvm\bin\clang.exe" `
105105
-DHIP_PATH="${env:HIP_PATH}" `
106-
-DHIP_DIR="${env:HIP_PATH}\lib\cmake\hip" `
107106
-DCMAKE_BUILD_TYPE=Release `
108107
-DGPU_TARGETS="${{ env.GPU_TARGETS }}"
109108
cmake --build . --config Release --parallel ${env:NUMBER_OF_PROCESSORS}

0 commit comments

Comments
 (0)