diff --git a/toolboxes/Dockerfile.rocm-6.4.4 b/toolboxes/Dockerfile.rocm-6.4.4 index e27db89..ab8061f 100644 --- a/toolboxes/Dockerfile.rocm-6.4.4 +++ b/toolboxes/Dockerfile.rocm-6.4.4 @@ -96,6 +96,7 @@ RUN microdnf -y --nodocs --setopt=install_weak_deps=0 \ # copy COPY --from=builder /usr/local/ /usr/local/ +COPY --from=builder /opt/llama.cpp/build/bin/rpc-* /usr/local/bin/ # ld RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf \ diff --git a/toolboxes/Dockerfile.rocm-6.4.4-rocwmma b/toolboxes/Dockerfile.rocm-6.4.4-rocwmma index 8a4d38d..8b5f63f 100644 --- a/toolboxes/Dockerfile.rocm-6.4.4-rocwmma +++ b/toolboxes/Dockerfile.rocm-6.4.4-rocwmma @@ -112,6 +112,7 @@ RUN microdnf -y --nodocs --setopt=install_weak_deps=0 \ # copy COPY --from=builder /usr/local/ /usr/local/ +COPY --from=builder /opt/llama.cpp/build/bin/rpc-* /usr/local/bin/ # ld RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf \ diff --git a/toolboxes/Dockerfile.rocm-7.1 b/toolboxes/Dockerfile.rocm-7.1 index d9cf7d0..b5734be 100644 --- a/toolboxes/Dockerfile.rocm-7.1 +++ b/toolboxes/Dockerfile.rocm-7.1 @@ -96,6 +96,7 @@ RUN microdnf -y --nodocs --setopt=install_weak_deps=0 \ # copy COPY --from=builder /usr/local/ /usr/local/ +COPY --from=builder /opt/llama.cpp/build/bin/rpc-* /usr/local/bin/ # ld RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf \ diff --git a/toolboxes/Dockerfile.rocm-7.1-rocwmma b/toolboxes/Dockerfile.rocm-7.1-rocwmma index 3a69fc1..99b2bed 100644 --- a/toolboxes/Dockerfile.rocm-7.1-rocwmma +++ b/toolboxes/Dockerfile.rocm-7.1-rocwmma @@ -107,6 +107,7 @@ RUN microdnf -y --nodocs --setopt=install_weak_deps=0 \ # copy COPY --from=builder /usr/local/ /usr/local/ +COPY --from=builder /opt/llama.cpp/build/bin/rpc-* /usr/local/bin/ # ld RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf \ diff --git a/toolboxes/Dockerfile.rocm-7alpha b/toolboxes/Dockerfile.rocm-7alpha index 99a8898..c3b36f0 100644 --- a/toolboxes/Dockerfile.rocm-7alpha +++ b/toolboxes/Dockerfile.rocm-7alpha @@ -75,11 +75,10 @@ RUN cmake -S . -B build \ && cmake --build build --config Release -- -j$(nproc) \ && cmake --install build --config Release -# keep bin; drop headers/docs/static libs; drop source tree +# keep bin; drop headers/docs/static libs (retain llama.cpp for rpc binaries) RUN find /opt/rocm-7.0 -type f -name '*.a' -delete \ && rm -rf /opt/rocm-7.0/include /opt/rocm-7.0/share \ - /opt/rocm-7.0/llvm/include /opt/rocm-7.0/llvm/share \ - && rm -rf /opt/llama.cpp + /opt/rocm-7.0/llvm/include /opt/rocm-7.0/llvm/share # runtime FROM registry.fedoraproject.org/fedora-minimal:43 @@ -90,6 +89,7 @@ RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \ COPY --from=builder /opt/rocm-7.0 /opt/rocm-7.0 COPY --from=builder /usr/local/ /usr/local/ +COPY --from=builder /opt/llama.cpp/build/bin/rpc-* /usr/local/bin/ COPY gguf-vram-estimator.py /usr/local/bin/ RUN chmod +x /usr/local/bin/gguf-vram-estimator.py diff --git a/toolboxes/Dockerfile.rocm-7rc b/toolboxes/Dockerfile.rocm-7rc index 0330028..a4d108c 100644 --- a/toolboxes/Dockerfile.rocm-7rc +++ b/toolboxes/Dockerfile.rocm-7rc @@ -74,11 +74,10 @@ RUN cmake -S . -B build \ && cmake --build build --config Release -- -j$(nproc) \ && cmake --install build --config Release -# keep bin; drop headers/docs/static libs; drop source tree +# keep bin; drop headers/docs/static libs (retain llama.cpp for rpc binaries) RUN find /opt/rocm-7.0 -type f -name '*.a' -delete \ && rm -rf /opt/rocm-7.0/include /opt/rocm-7.0/share \ - /opt/rocm-7.0/llvm/include /opt/rocm-7.0/llvm/share \ - && rm -rf /opt/llama.cpp + /opt/rocm-7.0/llvm/include /opt/rocm-7.0/llvm/share # runtime FROM registry.fedoraproject.org/fedora-minimal:43 @@ -89,6 +88,7 @@ RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \ COPY --from=builder /opt/rocm-7.0 /opt/rocm-7.0 COPY --from=builder /usr/local/ /usr/local/ +COPY --from=builder /opt/llama.cpp/build/bin/rpc-* /usr/local/bin/ COPY gguf-vram-estimator.py /usr/local/bin/ RUN chmod +x /usr/local/bin/gguf-vram-estimator.py diff --git a/toolboxes/Dockerfile.vulkan-amdvlk b/toolboxes/Dockerfile.vulkan-amdvlk index 042e6c5..291b1ed 100644 --- a/toolboxes/Dockerfile.vulkan-amdvlk +++ b/toolboxes/Dockerfile.vulkan-amdvlk @@ -68,6 +68,7 @@ RUN curl -L -o /tmp/amdvlk-2025.Q2.1.x86_64.rpm \ # copy COPY --from=builder /usr/ /usr/ COPY --from=builder /usr/local/ /usr/local/ +COPY --from=builder /opt/llama.cpp/build/bin/rpc-* /usr/local/bin/ # ld RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf \ diff --git a/toolboxes/Dockerfile.vulkan-radv b/toolboxes/Dockerfile.vulkan-radv index da40a9f..969e2fd 100644 --- a/toolboxes/Dockerfile.vulkan-radv +++ b/toolboxes/Dockerfile.vulkan-radv @@ -56,6 +56,7 @@ RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \ # copy COPY --from=builder /usr/ /usr/ COPY --from=builder /usr/local/ /usr/local/ +COPY --from=builder /opt/llama.cpp/build/bin/rpc-* /usr/local/bin/ # ld RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf \