devops: finalise docker images for s390x

Signed-off-by: Aaron Teo <[email protected]>

Author: taronaeo

.devops/cpu.Dockerfile

@@ -1,25 +1,18 @@
 ARG UBUNTU_VERSION=22.04
-ARG GCC_VERSION=15.2.0
 
-FROM gcc:$GCC_VERSION AS build
+FROM ubuntu:$UBUNTU_VERSION AS build
 
 ARG TARGETARCH
 
 RUN apt-get update && \
-    apt-get install -y git cmake libcurl4-openssl-dev
-
-RUN if [ "$TARGETARCH" = "s390x" ]; then \
-        apt-get install -y libopenblas-dev; \
-    fi
+    apt-get install -y build-essential git cmake libcurl4-openssl-dev
 
 WORKDIR /app
 
 COPY . .
 
 RUN if [ "$TARGETARCH" = "amd64" ] || [ "$TARGETARCH" = "arm64" ]; then \
         cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DGGML_NATIVE=OFF -DLLAMA_BUILD_TESTS=OFF -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON; \
-    elif [ "$TARGETARCH" = "s390x" ]; then \
-        cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DGGML_NATIVE=OFF -DLLAMA_BUILD_TESTS=OFF -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS; \
     else \
         echo "Unsupported architecture"; \
         exit 1; \
@@ -40,13 +33,8 @@ RUN mkdir -p /app/full \
 ## Base image
 FROM ubuntu:$UBUNTU_VERSION AS base
 
-ARG TARGETARCH
-
 RUN apt-get update \
-    && apt-get install -y libgomp1 curl \
-    && if [ "$TARGETARCH" = "s390x" ]; then \
-        apt-get install -y libopenblas-dev; \
-    fi \
+    && apt-get install -y libgomp1 curl\
     && apt autoremove -y \
     && apt clean -y \
     && rm -rf /tmp/* /var/tmp/* \

.devops/s390x.Dockerfile

@@ -1,7 +1,7 @@
 ARG GCC_VERSION=15.2.0
 ARG UBUNTU_VERSION=24.04
 
-
+### Build stage
 FROM --platform=linux/s390x gcc:${GCC_VERSION} AS build
 
 RUN --mount=type=cache,target=/var/cache/apt \
@@ -30,16 +30,13 @@ RUN --mount=type=cache,target=/root/.ccache \
     cmake --build build --config Release -j $(nproc) && \
     cmake --install build --prefix /opt/llama.cpp
 
-# TODO: DOUBLE CHECK ALL FILES ARE COPIED INTO COLLECTOR
 COPY *.py             /opt/llama.cpp/bin
 COPY .devops/tools.sh /opt/llama.cpp/bin
 
 COPY gguf-py          /opt/llama.cpp/gguf-py
 COPY requirements.txt /opt/llama.cpp/gguf-py
 COPY requirements     /opt/llama.cpp/gguf-py/requirements
 
-RUN ls -laR /opt/llama.cpp
-
 
 ### Collect all llama.cpp binaries, libraries and distro libraries
 FROM --platform=linux/s390x scratch AS collector
@@ -103,7 +100,7 @@ FROM --platform=linux/s390x base AS light
 WORKDIR /llama.cpp/bin
 
 # Copy llama.cpp binaries and libraries
-COPY --from=collector /llama.cpp/bin/llama-cli       /llama.cpp/bin
+COPY --from=collector /llama.cpp/bin/llama-cli /llama.cpp/bin
 
 ENTRYPOINT [ "/llama.cpp/bin/llama-cli" ]