From 9de07b1d25b722915bc18bc411cd30eea1b05838 Mon Sep 17 00:00:00 2001 From: Donato Capitella Date: Sun, 16 Nov 2025 07:54:49 +0000 Subject: [PATCH] Enable RPC builds and merge PR 15405 across Dockerfiles --- toolboxes/Dockerfile.rocm-6.4.2 | 5 +++++ toolboxes/Dockerfile.rocm-6.4.2-rocwmma | 5 +++++ toolboxes/Dockerfile.rocm-6.4.3 | 5 +++++ toolboxes/Dockerfile.rocm-6.4.3-rocwmma | 5 +++++ toolboxes/Dockerfile.rocm-6.4.4 | 5 +++++ toolboxes/Dockerfile.rocm-6.4.4-rocwmma | 10 +++++++++- toolboxes/Dockerfile.rocm-7.1 | 5 +++++ toolboxes/Dockerfile.rocm-7.1-rocwmma | 5 +++++ toolboxes/Dockerfile.rocm-7alpha | 5 +++++ toolboxes/Dockerfile.rocm-7alpha-rocwmma | 4 ++++ toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved | 4 ++++ toolboxes/Dockerfile.rocm-7beta | 5 +++++ toolboxes/Dockerfile.rocm-7rc | 5 +++++ toolboxes/Dockerfile.vulkan-amdvlk | 5 +++++ toolboxes/Dockerfile.vulkan-radv | 5 +++++ 15 files changed, 77 insertions(+), 1 deletion(-) diff --git a/toolboxes/Dockerfile.rocm-6.4.2 b/toolboxes/Dockerfile.rocm-6.4.2 index 3232c30..4e7cee2 100644 --- a/toolboxes/Dockerfile.rocm-6.4.2 +++ b/toolboxes/Dockerfile.rocm-6.4.2 @@ -14,13 +14,18 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . # build + install 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 \ && HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \ cmake -S . -B build \ -DGGML_HIP=ON \ -DAMDGPU_TARGETS=gfx1151 \ -DCMAKE_BUILD_TYPE=Release \ + -DGGML_RPC=ON \ -DLLAMA_HIP_UMA=ON \ && cmake --build build --config Release -- -j$(nproc) \ && cmake --install build --config Release diff --git a/toolboxes/Dockerfile.rocm-6.4.2-rocwmma b/toolboxes/Dockerfile.rocm-6.4.2-rocwmma index 7068e0a..78b478c 100644 --- a/toolboxes/Dockerfile.rocm-6.4.2-rocwmma +++ b/toolboxes/Dockerfile.rocm-6.4.2-rocwmma @@ -20,13 +20,18 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . # build + install 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 \ && HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \ cmake -S . -B build \ -DGGML_HIP=ON \ -DAMDGPU_TARGETS=gfx1151 \ -DCMAKE_BUILD_TYPE=Release \ + -DGGML_RPC=ON \ -DLLAMA_HIP_UMA=ON \ -DGGML_HIP_ROCWMMA_FATTN=ON \ && cmake --build build --config Release -- -j$(nproc) \ diff --git a/toolboxes/Dockerfile.rocm-6.4.3 b/toolboxes/Dockerfile.rocm-6.4.3 index 2f4a83c..c2ea70f 100644 --- a/toolboxes/Dockerfile.rocm-6.4.3 +++ b/toolboxes/Dockerfile.rocm-6.4.3 @@ -38,12 +38,17 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . # build 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 \ && cmake -S . -B build \ -DGGML_HIP=ON \ -DAMDGPU_TARGETS=gfx1151 \ -DCMAKE_BUILD_TYPE=Release \ + -DGGML_RPC=ON \ -DLLAMA_HIP_UMA=ON \ -DROCM_PATH=/opt/rocm \ -DHIP_PATH=/opt/rocm \ diff --git a/toolboxes/Dockerfile.rocm-6.4.3-rocwmma b/toolboxes/Dockerfile.rocm-6.4.3-rocwmma index e44fd19..6afd2b5 100644 --- a/toolboxes/Dockerfile.rocm-6.4.3-rocwmma +++ b/toolboxes/Dockerfile.rocm-6.4.3-rocwmma @@ -44,12 +44,17 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . # build 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 \ && cmake -S . -B build \ -DGGML_HIP=ON \ -DAMDGPU_TARGETS=gfx1151 \ -DCMAKE_BUILD_TYPE=Release \ + -DGGML_RPC=ON \ -DLLAMA_HIP_UMA=ON \ -DGGML_HIP_ROCWMMA_FATTN=ON \ -DROCM_PATH=/opt/rocm \ diff --git a/toolboxes/Dockerfile.rocm-6.4.4 b/toolboxes/Dockerfile.rocm-6.4.4 index f6cf9fe..fc5e037 100644 --- a/toolboxes/Dockerfile.rocm-6.4.4 +++ b/toolboxes/Dockerfile.rocm-6.4.4 @@ -38,12 +38,17 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . # build 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 \ && cmake -S . -B build \ -DGGML_HIP=ON \ -DAMDGPU_TARGETS=gfx1151 \ -DCMAKE_BUILD_TYPE=Release \ + -DGGML_RPC=ON \ -DLLAMA_HIP_UMA=ON \ -DROCM_PATH=/opt/rocm \ -DHIP_PATH=/opt/rocm \ diff --git a/toolboxes/Dockerfile.rocm-6.4.4-rocwmma b/toolboxes/Dockerfile.rocm-6.4.4-rocwmma index ba977f6..5a11424 100644 --- a/toolboxes/Dockerfile.rocm-6.4.4-rocwmma +++ b/toolboxes/Dockerfile.rocm-6.4.4-rocwmma @@ -41,6 +41,14 @@ RUN chmod +x build-rocwmma.sh && ./build-rocwmma.sh WORKDIR /opt/llama.cpp 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 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 \ -DAMDGPU_TARGETS=gfx1151 \ -DCMAKE_BUILD_TYPE=Release \ + -DGGML_RPC=ON \ -DLLAMA_HIP_UMA=ON \ -DGGML_HIP_ROCWMMA_FATTN=ON \ -DROCM_PATH=/opt/rocm \ @@ -120,4 +129,3 @@ RUN printf '%s\n' \ # shell CMD ["/bin/bash"] - diff --git a/toolboxes/Dockerfile.rocm-7.1 b/toolboxes/Dockerfile.rocm-7.1 index 63c14a9..40eff5b 100644 --- a/toolboxes/Dockerfile.rocm-7.1 +++ b/toolboxes/Dockerfile.rocm-7.1 @@ -38,12 +38,17 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . # build 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 \ && cmake -S . -B build \ -DGGML_HIP=ON \ -DAMDGPU_TARGETS=gfx1151 \ -DCMAKE_BUILD_TYPE=Release \ + -DGGML_RPC=ON \ -DLLAMA_HIP_UMA=ON \ -DGGML_CUDA_ENABLE_UNIFIED_MEMORY=ON \ -DROCM_PATH=/opt/rocm \ diff --git a/toolboxes/Dockerfile.rocm-7.1-rocwmma b/toolboxes/Dockerfile.rocm-7.1-rocwmma index d22a41d..a4422db 100644 --- a/toolboxes/Dockerfile.rocm-7.1-rocwmma +++ b/toolboxes/Dockerfile.rocm-7.1-rocwmma @@ -47,12 +47,17 @@ RUN chmod +x /opt/apply-rocwmma-fix.sh && /opt/apply-rocwmma-fix.sh /opt/llama.c # build 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 \ && cmake -S . -B build \ -DGGML_HIP=ON \ -DAMDGPU_TARGETS=gfx1151 \ -DCMAKE_BUILD_TYPE=Release \ + -DGGML_RPC=ON \ -DLLAMA_HIP_UMA=ON \ -DGGML_CUDA_ENABLE_UNIFIED_MEMORY=ON \ -DGGML_HIP_ROCWMMA_FATTN=ON \ diff --git a/toolboxes/Dockerfile.rocm-7alpha b/toolboxes/Dockerfile.rocm-7alpha index b6bd81e..6482ddd 100644 --- a/toolboxes/Dockerfile.rocm-7alpha +++ b/toolboxes/Dockerfile.rocm-7alpha @@ -56,12 +56,17 @@ RUN printf '%s\n' \ WORKDIR /opt/llama.cpp RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \ && 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 RUN cmake -S . -B build \ -DGGML_HIP=ON \ -DAMDGPU_TARGETS=gfx1151 \ -DCMAKE_BUILD_TYPE=Release \ + -DGGML_RPC=ON \ -DLLAMA_HIP_UMA=ON \ && cmake --build build --config Release -- -j$(nproc) \ && cmake --install build --config Release diff --git a/toolboxes/Dockerfile.rocm-7alpha-rocwmma b/toolboxes/Dockerfile.rocm-7alpha-rocwmma index 3f3a795..df4eca5 100644 --- a/toolboxes/Dockerfile.rocm-7alpha-rocwmma +++ b/toolboxes/Dockerfile.rocm-7alpha-rocwmma @@ -60,6 +60,10 @@ RUN chmod +x build-rocwmma.sh && ./build-rocwmma.sh WORKDIR /opt/llama.cpp RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \ && 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 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 diff --git a/toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved b/toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved index b34dbf2..16be308 100644 --- a/toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved +++ b/toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved @@ -60,6 +60,10 @@ RUN chmod +x build-rocwmma.sh && ./build-rocwmma.sh WORKDIR /opt/llama.cpp RUN git clone --recursive https://github.com/hjc4869/llama.cpp.git . \ && 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 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 diff --git a/toolboxes/Dockerfile.rocm-7beta b/toolboxes/Dockerfile.rocm-7beta index 6f02f93..46aa581 100644 --- a/toolboxes/Dockerfile.rocm-7beta +++ b/toolboxes/Dockerfile.rocm-7beta @@ -37,13 +37,18 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . # build 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 \ && HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \ cmake -S . -B build \ -DGGML_HIP=ON \ -DAMDGPU_TARGETS=gfx1151 \ -DCMAKE_BUILD_TYPE=Release \ + -DGGML_RPC=ON \ -DLLAMA_HIP_UMA=ON \ && cmake --build build --config Release -- -j$(nproc) \ && cmake --install build --config Release diff --git a/toolboxes/Dockerfile.rocm-7rc b/toolboxes/Dockerfile.rocm-7rc index 29084fb..d666dd7 100644 --- a/toolboxes/Dockerfile.rocm-7rc +++ b/toolboxes/Dockerfile.rocm-7rc @@ -55,12 +55,17 @@ RUN printf '%s\n' \ WORKDIR /opt/llama.cpp RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \ && 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 RUN cmake -S . -B build \ -DGGML_HIP=ON \ -DAMDGPU_TARGETS=gfx1151 \ -DCMAKE_BUILD_TYPE=Release \ + -DGGML_RPC=ON \ -DLLAMA_HIP_UMA=ON \ && cmake --build build --config Release -- -j$(nproc) \ && cmake --install build --config Release diff --git a/toolboxes/Dockerfile.vulkan-amdvlk b/toolboxes/Dockerfile.vulkan-amdvlk index 58595c0..e7053e9 100644 --- a/toolboxes/Dockerfile.vulkan-amdvlk +++ b/toolboxes/Dockerfile.vulkan-amdvlk @@ -21,11 +21,16 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . # build 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 \ && cmake -S . -B build -G Ninja \ -DGGML_VULKAN=ON \ -DCMAKE_BUILD_TYPE=Release \ + -DGGML_RPC=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLLAMA_BUILD_TESTS=OFF \ -DLLAMA_BUILD_EXAMPLES=ON \ diff --git a/toolboxes/Dockerfile.vulkan-radv b/toolboxes/Dockerfile.vulkan-radv index d522d27..42668e2 100644 --- a/toolboxes/Dockerfile.vulkan-radv +++ b/toolboxes/Dockerfile.vulkan-radv @@ -15,11 +15,16 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . # build 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 \ && cmake -S . -B build -G Ninja \ -DGGML_VULKAN=ON \ -DCMAKE_BUILD_TYPE=Release \ + -DGGML_RPC=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLLAMA_BUILD_TESTS=OFF \ -DLLAMA_BUILD_EXAMPLES=ON \