Skip to content

Commit 6984edd

Browse files
committed
attempt to restore ROCm build
1 parent c87c26c commit 6984edd

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ jobs:
164164
defines: "-DGGML_NATIVE=OFF -DGGML_AVX512=ON -DGGML_AVX=ON -DGGML_AVX2=ON -DSD_BUILD_SHARED_LIBS=ON"
165165
- build: "cuda12"
166166
defines: "-DSD_CUDA=ON -DSD_BUILD_SHARED_LIBS=ON -DCMAKE_CUDA_ARCHITECTURES=90;89;80;75"
167-
# - build: "rocm5.5"
168-
# defines: '-G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DSD_HIPBLAS=ON -DCMAKE_BUILD_TYPE=Release -DAMDGPU_TARGETS="gfx1100;gfx1102;gfx1030" -DSD_BUILD_SHARED_LIBS=ON'
167+
- build: "rocm6.2"
168+
defines: '-G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DSD_HIPBLAS=ON -DCMAKE_BUILD_TYPE=Release -DAMDGPU_TARGETS="gfx1100;gfx1101;gfx1102;gfx1030;gfx1031;gfx1032" -DSD_BUILD_SHARED_LIBS=ON'
169169
- build: "vulkan"
170170
defines: "-DSD_VULKAN=ON -DSD_BUILD_SHARED_LIBS=ON"
171171
steps:
@@ -186,14 +186,14 @@ jobs:
186186

187187
- name: Install rocm-toolkit
188188
id: rocm-toolkit
189-
if: ${{ matrix.build == 'rocm5.5' }}
189+
if: ${{ matrix.build == 'rocm6.2' }}
190190
uses: Cyberhan123/rocm-toolkit@v0.1.0
191191
with:
192-
rocm: "5.5.0"
192+
rocm: "6.2.4"
193193

194194
- name: Install Ninja
195195
id: install-ninja
196-
if: ${{ matrix.build == 'rocm5.5' }}
196+
if: ${{ matrix.build == 'rocm6.2' }}
197197
uses: urkle/action-get-ninja@v1
198198
with:
199199
version: 1.11.1

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ endif ()
5555
if (SD_HIPBLAS)
5656
message("-- Use HIPBLAS as backend stable-diffusion")
5757
set(GGML_HIP ON)
58+
set(GGML_HIP_ROCWMMA_FATTN ON)
59+
set(GGML_BACKEND_DL ON)
5860
add_definitions(-DSD_USE_CUDA)
5961
if(SD_FAST_SOFTMAX)
6062
set(GGML_CUDA_FAST_SOFTMAX ON)

0 commit comments

Comments
 (0)