From 6473d646d54d30a74c8adf8ee35140a32375bb31 Mon Sep 17 00:00:00 2001 From: slaren Date: Sat, 25 Jan 2025 01:19:50 +0100 Subject: [PATCH 1/2] docker : fix CPU ARM build --- .devops/cpu.Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.devops/cpu.Dockerfile b/.devops/cpu.Dockerfile index 8d020f16c97f3..3a4420ed18444 100644 --- a/.devops/cpu.Dockerfile +++ b/.devops/cpu.Dockerfile @@ -2,6 +2,8 @@ ARG UBUNTU_VERSION=22.04 FROM ubuntu:$UBUNTU_VERSION AS build +ARG TARGETARCH + RUN apt-get update && \ apt-get install -y build-essential git cmake libcurl4-openssl-dev @@ -9,7 +11,11 @@ WORKDIR /app COPY . . -RUN cmake -S . -B build -DGGML_BACKEND_DL=ON -DGGML_NATIVE=OFF -DGGML_CPU_ALL_VARIANTS=ON -DLLAMA_CURL=ON -DCMAKE_BUILD_TYPE=Release && \ +RUN if [ "$TARGETARCH" = "amd64" ]; then \ + cmake -S . -B build -DGGML_BACKEND_DL=ON -DGGML_NATIVE=OFF -DGGML_CPU_ALL_VARIANTS=ON -DLLAMA_CURL=ON -DCMAKE_BUILD_TYPE=Release; \ + else \ + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release; \ + fi && \ cmake --build build -j $(nproc) RUN mkdir -p /app/lib && \ From 6fe22643a833d5f7eeadf905a80a02c7f6f8a738 Mon Sep 17 00:00:00 2001 From: slaren Date: Sat, 25 Jan 2025 14:31:23 +0100 Subject: [PATCH 2/2] add CURL to other builds --- .devops/cpu.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devops/cpu.Dockerfile b/.devops/cpu.Dockerfile index 3a4420ed18444..ab0e951bc77cb 100644 --- a/.devops/cpu.Dockerfile +++ b/.devops/cpu.Dockerfile @@ -12,9 +12,9 @@ WORKDIR /app COPY . . RUN if [ "$TARGETARCH" = "amd64" ]; then \ - cmake -S . -B build -DGGML_BACKEND_DL=ON -DGGML_NATIVE=OFF -DGGML_CPU_ALL_VARIANTS=ON -DLLAMA_CURL=ON -DCMAKE_BUILD_TYPE=Release; \ + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DLLAMA_CURL=ON -DGGML_BACKEND_DL=ON -DGGML_NATIVE=OFF -DGGML_CPU_ALL_VARIANTS=ON; \ else \ - cmake -S . -B build -DCMAKE_BUILD_TYPE=Release; \ + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DLLAMA_CURL=ON; \ fi && \ cmake --build build -j $(nproc)