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

migrated to fedora 43 from rawhide to fix build issues

Browse Source
This commit is contained in:
Donato Capitella
2025-11-16 10:04:39 +00:00
parent a164b2308b
commit 7e583193d0
11 changed files with 108 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolboxes/Dockerfile.rocm-6.4.4
+10 -2
View File
@@ -1,5 +1,7 @@
# build stage # 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 # rocm 6.4.3 repo
RUN <<'EOF' RUN <<'EOF'
@@ -38,6 +40,12 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
# build # build
RUN git clean -xdf \ 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 \ && git submodule update --recursive \
&& cmake -S . -B build \ && cmake -S . -B build \
-DGGML_HIP=ON \ -DGGML_HIP=ON \
@@ -63,7 +71,7 @@ RUN chmod +x /usr/local/bin/gguf-vram-estimator.py
# runtime stage # runtime stage
FROM registry.fedoraproject.org/fedora-minimal:rawhide FROM registry.fedoraproject.org/fedora-minimal:43
# rocm 6.4.3 repo # rocm 6.4.3 repo
RUN <<'EOF' RUN <<'EOF'
toolboxes/Dockerfile.rocm-6.4.4-rocwmma
+8
View File
@@ -1,5 +1,7 @@
# build stage # build stage
FROM registry.fedoraproject.org/fedora:43 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.4 repo # rocm 6.4.4 repo
RUN <<'EOF' RUN <<'EOF'
@@ -42,6 +44,12 @@ WORKDIR /opt/llama.cpp
RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
RUN git clean -xdf \ 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 && git submodule update --recursive
# overwrite upstream header with our local fixed version # overwrite upstream header with our local fixed version
toolboxes/Dockerfile.rocm-7.1
+10 -3
View File
@@ -1,5 +1,7 @@
# build stage # 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 # rocm 7.1 repo
RUN <<'EOF' RUN <<'EOF'
@@ -38,6 +40,12 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
# build # build
RUN git clean -xdf \ 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 \ && git submodule update --recursive \
&& cmake -S . -B build \ && cmake -S . -B build \
-DGGML_HIP=ON \ -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 RUN chmod +x /usr/local/bin/gguf-vram-estimator.py
# runtime stage # runtime stage
FROM registry.fedoraproject.org/fedora-minimal:rawhide FROM registry.fedoraproject.org/fedora-minimal:43
# rocm 7.1 repo # rocm 7.1 repo
RUN <<'EOF' RUN <<'EOF'
@@ -108,4 +116,3 @@ RUN printf '%s\n' \
# shell # shell
CMD ["/bin/bash"] CMD ["/bin/bash"]
toolboxes/Dockerfile.rocm-7.1-rocwmma
+10 -3
View File
@@ -1,5 +1,7 @@
# build stage # 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 # rocm 7.1 repo
RUN <<'EOF' RUN <<'EOF'
@@ -47,6 +49,12 @@ RUN chmod +x /opt/apply-rocwmma-fix.sh && /opt/apply-rocwmma-fix.sh /opt/llama.c
# build # build
RUN git clean -xdf \ 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 \ && git submodule update --recursive \
&& cmake -S . -B build \ && cmake -S . -B build \
-DGGML_HIP=ON \ -DGGML_HIP=ON \
@@ -73,7 +81,7 @@ RUN chmod +x /usr/local/bin/gguf-vram-estimator.py
# runtime stage # runtime stage
FROM registry.fedoraproject.org/fedora-minimal:rawhide FROM registry.fedoraproject.org/fedora-minimal:43
# rocm 7.1 repo # rocm 7.1 repo
RUN <<'EOF' RUN <<'EOF'
@@ -119,4 +127,3 @@ RUN printf '%s\n' \
# shell # shell
CMD ["/bin/bash"] CMD ["/bin/bash"]
toolboxes/Dockerfile.rocm-7alpha
+10 -2
View File
@@ -1,5 +1,7 @@
# build # 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 \ RUN dnf -y --nodocs --setopt=install_weak_deps=False install \
make gcc cmake lld clang clang-devel compiler-rt libcurl-devel \ make gcc cmake lld clang clang-devel compiler-rt libcurl-devel \
@@ -56,6 +58,12 @@ RUN printf '%s\n' \
WORKDIR /opt/llama.cpp WORKDIR /opt/llama.cpp
RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
&& git clean -xdf \ && 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 && git submodule update --recursive
RUN cmake -S . -B build \ 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 && rm -rf /opt/llama.cpp
# runtime # 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 \ RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \
bash ca-certificates libatomic libstdc++ libgcc radeontop vim \ bash ca-certificates libatomic libstdc++ libgcc radeontop vim \
toolboxes/Dockerfile.rocm-7alpha-rocwmma
+10 -2
View File
@@ -1,5 +1,7 @@
# build # 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 \ RUN dnf -y --nodocs --setopt=install_weak_deps=False install \
make gcc cmake lld clang clang-devel compiler-rt libcurl-devel \ 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 WORKDIR /opt/llama.cpp
RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
&& git clean -xdf \ && 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 && git submodule update --recursive
COPY ./apply-rocwmma-fix.sh /opt/apply-rocwmma-fix.sh 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 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 && cmake --install build --config Release
# runtime # 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 \ RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \
bash ca-certificates libatomic libstdc++ libgcc radeontop vim \ bash ca-certificates libatomic libstdc++ libgcc radeontop vim \
toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved
+10 -2
View File
@@ -1,5 +1,7 @@
# build # 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 \ RUN dnf -y --nodocs --setopt=install_weak_deps=False install \
make gcc cmake lld clang clang-devel compiler-rt libcurl-devel \ 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 WORKDIR /opt/llama.cpp
RUN git clone --recursive https://github.com/hjc4869/llama.cpp.git . \ RUN git clone --recursive https://github.com/hjc4869/llama.cpp.git . \
&& git clean -xdf \ && 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 && git submodule update --recursive
COPY ./apply-rocwmma-fix.sh /opt/apply-rocwmma-fix.sh 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 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 && cmake --install build --config Release
# runtime # 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 \ RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \
bash ca-certificates libatomic libstdc++ libgcc radeontop vim \ bash ca-certificates libatomic libstdc++ libgcc radeontop vim \
toolboxes/Dockerfile.rocm-7rc
+10 -2
View File
@@ -1,5 +1,7 @@
# build # 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 \ RUN dnf -y --nodocs --setopt=install_weak_deps=False install \
make gcc cmake lld clang clang-devel compiler-rt libcurl-devel \ make gcc cmake lld clang clang-devel compiler-rt libcurl-devel \
@@ -55,6 +57,12 @@ RUN printf '%s\n' \
WORKDIR /opt/llama.cpp WORKDIR /opt/llama.cpp
RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
&& git clean -xdf \ && 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 && git submodule update --recursive
RUN cmake -S . -B build \ 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 && rm -rf /opt/llama.cpp
# runtime # 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 \ RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \
bash ca-certificates libatomic libstdc++ libgcc radeontop vim \ bash ca-certificates libatomic libstdc++ libgcc radeontop vim \
toolboxes/Dockerfile.rocm-7rc-rocwmma
+10 -2
View File
@@ -1,5 +1,7 @@
# build # 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 \ RUN dnf -y --nodocs --setopt=install_weak_deps=False install \
make gcc cmake lld clang clang-devel compiler-rt libcurl-devel \ 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 WORKDIR /opt/llama.cpp
RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
&& git clean -xdf \ && 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 && git submodule update --recursive
COPY ./apply-rocwmma-fix.sh /opt/apply-rocwmma-fix.sh COPY ./apply-rocwmma-fix.sh /opt/apply-rocwmma-fix.sh
@@ -74,7 +82,7 @@ RUN cmake -S . -B build \
&& cmake --install build --config Release && cmake --install build --config Release
# runtime # 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 \ RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \
bash ca-certificates libatomic libstdc++ libgcc radeontop vim \ bash ca-certificates libatomic libstdc++ libgcc radeontop vim \
toolboxes/Dockerfile.vulkan-amdvlk
+10 -2
View File
@@ -1,5 +1,7 @@
# build stage # 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 # deps
RUN dnf -y --nodocs --setopt=install_weak_deps=False install \ 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 # build
RUN git clean -xdf \ 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 \ && git submodule update --recursive \
&& cmake -S . -B build -G Ninja \ && cmake -S . -B build -G Ninja \
-DGGML_VULKAN=ON \ -DGGML_VULKAN=ON \
@@ -43,7 +51,7 @@ RUN chmod +x /usr/local/bin/gguf-vram-estimator.py
# runtime stage # runtime stage
FROM registry.fedoraproject.org/fedora-minimal:rawhide FROM registry.fedoraproject.org/fedora-minimal:43
# runtime deps # runtime deps
RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \ RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \
toolboxes/Dockerfile.vulkan-radv
+10 -2
View File
@@ -1,5 +1,7 @@
# build stage # 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 # deps
RUN dnf -y --nodocs --setopt=install_weak_deps=False install \ 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 # build
RUN git clean -xdf \ 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 \ && git submodule update --recursive \
&& cmake -S . -B build -G Ninja \ && cmake -S . -B build -G Ninja \
-DGGML_VULKAN=ON \ -DGGML_VULKAN=ON \
@@ -37,7 +45,7 @@ RUN chmod +x /usr/local/bin/gguf-vram-estimator.py
# runtime stage # runtime stage
FROM registry.fedoraproject.org/fedora-minimal:rawhide FROM registry.fedoraproject.org/fedora-minimal:43
# runtime deps # runtime deps
RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \ RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \