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

Enable RPC builds and merge PR 15405 across Dockerfiles

Browse Source
This commit is contained in:
Donato Capitella
2025-11-16 07:54:49 +00:00
parent 67fb3a002b
commit 9de07b1d25
15 changed files with 77 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolboxes/Dockerfile.rocm-6.4.2
+5
View File
@@ -14,13 +14,18 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
# build + install # build + install
RUN git clean -xdf \ RUN git clean -xdf \
&& git config user.email "builder@localhost" \
&& git config user.name "Container Builder" \
&& git pull \ && git pull \
&& git fetch origin pull/15405/head:pr-15405 \
&& git merge --no-edit pr-15405 \
&& git submodule update --recursive \ && git submodule update --recursive \
&& HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \ && HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \
cmake -S . -B build \ cmake -S . -B build \
-DGGML_HIP=ON \ -DGGML_HIP=ON \
-DAMDGPU_TARGETS=gfx1151 \ -DAMDGPU_TARGETS=gfx1151 \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DGGML_RPC=ON \
-DLLAMA_HIP_UMA=ON \ -DLLAMA_HIP_UMA=ON \
&& cmake --build build --config Release -- -j$(nproc) \ && cmake --build build --config Release -- -j$(nproc) \
&& cmake --install build --config Release && cmake --install build --config Release
toolboxes/Dockerfile.rocm-6.4.2-rocwmma
+5
View File
@@ -20,13 +20,18 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
# build + install # build + install
RUN git clean -xdf \ RUN git clean -xdf \
&& git config user.email "builder@localhost" \
&& git config user.name "Container Builder" \
&& git pull \ && git pull \
&& git fetch origin pull/15405/head:pr-15405 \
&& git merge --no-edit pr-15405 \
&& git submodule update --recursive \ && git submodule update --recursive \
&& HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \ && HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \
cmake -S . -B build \ cmake -S . -B build \
-DGGML_HIP=ON \ -DGGML_HIP=ON \
-DAMDGPU_TARGETS=gfx1151 \ -DAMDGPU_TARGETS=gfx1151 \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DGGML_RPC=ON \
-DLLAMA_HIP_UMA=ON \ -DLLAMA_HIP_UMA=ON \
-DGGML_HIP_ROCWMMA_FATTN=ON \ -DGGML_HIP_ROCWMMA_FATTN=ON \
&& cmake --build build --config Release -- -j$(nproc) \ && cmake --build build --config Release -- -j$(nproc) \
toolboxes/Dockerfile.rocm-6.4.3
+5
View File
@@ -38,12 +38,17 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
# build # build
RUN git clean -xdf \ RUN git clean -xdf \
&& git config user.email "builder@localhost" \
&& git config user.name "Container Builder" \
&& git pull \ && git pull \
&& git fetch origin pull/15405/head:pr-15405 \
&& git merge --no-edit pr-15405 \
&& git submodule update --recursive \ && git submodule update --recursive \
&& cmake -S . -B build \ && cmake -S . -B build \
-DGGML_HIP=ON \ -DGGML_HIP=ON \
-DAMDGPU_TARGETS=gfx1151 \ -DAMDGPU_TARGETS=gfx1151 \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DGGML_RPC=ON \
-DLLAMA_HIP_UMA=ON \ -DLLAMA_HIP_UMA=ON \
-DROCM_PATH=/opt/rocm \ -DROCM_PATH=/opt/rocm \
-DHIP_PATH=/opt/rocm \ -DHIP_PATH=/opt/rocm \
toolboxes/Dockerfile.rocm-6.4.3-rocwmma
+5
View File
@@ -44,12 +44,17 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
# build # build
RUN git clean -xdf \ RUN git clean -xdf \
&& git config user.email "builder@localhost" \
&& git config user.name "Container Builder" \
&& git pull \ && git pull \
&& git fetch origin pull/15405/head:pr-15405 \
&& git merge --no-edit pr-15405 \
&& git submodule update --recursive \ && git submodule update --recursive \
&& cmake -S . -B build \ && cmake -S . -B build \
-DGGML_HIP=ON \ -DGGML_HIP=ON \
-DAMDGPU_TARGETS=gfx1151 \ -DAMDGPU_TARGETS=gfx1151 \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DGGML_RPC=ON \
-DLLAMA_HIP_UMA=ON \ -DLLAMA_HIP_UMA=ON \
-DGGML_HIP_ROCWMMA_FATTN=ON \ -DGGML_HIP_ROCWMMA_FATTN=ON \
-DROCM_PATH=/opt/rocm \ -DROCM_PATH=/opt/rocm \
toolboxes/Dockerfile.rocm-6.4.4
+5
View File
@@ -38,12 +38,17 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
# build # build
RUN git clean -xdf \ RUN git clean -xdf \
&& git config user.email "builder@localhost" \
&& git config user.name "Container Builder" \
&& git pull \ && git pull \
&& git fetch origin pull/15405/head:pr-15405 \
&& git merge --no-edit pr-15405 \
&& git submodule update --recursive \ && git submodule update --recursive \
&& cmake -S . -B build \ && cmake -S . -B build \
-DGGML_HIP=ON \ -DGGML_HIP=ON \
-DAMDGPU_TARGETS=gfx1151 \ -DAMDGPU_TARGETS=gfx1151 \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DGGML_RPC=ON \
-DLLAMA_HIP_UMA=ON \ -DLLAMA_HIP_UMA=ON \
-DROCM_PATH=/opt/rocm \ -DROCM_PATH=/opt/rocm \
-DHIP_PATH=/opt/rocm \ -DHIP_PATH=/opt/rocm \
toolboxes/Dockerfile.rocm-6.4.4-rocwmma
+9 -1
View File
@@ -41,6 +41,14 @@ RUN chmod +x build-rocwmma.sh && ./build-rocwmma.sh
WORKDIR /opt/llama.cpp WORKDIR /opt/llama.cpp
RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
RUN git clean -xdf \
&& git config user.email "builder@localhost" \
&& git config user.name "Container Builder" \
&& git pull \
&& git fetch origin pull/15405/head:pr-15405 \
&& git merge --no-edit pr-15405 \
&& git submodule update --recursive
# overwrite upstream header with our local fixed version # overwrite upstream header with our local fixed version
COPY ggml/src/ggml-cuda/hip_shfl_fix.h /opt/llama.cpp/ggml/src/ggml-cuda/hip_shfl_fix.h COPY ggml/src/ggml-cuda/hip_shfl_fix.h /opt/llama.cpp/ggml/src/ggml-cuda/hip_shfl_fix.h
@@ -54,6 +62,7 @@ RUN set -euo pipefail \
-DGGML_HIP=ON \ -DGGML_HIP=ON \
-DAMDGPU_TARGETS=gfx1151 \ -DAMDGPU_TARGETS=gfx1151 \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DGGML_RPC=ON \
-DLLAMA_HIP_UMA=ON \ -DLLAMA_HIP_UMA=ON \
-DGGML_HIP_ROCWMMA_FATTN=ON \ -DGGML_HIP_ROCWMMA_FATTN=ON \
-DROCM_PATH=/opt/rocm \ -DROCM_PATH=/opt/rocm \
@@ -120,4 +129,3 @@ RUN printf '%s\n' \
# shell # shell
CMD ["/bin/bash"] CMD ["/bin/bash"]
toolboxes/Dockerfile.rocm-7.1
+5
View File
@@ -38,12 +38,17 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
# build # build
RUN git clean -xdf \ RUN git clean -xdf \
&& git config user.email "builder@localhost" \
&& git config user.name "Container Builder" \
&& git pull \ && git pull \
&& git fetch origin pull/15405/head:pr-15405 \
&& git merge --no-edit pr-15405 \
&& git submodule update --recursive \ && git submodule update --recursive \
&& cmake -S . -B build \ && cmake -S . -B build \
-DGGML_HIP=ON \ -DGGML_HIP=ON \
-DAMDGPU_TARGETS=gfx1151 \ -DAMDGPU_TARGETS=gfx1151 \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DGGML_RPC=ON \
-DLLAMA_HIP_UMA=ON \ -DLLAMA_HIP_UMA=ON \
-DGGML_CUDA_ENABLE_UNIFIED_MEMORY=ON \ -DGGML_CUDA_ENABLE_UNIFIED_MEMORY=ON \
-DROCM_PATH=/opt/rocm \ -DROCM_PATH=/opt/rocm \
toolboxes/Dockerfile.rocm-7.1-rocwmma
+5
View File
@@ -47,12 +47,17 @@ RUN chmod +x /opt/apply-rocwmma-fix.sh && /opt/apply-rocwmma-fix.sh /opt/llama.c
# build # build
RUN git clean -xdf \ RUN git clean -xdf \
&& git config user.email "builder@localhost" \
&& git config user.name "Container Builder" \
&& git pull \ && git pull \
&& git fetch origin pull/15405/head:pr-15405 \
&& git merge --no-edit pr-15405 \
&& git submodule update --recursive \ && git submodule update --recursive \
&& cmake -S . -B build \ && cmake -S . -B build \
-DGGML_HIP=ON \ -DGGML_HIP=ON \
-DAMDGPU_TARGETS=gfx1151 \ -DAMDGPU_TARGETS=gfx1151 \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DGGML_RPC=ON \
-DLLAMA_HIP_UMA=ON \ -DLLAMA_HIP_UMA=ON \
-DGGML_CUDA_ENABLE_UNIFIED_MEMORY=ON \ -DGGML_CUDA_ENABLE_UNIFIED_MEMORY=ON \
-DGGML_HIP_ROCWMMA_FATTN=ON \ -DGGML_HIP_ROCWMMA_FATTN=ON \
toolboxes/Dockerfile.rocm-7alpha
+5
View File
@@ -56,12 +56,17 @@ RUN printf '%s\n' \
WORKDIR /opt/llama.cpp WORKDIR /opt/llama.cpp
RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
&& git clean -xdf \ && git clean -xdf \
&& git config user.email "builder@localhost" \
&& git config user.name "Container Builder" \
&& git fetch origin pull/15405/head:pr-15405 \
&& git merge --no-edit pr-15405 \
&& git submodule update --recursive && git submodule update --recursive
RUN cmake -S . -B build \ RUN cmake -S . -B build \
-DGGML_HIP=ON \ -DGGML_HIP=ON \
-DAMDGPU_TARGETS=gfx1151 \ -DAMDGPU_TARGETS=gfx1151 \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DGGML_RPC=ON \
-DLLAMA_HIP_UMA=ON \ -DLLAMA_HIP_UMA=ON \
&& cmake --build build --config Release -- -j$(nproc) \ && cmake --build build --config Release -- -j$(nproc) \
&& cmake --install build --config Release && cmake --install build --config Release
toolboxes/Dockerfile.rocm-7alpha-rocwmma
+4
View File
@@ -60,6 +60,10 @@ RUN chmod +x build-rocwmma.sh && ./build-rocwmma.sh
WORKDIR /opt/llama.cpp WORKDIR /opt/llama.cpp
RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
&& git clean -xdf \ && git clean -xdf \
&& git config user.email "builder@localhost" \
&& git config user.name "Container Builder" \
&& git fetch origin pull/15405/head:pr-15405 \
&& git merge --no-edit pr-15405 \
&& git submodule update --recursive && git submodule update --recursive
COPY ./apply-rocwmma-fix.sh /opt/apply-rocwmma-fix.sh 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
toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved
+4
View File
@@ -60,6 +60,10 @@ RUN chmod +x build-rocwmma.sh && ./build-rocwmma.sh
WORKDIR /opt/llama.cpp WORKDIR /opt/llama.cpp
RUN git clone --recursive https://github.com/hjc4869/llama.cpp.git . \ RUN git clone --recursive https://github.com/hjc4869/llama.cpp.git . \
&& git clean -xdf \ && git clean -xdf \
&& git config user.email "builder@localhost" \
&& git config user.name "Container Builder" \
&& git fetch origin pull/15405/head:pr-15405 \
&& git merge --no-edit pr-15405 \
&& git submodule update --recursive && git submodule update --recursive
COPY ./apply-rocwmma-fix.sh /opt/apply-rocwmma-fix.sh 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
toolboxes/Dockerfile.rocm-7beta
+5
View File
@@ -37,13 +37,18 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
# build # build
RUN git clean -xdf \ RUN git clean -xdf \
&& git config user.email "builder@localhost" \
&& git config user.name "Container Builder" \
&& git pull \ && git pull \
&& git fetch origin pull/15405/head:pr-15405 \
&& git merge --no-edit pr-15405 \
&& git submodule update --recursive \ && git submodule update --recursive \
&& HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \ && HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \
cmake -S . -B build \ cmake -S . -B build \
-DGGML_HIP=ON \ -DGGML_HIP=ON \
-DAMDGPU_TARGETS=gfx1151 \ -DAMDGPU_TARGETS=gfx1151 \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DGGML_RPC=ON \
-DLLAMA_HIP_UMA=ON \ -DLLAMA_HIP_UMA=ON \
&& cmake --build build --config Release -- -j$(nproc) \ && cmake --build build --config Release -- -j$(nproc) \
&& cmake --install build --config Release && cmake --install build --config Release
toolboxes/Dockerfile.rocm-7rc
+5
View File
@@ -55,12 +55,17 @@ RUN printf '%s\n' \
WORKDIR /opt/llama.cpp WORKDIR /opt/llama.cpp
RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
&& git clean -xdf \ && git clean -xdf \
&& git config user.email "builder@localhost" \
&& git config user.name "Container Builder" \
&& git fetch origin pull/15405/head:pr-15405 \
&& git merge --no-edit pr-15405 \
&& git submodule update --recursive && git submodule update --recursive
RUN cmake -S . -B build \ RUN cmake -S . -B build \
-DGGML_HIP=ON \ -DGGML_HIP=ON \
-DAMDGPU_TARGETS=gfx1151 \ -DAMDGPU_TARGETS=gfx1151 \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DGGML_RPC=ON \
-DLLAMA_HIP_UMA=ON \ -DLLAMA_HIP_UMA=ON \
&& cmake --build build --config Release -- -j$(nproc) \ && cmake --build build --config Release -- -j$(nproc) \
&& cmake --install build --config Release && cmake --install build --config Release
toolboxes/Dockerfile.vulkan-amdvlk
+5
View File
@@ -21,11 +21,16 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
# build # build
RUN git clean -xdf \ RUN git clean -xdf \
&& git config user.email "builder@localhost" \
&& git config user.name "Container Builder" \
&& git pull \ && git pull \
&& git fetch origin pull/15405/head:pr-15405 \
&& git merge --no-edit pr-15405 \
&& git submodule update --recursive \ && git submodule update --recursive \
&& cmake -S . -B build -G Ninja \ && cmake -S . -B build -G Ninja \
-DGGML_VULKAN=ON \ -DGGML_VULKAN=ON \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DGGML_RPC=ON \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DLLAMA_BUILD_TESTS=OFF \ -DLLAMA_BUILD_TESTS=OFF \
-DLLAMA_BUILD_EXAMPLES=ON \ -DLLAMA_BUILD_EXAMPLES=ON \
toolboxes/Dockerfile.vulkan-radv
+5
View File
@@ -15,11 +15,16 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
# build # build
RUN git clean -xdf \ RUN git clean -xdf \
&& git config user.email "builder@localhost" \
&& git config user.name "Container Builder" \
&& git pull \ && git pull \
&& git fetch origin pull/15405/head:pr-15405 \
&& git merge --no-edit pr-15405 \
&& git submodule update --recursive \ && git submodule update --recursive \
&& cmake -S . -B build -G Ninja \ && cmake -S . -B build -G Ninja \
-DGGML_VULKAN=ON \ -DGGML_VULKAN=ON \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DGGML_RPC=ON \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DLLAMA_BUILD_TESTS=OFF \ -DLLAMA_BUILD_TESTS=OFF \
-DLLAMA_BUILD_EXAMPLES=ON \ -DLLAMA_BUILD_EXAMPLES=ON \