Skip to content

Commit 525cd2d

Browse files
committed
Merge branch 'master' into dev-refactoring
2 parents 31847c8 + 84d5475 commit 525cd2d

File tree

113 files changed

+17056
-13523
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+17056
-13523
lines changed

.github/workflows/build.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,7 @@ jobs:
467467
run: |
468468
cmake -B build -S . \
469469
-DCMAKE_HIP_COMPILER="$(hipconfig -l)/clang" \
470+
-DGGML_HIP_ROCWMMA_FATTN=ON \
470471
-DGGML_HIP=ON
471472
cmake --build build --config Release -j $(nproc)
472473
@@ -476,6 +477,7 @@ jobs:
476477
cmake -B build2 -S . \
477478
-DCMAKE_C_COMPILER=hipcc \
478479
-DCMAKE_CXX_COMPILER=hipcc \
480+
-DGGML_HIP_ROCWMMA_FATTN=ON \
479481
-DGGML_HIP=ON
480482
cmake --build build2 --config Release -j $(nproc)
481483
@@ -772,7 +774,7 @@ jobs:
772774
env:
773775
OPENBLAS_VERSION: 0.3.23
774776
SDE_VERSION: 9.33.0-2024-01-07
775-
VULKAN_VERSION: 1.3.261.1
777+
VULKAN_VERSION: 1.4.304.1
776778

777779
strategy:
778780
matrix:
@@ -1202,6 +1204,11 @@ jobs:
12021204
id: checkout
12031205
uses: actions/checkout@v4
12041206

1207+
- name: Clone rocWMMA repository
1208+
id: clone_rocwmma
1209+
run: |
1210+
git clone https://github.com/rocm/rocwmma --branch rocm-6.2.4 --depth 1
1211+
12051212
- name: Install
12061213
id: depends
12071214
run: |
@@ -1231,8 +1238,10 @@ jobs:
12311238
cmake -G "Unix Makefiles" -B build -S . `
12321239
-DCMAKE_C_COMPILER="${env:HIP_PATH}\bin\clang.exe" `
12331240
-DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" `
1241+
-DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/rocwmma/library/include/" `
12341242
-DCMAKE_BUILD_TYPE=Release `
12351243
-DGGML_HIP=ON `
1244+
-DGGML_HIP_ROCWMMA_FATTN=ON `
12361245
-DGGML_RPC=ON
12371246
cmake --build build -j ${env:NUMBER_OF_PROCESSORS}
12381247
@@ -1251,6 +1260,11 @@ jobs:
12511260
with:
12521261
fetch-depth: 0
12531262

1263+
- name: Clone rocWMMA repository
1264+
id: clone_rocwmma
1265+
run: |
1266+
git clone https://github.com/rocm/rocwmma --branch rocm-6.2.4 --depth 1
1267+
12541268
- name: ccache
12551269
uses: hendrikmuhs/[email protected]
12561270
with:
@@ -1280,8 +1294,10 @@ jobs:
12801294
cmake -G "Unix Makefiles" -B build -S . `
12811295
-DCMAKE_C_COMPILER="${env:HIP_PATH}\bin\clang.exe" `
12821296
-DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" `
1297+
-DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/rocwmma/library/include/" `
12831298
-DCMAKE_BUILD_TYPE=Release `
12841299
-DAMDGPU_TARGETS=${{ matrix.gpu_target }} `
1300+
-DGGML_HIP_ROCWMMA_FATTN=ON `
12851301
-DGGML_HIP=ON `
12861302
-DGGML_RPC=ON
12871303
cmake --build build -j ${env:NUMBER_OF_PROCESSORS}

0 commit comments

Comments
 (0)