Skip to content

Commit 99e7e0f

Browse files
committed
CI: Properly install rocwmma for hip builds
on windows we now windows install rocwmma from ubuntu pacakges
1 parent 0124ac9 commit 99e7e0f

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ jobs:
487487
id: depends
488488
run: |
489489
sudo apt-get update
490-
sudo apt-get install -y build-essential git cmake rocblas-dev hipblas-dev libcurl4-openssl-dev
490+
sudo apt-get install -y build-essential git cmake rocblas-dev hipblas-dev libcurl4-openssl-dev rocwmma-dev
491491
492492
- name: ccache
493493
uses: ggml-org/[email protected]
@@ -1097,10 +1097,12 @@ jobs:
10971097
id: checkout
10981098
uses: actions/checkout@v4
10991099

1100-
- name: Clone rocWMMA repository
1101-
id: clone_rocwmma
1100+
- name: Grab rocWMMA package
1101+
id: grab_rocwmma
11021102
run: |
1103-
git clone https://github.com/rocm/rocwmma --branch rocm-${{ env.ROCM_VERSION }} --depth 1
1103+
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"
1104+
7z x rocwmma.deb
1105+
7z x data.tar
11041106
11051107
- name: Cache ROCm Installation
11061108
id: cache-rocm
@@ -1161,8 +1163,9 @@ jobs:
11611163
cmake -G "Unix Makefiles" -B build -S . `
11621164
-DCMAKE_C_COMPILER="${env:HIP_PATH}\bin\clang.exe" `
11631165
-DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" `
1164-
-DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/rocwmma/library/include/" `
1166+
-DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/opt/rocm-${{ env.ROCM_VERSION }}/include/" `
11651167
-DCMAKE_BUILD_TYPE=Release `
1168+
-DROCM_DIR="${env:HIP_PATH}" `
11661169
-DGGML_HIP=ON `
11671170
-DGGML_HIP_ROCWMMA_FATTN=ON `
11681171
-DGGML_RPC=ON `

.github/workflows/release.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -543,10 +543,12 @@ jobs:
543543
id: checkout
544544
uses: actions/checkout@v4
545545

546-
- name: Clone rocWMMA repository
547-
id: clone_rocwmma
546+
- name: Grab rocWMMA package
547+
id: grab_rocwmma
548548
run: |
549-
git clone https://github.com/rocm/rocwmma --branch develop --depth 1
549+
curl -o rocwmma.deb "https://repo.radeon.com/rocm/apt/7.0.1/pool/main/r/rocwmma-dev/rocwmma-dev_2.0.0.70001-42~24.04_amd64.deb"
550+
7z x rocwmma.deb
551+
7z x data.tar
550552
551553
- name: Cache ROCm Installation
552554
id: cache-rocm
@@ -601,7 +603,7 @@ jobs:
601603
cmake -G "Unix Makefiles" -B build -S . `
602604
-DCMAKE_C_COMPILER="${env:HIP_PATH}\bin\clang.exe" `
603605
-DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" `
604-
-DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/rocwmma/library/include/ -Wno-ignored-attributes -Wno-nested-anon-types" `
606+
-DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/opt/rocm-7.0.1/include/ -Wno-ignored-attributes -Wno-nested-anon-types" `
605607
-DCMAKE_BUILD_TYPE=Release `
606608
-DGGML_BACKEND_DL=ON `
607609
-DGGML_NATIVE=OFF `

0 commit comments

Comments
 (0)