julian/amd-strix-halo-toolboxes
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Force-include HIP shuffle shim to fix missing __shfl_sync on gfx1151 builds

Browse Source
This commit is contained in:
Donato Capitella
2025-11-12 10:16:34 +00:00
parent b6de7881dd
commit 42bbc2301e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolboxes/Dockerfile.rocm-6.4.4-rocwmma
+5 -4
View File
@@ -46,7 +46,8 @@ COPY ./apply-rocwmma-fix.sh /opt/apply-rocwmma-fix.sh
RUN chmod +x /opt/apply-rocwmma-fix.sh && /opt/apply-rocwmma-fix.sh /opt/llama.cpp RUN chmod +x /opt/apply-rocwmma-fix.sh && /opt/apply-rocwmma-fix.sh /opt/llama.cpp
# build # build
RUN git clean -xdf \ RUN set -euo pipefail \
&& git clean -xdf \
&& git pull \ && git pull \
&& git submodule update --recursive \ && git submodule update --recursive \
&& cat > /opt/llama.cpp/ggml/src/ggml-cuda/hip_shfl_fix.h <<'EOF' && cat > /opt/llama.cpp/ggml/src/ggml-cuda/hip_shfl_fix.h <<'EOF'
@@ -65,8 +66,8 @@ RUN git clean -xdf \
#endif #endif
#endif #endif
EOF EOF
&& f=/opt/llama.cpp/ggml/src/ggml-cuda/mma.cuh \ # remove any old inline hack you had in mma.cuh (safe if absent)
&& grep -q 'hip_shfl_fix.h' "$f" || sed -i '1i #include "hip_shfl_fix.h"' "$f" \ && sed -i '/HIP_HAS_SHFL_SYNC_FUNCS/,+20d' /opt/llama.cpp/ggml/src/ggml-cuda/mma.cuh || true \
&& cmake -S . -B build \ && cmake -S . -B build \
-DGGML_HIP=ON \ -DGGML_HIP=ON \
-DAMDGPU_TARGETS=gfx1151 \ -DAMDGPU_TARGETS=gfx1151 \
@@ -76,7 +77,7 @@ EOF
-DROCM_PATH=/opt/rocm \ -DROCM_PATH=/opt/rocm \
-DHIP_PATH=/opt/rocm \ -DHIP_PATH=/opt/rocm \
-DHIP_PLATFORM=amd \ -DHIP_PLATFORM=amd \
-DCMAKE_HIP_FLAGS="--rocm-path=/opt/rocm" \ -DCMAKE_HIP_FLAGS="--rocm-path=/opt/rocm -include /opt/llama.cpp/ggml/src/ggml-cuda/hip_shfl_fix.h -Wno-macro-redefined" \
&& cmake --build build --config Release -- -j"$(nproc)" \ && cmake --build build --config Release -- -j"$(nproc)" \
&& cmake --install build --config Release && cmake --install build --config Release