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

make PR-15405 application explicit in logs

Browse Source
This commit is contained in:
Donato Capitella
2025-11-25 10:02:32 +00:00
parent 5105f6cf10
commit 1b5ced1255
12 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build_and_publish.yml
+30 -5
View File
@@ -84,13 +84,28 @@ jobs:
run: |
set -euo pipefail
B="${{ matrix.backend }}"
APPLY_INPUT="${APPLY_LLAMA_PR_15405:-}"
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_INPUT}" ]]; then
BUILD_ARGS+=(--build-arg "APPLY_LLAMA_PR_15405=${APPLY_INPUT}")
if [[ "${APPLY_INPUT}" == "0" ]]; then
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
@@ -102,7 +117,17 @@ jobs:
IMM="${DOCKERHUB_REPO}:${TAG}"
CHN="${DOCKERHUB_REPO}:${NAME}"
echo "→ Building ${DF}"
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 "→ Tag & push immutable → ${IMM}"
toolboxes/Dockerfile.rocm-6.4.4
+3
View File
@@ -41,10 +41,13 @@ 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 \
toolboxes/Dockerfile.rocm-6.4.4-rocwmma
+3
View File
@@ -45,10 +45,13 @@ 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
toolboxes/Dockerfile.rocm-7.1
+3
View File
@@ -41,10 +41,13 @@ 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 \
toolboxes/Dockerfile.rocm-7.1-rocwmma
+3
View File
@@ -50,10 +50,13 @@ 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 \
toolboxes/Dockerfile.rocm-7alpha
+3
View File
@@ -59,10 +59,13 @@ 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
toolboxes/Dockerfile.rocm-7alpha-rocwmma
+3
View File
@@ -63,10 +63,13 @@ 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.rocm-7alpha-rocwmma-improved
+3
View File
@@ -63,10 +63,13 @@ 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
toolboxes/Dockerfile.rocm-7rc
+3
View File
@@ -58,10 +58,13 @@ 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
toolboxes/Dockerfile.rocm-7rc-rocwmma
+3
View File
@@ -62,10 +62,13 @@ 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
toolboxes/Dockerfile.vulkan-amdvlk
+3
View File
@@ -24,10 +24,13 @@ 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 \
toolboxes/Dockerfile.vulkan-radv
+3
View File
@@ -18,10 +18,13 @@ 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 \