From 7e583193d02e6fd00a91f8f5114e4d20e074c65e Mon Sep 17 00:00:00 2001 From: Donato Capitella Date: Sun, 16 Nov 2025 10:04:39 +0000 Subject: [PATCH] migrated to fedora 43 from rawhide to fix build issues --- toolboxes/Dockerfile.rocm-6.4.4 | 12 ++++++++++-- toolboxes/Dockerfile.rocm-6.4.4-rocwmma | 8 ++++++++ toolboxes/Dockerfile.rocm-7.1 | 13 ++++++++++--- toolboxes/Dockerfile.rocm-7.1-rocwmma | 13 ++++++++++--- toolboxes/Dockerfile.rocm-7alpha | 12 ++++++++++-- toolboxes/Dockerfile.rocm-7alpha-rocwmma | 12 ++++++++++-- toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved | 12 ++++++++++-- toolboxes/Dockerfile.rocm-7rc | 12 ++++++++++-- toolboxes/Dockerfile.rocm-7rc-rocwmma | 12 ++++++++++-- toolboxes/Dockerfile.vulkan-amdvlk | 12 ++++++++++-- toolboxes/Dockerfile.vulkan-radv | 12 ++++++++++-- 11 files changed, 108 insertions(+), 22 deletions(-) diff --git a/toolboxes/Dockerfile.rocm-6.4.4 b/toolboxes/Dockerfile.rocm-6.4.4 index c25c7db..3b38397 100644 --- a/toolboxes/Dockerfile.rocm-6.4.4 +++ b/toolboxes/Dockerfile.rocm-6.4.4 @@ -1,5 +1,7 @@ # build stage -FROM registry.fedoraproject.org/fedora:rawhide AS builder +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' @@ -38,6 +40,12 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . # build RUN git clean -xdf \ + && if [ "${APPLY_LLAMA_PR_15405}" = "1" ]; then \ + 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; \ + fi \ && git submodule update --recursive \ && cmake -S . -B build \ -DGGML_HIP=ON \ @@ -63,7 +71,7 @@ RUN chmod +x /usr/local/bin/gguf-vram-estimator.py # runtime stage -FROM registry.fedoraproject.org/fedora-minimal:rawhide +FROM registry.fedoraproject.org/fedora-minimal:43 # rocm 6.4.3 repo RUN <<'EOF' diff --git a/toolboxes/Dockerfile.rocm-6.4.4-rocwmma b/toolboxes/Dockerfile.rocm-6.4.4-rocwmma index a60b490..8a4d38d 100644 --- a/toolboxes/Dockerfile.rocm-6.4.4-rocwmma +++ b/toolboxes/Dockerfile.rocm-6.4.4-rocwmma @@ -1,5 +1,7 @@ # 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' @@ -42,6 +44,12 @@ 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 \ + 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; \ + fi \ && git submodule update --recursive # overwrite upstream header with our local fixed version diff --git a/toolboxes/Dockerfile.rocm-7.1 b/toolboxes/Dockerfile.rocm-7.1 index 8182b60..d9cf7d0 100644 --- a/toolboxes/Dockerfile.rocm-7.1 +++ b/toolboxes/Dockerfile.rocm-7.1 @@ -1,5 +1,7 @@ # build stage -FROM registry.fedoraproject.org/fedora:rawhide AS builder +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' @@ -38,6 +40,12 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . # build RUN git clean -xdf \ + && if [ "${APPLY_LLAMA_PR_15405}" = "1" ]; then \ + 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; \ + fi \ && git submodule update --recursive \ && cmake -S . -B build \ -DGGML_HIP=ON \ @@ -62,7 +70,7 @@ COPY gguf-vram-estimator.py /usr/local/bin/gguf-vram-estimator.py RUN chmod +x /usr/local/bin/gguf-vram-estimator.py # runtime stage -FROM registry.fedoraproject.org/fedora-minimal:rawhide +FROM registry.fedoraproject.org/fedora-minimal:43 # rocm 7.1 repo RUN <<'EOF' @@ -108,4 +116,3 @@ RUN printf '%s\n' \ # shell CMD ["/bin/bash"] - diff --git a/toolboxes/Dockerfile.rocm-7.1-rocwmma b/toolboxes/Dockerfile.rocm-7.1-rocwmma index da2734e..3a69fc1 100644 --- a/toolboxes/Dockerfile.rocm-7.1-rocwmma +++ b/toolboxes/Dockerfile.rocm-7.1-rocwmma @@ -1,5 +1,7 @@ # build stage -FROM registry.fedoraproject.org/fedora:rawhide AS builder +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' @@ -47,6 +49,12 @@ 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 \ + 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; \ + fi \ && git submodule update --recursive \ && cmake -S . -B build \ -DGGML_HIP=ON \ @@ -73,7 +81,7 @@ RUN chmod +x /usr/local/bin/gguf-vram-estimator.py # runtime stage -FROM registry.fedoraproject.org/fedora-minimal:rawhide +FROM registry.fedoraproject.org/fedora-minimal:43 # rocm 7.1 repo RUN <<'EOF' @@ -119,4 +127,3 @@ RUN printf '%s\n' \ # shell CMD ["/bin/bash"] - diff --git a/toolboxes/Dockerfile.rocm-7alpha b/toolboxes/Dockerfile.rocm-7alpha index 842e0e9..99a8898 100644 --- a/toolboxes/Dockerfile.rocm-7alpha +++ b/toolboxes/Dockerfile.rocm-7alpha @@ -1,5 +1,7 @@ # build -FROM registry.fedoraproject.org/fedora:rawhide AS builder +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 \ @@ -56,6 +58,12 @@ 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 \ + 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; \ + fi \ && git submodule update --recursive RUN cmake -S . -B build \ @@ -74,7 +82,7 @@ RUN find /opt/rocm-7.0 -type f -name '*.a' -delete \ && rm -rf /opt/llama.cpp # runtime -FROM registry.fedoraproject.org/fedora-minimal:rawhide +FROM registry.fedoraproject.org/fedora-minimal:43 RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \ bash ca-certificates libatomic libstdc++ libgcc radeontop vim \ diff --git a/toolboxes/Dockerfile.rocm-7alpha-rocwmma b/toolboxes/Dockerfile.rocm-7alpha-rocwmma index 3f3a795..b82c3ca 100644 --- a/toolboxes/Dockerfile.rocm-7alpha-rocwmma +++ b/toolboxes/Dockerfile.rocm-7alpha-rocwmma @@ -1,5 +1,7 @@ # build -FROM registry.fedoraproject.org/fedora:rawhide AS builder +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 \ @@ -60,6 +62,12 @@ 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 \ + 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; \ + 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 @@ -74,7 +82,7 @@ RUN cmake -S . -B build \ && cmake --install build --config Release # runtime -FROM registry.fedoraproject.org/fedora-minimal:rawhide +FROM registry.fedoraproject.org/fedora-minimal:43 RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \ bash ca-certificates libatomic libstdc++ libgcc radeontop vim \ diff --git a/toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved b/toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved index b34dbf2..b43b9fb 100644 --- a/toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved +++ b/toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved @@ -1,5 +1,7 @@ # build -FROM registry.fedoraproject.org/fedora:rawhide AS builder +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 \ @@ -60,6 +62,12 @@ 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 \ + 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; \ + 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 @@ -74,7 +82,7 @@ RUN cmake -S . -B build \ && cmake --install build --config Release # runtime -FROM registry.fedoraproject.org/fedora-minimal:rawhide +FROM registry.fedoraproject.org/fedora-minimal:43 RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \ bash ca-certificates libatomic libstdc++ libgcc radeontop vim \ diff --git a/toolboxes/Dockerfile.rocm-7rc b/toolboxes/Dockerfile.rocm-7rc index 11b27e6..0330028 100644 --- a/toolboxes/Dockerfile.rocm-7rc +++ b/toolboxes/Dockerfile.rocm-7rc @@ -1,5 +1,7 @@ # build -FROM registry.fedoraproject.org/fedora:rawhide AS builder +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 \ @@ -55,6 +57,12 @@ 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 \ + 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; \ + fi \ && git submodule update --recursive RUN cmake -S . -B build \ @@ -73,7 +81,7 @@ RUN find /opt/rocm-7.0 -type f -name '*.a' -delete \ && rm -rf /opt/llama.cpp # runtime -FROM registry.fedoraproject.org/fedora-minimal:rawhide +FROM registry.fedoraproject.org/fedora-minimal:43 RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \ bash ca-certificates libatomic libstdc++ libgcc radeontop vim \ diff --git a/toolboxes/Dockerfile.rocm-7rc-rocwmma b/toolboxes/Dockerfile.rocm-7rc-rocwmma index 7fa79a7..d5c560c 100644 --- a/toolboxes/Dockerfile.rocm-7rc-rocwmma +++ b/toolboxes/Dockerfile.rocm-7rc-rocwmma @@ -1,5 +1,7 @@ # build -FROM registry.fedoraproject.org/fedora:rawhide AS builder +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 \ @@ -59,6 +61,12 @@ 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 \ + 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; \ + fi \ && git submodule update --recursive COPY ./apply-rocwmma-fix.sh /opt/apply-rocwmma-fix.sh @@ -74,7 +82,7 @@ RUN cmake -S . -B build \ && cmake --install build --config Release # runtime -FROM registry.fedoraproject.org/fedora-minimal:rawhide +FROM registry.fedoraproject.org/fedora-minimal:43 RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \ bash ca-certificates libatomic libstdc++ libgcc radeontop vim \ diff --git a/toolboxes/Dockerfile.vulkan-amdvlk b/toolboxes/Dockerfile.vulkan-amdvlk index a4d9e37..042e6c5 100644 --- a/toolboxes/Dockerfile.vulkan-amdvlk +++ b/toolboxes/Dockerfile.vulkan-amdvlk @@ -1,5 +1,7 @@ # build stage -FROM registry.fedoraproject.org/fedora:rawhide AS builder +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 \ @@ -21,6 +23,12 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . # build RUN git clean -xdf \ + && if [ "${APPLY_LLAMA_PR_15405}" = "1" ]; then \ + 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; \ + fi \ && git submodule update --recursive \ && cmake -S . -B build -G Ninja \ -DGGML_VULKAN=ON \ @@ -43,7 +51,7 @@ RUN chmod +x /usr/local/bin/gguf-vram-estimator.py # runtime stage -FROM registry.fedoraproject.org/fedora-minimal:rawhide +FROM registry.fedoraproject.org/fedora-minimal:43 # runtime deps RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \ diff --git a/toolboxes/Dockerfile.vulkan-radv b/toolboxes/Dockerfile.vulkan-radv index a8c197f..da40a9f 100644 --- a/toolboxes/Dockerfile.vulkan-radv +++ b/toolboxes/Dockerfile.vulkan-radv @@ -1,5 +1,7 @@ # build stage -FROM registry.fedoraproject.org/fedora:rawhide AS builder +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 \ @@ -15,6 +17,12 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . # build RUN git clean -xdf \ + && if [ "${APPLY_LLAMA_PR_15405}" = "1" ]; then \ + 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; \ + fi \ && git submodule update --recursive \ && cmake -S . -B build -G Ninja \ -DGGML_VULKAN=ON \ @@ -37,7 +45,7 @@ RUN chmod +x /usr/local/bin/gguf-vram-estimator.py # runtime stage -FROM registry.fedoraproject.org/fedora-minimal:rawhide +FROM registry.fedoraproject.org/fedora-minimal:43 # runtime deps RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \