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

remove manual application of RPC performance PR (this is merged into master now)

Browse Source
This commit is contained in:
Donato Capitella
2025-11-28 14:20:03 +00:00
parent cbfa74b25b
commit df54882433
12 changed files with 3 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build_and_publish.yml
+3 -45
View File
@@ -9,16 +9,10 @@ on:
Use "all" to build everything.
required: false
default: all
apply_llama_pr_15405:
description: >
Set to 0 to skip applying PR 15405 during the build (default applies it).
required: false
default: ""
env:
DOCKERHUB_REPO: docker.io/kyuz0/amd-strix-halo-toolboxes
LOCAL_PREFIX: llama
APPLY_LLAMA_PR_15405: ${{ github.event.inputs.apply_llama_pr_15405 }}
jobs:
# 1) Prepare a clean JSON array for the matrix
@@ -84,51 +78,15 @@ jobs:
run: |
set -euo pipefail
B="${{ matrix.backend }}"
APPLY_RAW="${APPLY_LLAMA_PR_15405:-}"
APPLY_INPUT="$(echo "${APPLY_RAW}" | tr -d '[:space:]')"
APPLY_VALUE=""
case "${APPLY_INPUT}" in
"")
echo "→ APPLY_LLAMA_PR_15405 not provided; using Dockerfile defaults for ${B}"
;;
0|1)
APPLY_VALUE="${APPLY_INPUT}"
;;
*)
echo "Invalid APPLY_LLAMA_PR_15405 value: '${APPLY_INPUT}'. Expected 0 or 1."
exit 1
;;
esac
BUILD_ARGS=()
NAME_SUFFIX=""
if [[ -n "${APPLY_VALUE}" ]]; then
BUILD_ARGS+=(--build-arg "APPLY_LLAMA_PR_15405=${APPLY_VALUE}")
if [[ "${APPLY_VALUE}" == "0" ]]; then
NAME_SUFFIX="-no-pr15405"
fi
fi
DF="Dockerfile.$B"
NAME="${B}${NAME_SUFFIX}"
NAME="${B}"
LI="${LOCAL_PREFIX}-${NAME}"
TAG="${NAME}_${BUILD_TS}"
IMM="${DOCKERHUB_REPO}:${TAG}"
CHN="${DOCKERHUB_REPO}:${NAME}"
if [[ -n "${APPLY_VALUE}" ]]; then
if [[ "${APPLY_VALUE}" == "1" ]]; then
echo "→ Building ${DF} with llama.cpp PR 15405 applied"
else
echo "→ Building ${DF} with llama.cpp PR 15405 skipped"
fi
else
echo "→ Building ${DF} using Dockerfile default PR behavior"
fi
echo "→ Docker build args: ${BUILD_ARGS[*]:-(default)}"
docker build --no-cache "${BUILD_ARGS[@]}" -t "${LI}" -f "${DF}" .
echo "→ Building ${DF}"
docker build --no-cache -t "${LI}" -f "${DF}" .
echo "→ Tag & push immutable → ${IMM}"
docker tag "${LI}" "${IMM}"
toolboxes/Dockerfile.rocm-6.4.4
-11
View File
@@ -1,7 +1,5 @@
# build stage
FROM registry.fedoraproject.org/fedora:43 AS builder
# Toggle llama.cpp PR 15405 (RPC perf for large models)
ARG APPLY_LLAMA_PR_15405=1
# rocm 6.4.3 repo
RUN <<'EOF'
@@ -40,15 +38,6 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
# build
RUN git clean -xdf \
&& if [ "${APPLY_LLAMA_PR_15405}" = "1" ]; then \
echo "Applying llama.cpp PR 15405"; \
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; \
else \
echo "Skipping llama.cpp PR 15405"; \
fi \
&& git submodule update --recursive \
&& cmake -S . -B build \
-DGGML_HIP=ON \
toolboxes/Dockerfile.rocm-6.4.4-rocwmma
-11
View File
@@ -1,7 +1,5 @@
# build stage
FROM registry.fedoraproject.org/fedora:43 AS builder
# Toggle llama.cpp PR 15405 (RPC perf for large models)
ARG APPLY_LLAMA_PR_15405=1
# rocm 6.4.4 repo
RUN <<'EOF'
@@ -44,15 +42,6 @@ WORKDIR /opt/llama.cpp
RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
RUN git clean -xdf \
&& if [ "${APPLY_LLAMA_PR_15405}" = "1" ]; then \
echo "Applying llama.cpp PR 15405"; \
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; \
else \
echo "Skipping llama.cpp PR 15405"; \
fi \
&& git submodule update --recursive
# overwrite upstream header with our local fixed version
toolboxes/Dockerfile.rocm-7.1
-11
View File
@@ -1,7 +1,5 @@
# build stage
FROM registry.fedoraproject.org/fedora:43 AS builder
# Toggle llama.cpp PR 15405 (RPC perf for large models)
ARG APPLY_LLAMA_PR_15405=1
# rocm 7.1 repo
RUN <<'EOF'
@@ -40,15 +38,6 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
# build
RUN git clean -xdf \
&& if [ "${APPLY_LLAMA_PR_15405}" = "1" ]; then \
echo "Applying llama.cpp PR 15405"; \
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; \
else \
echo "Skipping llama.cpp PR 15405"; \
fi \
&& git submodule update --recursive \
&& cmake -S . -B build \
-DGGML_HIP=ON \
toolboxes/Dockerfile.rocm-7.1-rocwmma
-11
View File
@@ -1,7 +1,5 @@
# build stage
FROM registry.fedoraproject.org/fedora:43 AS builder
# Toggle llama.cpp PR 15405 (RPC perf for large models)
ARG APPLY_LLAMA_PR_15405=1
# rocm 7.1 repo
RUN <<'EOF'
@@ -49,15 +47,6 @@ RUN chmod +x /opt/apply-rocwmma-fix.sh && /opt/apply-rocwmma-fix.sh /opt/llama.c
# build
RUN git clean -xdf \
&& if [ "${APPLY_LLAMA_PR_15405}" = "1" ]; then \
echo "Applying llama.cpp PR 15405"; \
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; \
else \
echo "Skipping llama.cpp PR 15405"; \
fi \
&& git submodule update --recursive \
&& cmake -S . -B build \
-DGGML_HIP=ON \
toolboxes/Dockerfile.rocm-7alpha
-11
View File
@@ -1,7 +1,5 @@
# build
FROM registry.fedoraproject.org/fedora:43 AS builder
# Toggle llama.cpp PR 15405 (RPC perf for large models)
ARG APPLY_LLAMA_PR_15405=1
RUN dnf -y --nodocs --setopt=install_weak_deps=False install \
make gcc cmake lld clang clang-devel compiler-rt libcurl-devel \
@@ -58,15 +56,6 @@ RUN printf '%s\n' \
WORKDIR /opt/llama.cpp
RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
&& git clean -xdf \
&& if [ "${APPLY_LLAMA_PR_15405}" = "1" ]; then \
echo "Applying llama.cpp PR 15405"; \
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; \
else \
echo "Skipping llama.cpp PR 15405"; \
fi \
&& git submodule update --recursive
RUN cmake -S . -B build \
toolboxes/Dockerfile.rocm-7alpha-rocwmma
-11
View File
@@ -1,7 +1,5 @@
# build
FROM registry.fedoraproject.org/fedora:43 AS builder
# Toggle llama.cpp PR 15405 (RPC perf for large models)
ARG APPLY_LLAMA_PR_15405=1
RUN dnf -y --nodocs --setopt=install_weak_deps=False install \
make gcc cmake lld clang clang-devel compiler-rt libcurl-devel \
@@ -62,15 +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 \
&& if [ "${APPLY_LLAMA_PR_15405}" = "1" ]; then \
echo "Applying llama.cpp PR 15405"; \
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; \
else \
echo "Skipping llama.cpp PR 15405"; \
fi \
&& 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
-11
View File
@@ -1,7 +1,5 @@
# build
FROM registry.fedoraproject.org/fedora:43 AS builder
# Toggle llama.cpp PR 15405 (RPC perf for large models)
ARG APPLY_LLAMA_PR_15405=0
RUN dnf -y --nodocs --setopt=install_weak_deps=False install \
make gcc cmake lld clang clang-devel compiler-rt libcurl-devel \
@@ -62,15 +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 \
&& if [ "${APPLY_LLAMA_PR_15405}" = "1" ]; then \
echo "Applying llama.cpp PR 15405"; \
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; \
else \
echo "Skipping llama.cpp PR 15405"; \
fi \
&& 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-7rc
-11
View File
@@ -1,7 +1,5 @@
# build
FROM registry.fedoraproject.org/fedora:43 AS builder
# Toggle llama.cpp PR 15405 (RPC perf for large models)
ARG APPLY_LLAMA_PR_15405=1
RUN dnf -y --nodocs --setopt=install_weak_deps=False install \
make gcc cmake lld clang clang-devel compiler-rt libcurl-devel \
@@ -57,15 +55,6 @@ RUN printf '%s\n' \
WORKDIR /opt/llama.cpp
RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
&& git clean -xdf \
&& if [ "${APPLY_LLAMA_PR_15405}" = "1" ]; then \
echo "Applying llama.cpp PR 15405"; \
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; \
else \
echo "Skipping llama.cpp PR 15405"; \
fi \
&& git submodule update --recursive
RUN cmake -S . -B build \
toolboxes/Dockerfile.rocm-7rc-rocwmma
-11
View File
@@ -1,7 +1,5 @@
# build
FROM registry.fedoraproject.org/fedora:43 AS builder
# Toggle llama.cpp PR 15405 (RPC perf for large models)
ARG APPLY_LLAMA_PR_15405=1
RUN dnf -y --nodocs --setopt=install_weak_deps=False install \
make gcc cmake lld clang clang-devel compiler-rt libcurl-devel \
@@ -61,15 +59,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 \
&& if [ "${APPLY_LLAMA_PR_15405}" = "1" ]; then \
echo "Applying llama.cpp PR 15405"; \
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; \
else \
echo "Skipping llama.cpp PR 15405"; \
fi \
&& git submodule update --recursive
COPY ./apply-rocwmma-fix.sh /opt/apply-rocwmma-fix.sh
toolboxes/Dockerfile.vulkan-amdvlk
-11
View File
@@ -1,7 +1,5 @@
# build stage
FROM registry.fedoraproject.org/fedora:43 AS builder
# Toggle llama.cpp PR 15405 (RPC perf for large models)
ARG APPLY_LLAMA_PR_15405=1
# deps
RUN dnf -y --nodocs --setopt=install_weak_deps=False install \
@@ -23,15 +21,6 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
# build
RUN git clean -xdf \
&& if [ "${APPLY_LLAMA_PR_15405}" = "1" ]; then \
echo "Applying llama.cpp PR 15405"; \
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; \
else \
echo "Skipping llama.cpp PR 15405"; \
fi \
&& git submodule update --recursive \
&& cmake -S . -B build -G Ninja \
-DGGML_VULKAN=ON \
toolboxes/Dockerfile.vulkan-radv
-11
View File
@@ -1,7 +1,5 @@
# build stage
FROM registry.fedoraproject.org/fedora:43 AS builder
# Toggle llama.cpp PR 15405 (RPC perf for large models)
ARG APPLY_LLAMA_PR_15405=1
# deps
RUN dnf -y --nodocs --setopt=install_weak_deps=False install \
@@ -17,15 +15,6 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
# build
RUN git clean -xdf \
&& if [ "${APPLY_LLAMA_PR_15405}" = "1" ]; then \
echo "Applying llama.cpp PR 15405"; \
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; \
else \
echo "Skipping llama.cpp PR 15405"; \
fi \
&& git submodule update --recursive \
&& cmake -S . -B build -G Ninja \
-DGGML_VULKAN=ON \