Dropping PR 15405 (llama.cpp RPC experimental improvement) due to compile issue

toolboxes/Dockerfile.rocm-6.4.2

@@ -14,11 +14,6 @@ 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 \

toolboxes/Dockerfile.rocm-6.4.2-rocwmma

@@ -20,11 +20,6 @@ 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 \

toolboxes/Dockerfile.rocm-6.4.3

@@ -38,11 +38,6 @@ 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 \

toolboxes/Dockerfile.rocm-6.4.3-rocwmma

@@ -44,11 +44,6 @@ 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 \

toolboxes/Dockerfile.rocm-6.4.4

@@ -38,11 +38,6 @@ 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 \

toolboxes/Dockerfile.rocm-6.4.4-rocwmma

@@ -42,11 +42,6 @@ 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

toolboxes/Dockerfile.rocm-7.1

@@ -38,11 +38,6 @@ 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 \

toolboxes/Dockerfile.rocm-7.1-rocwmma

@@ -47,11 +47,6 @@ 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 \

toolboxes/Dockerfile.rocm-7alpha

@@ -56,10 +56,6 @@ 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 \

toolboxes/Dockerfile.rocm-7alpha-rocwmma

@@ -60,10 +60,6 @@ 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

toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved

@@ -60,10 +60,6 @@ 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

toolboxes/Dockerfile.rocm-7beta

@@ -37,11 +37,6 @@ 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 \

toolboxes/Dockerfile.rocm-7rc

@@ -55,10 +55,6 @@ 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 \

toolboxes/Dockerfile.rocm-7rc-rocwmma

@@ -60,10 +60,6 @@ WORKDIR /opt/llama.cpp
 RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
  && git clean -xdf \
  && git submodule update --recursive \
- && 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
 
 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

toolboxes/Dockerfile.vulkan-amdvlk

@@ -21,11 +21,6 @@ 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 \

toolboxes/Dockerfile.vulkan-radv

@@ -15,11 +15,6 @@ 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 \