summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.devops/full-cuda.Dockerfile4
-rw-r--r--.devops/full-rocm.Dockerfile5
-rw-r--r--.devops/full.Dockerfile5
-rw-r--r--.devops/server-cuda.Dockerfile7
-rw-r--r--.devops/server-intel.Dockerfile7
-rw-r--r--.devops/server-rocm.Dockerfile5
-rw-r--r--.devops/server-vulkan.Dockerfile6
7 files changed, 33 insertions, 6 deletions
diff --git a/.devops/full-cuda.Dockerfile b/.devops/full-cuda.Dockerfile
index 8cc1480d..059fd269 100644
--- a/.devops/full-cuda.Dockerfile
+++ b/.devops/full-cuda.Dockerfile
@@ -12,7 +12,7 @@ FROM ${BASE_CUDA_DEV_CONTAINER} as build
ARG CUDA_DOCKER_ARCH=all
RUN apt-get update && \
- apt-get install -y build-essential python3 python3-pip git
+ apt-get install -y build-essential python3 python3-pip git libcurl4-openssl-dev
COPY requirements.txt requirements.txt
COPY requirements requirements
@@ -28,6 +28,8 @@ COPY . .
ENV CUDA_DOCKER_ARCH=${CUDA_DOCKER_ARCH}
# Enable CUDA
ENV LLAMA_CUDA=1
+# Enable cURL
+ENV LLAMA_CURL=1
RUN make
diff --git a/.devops/full-rocm.Dockerfile b/.devops/full-rocm.Dockerfile
index 8b9633dc..6ecf3bcc 100644
--- a/.devops/full-rocm.Dockerfile
+++ b/.devops/full-rocm.Dockerfile
@@ -40,6 +40,11 @@ ENV LLAMA_HIPBLAS=1
ENV CC=/opt/rocm/llvm/bin/clang
ENV CXX=/opt/rocm/llvm/bin/clang++
+# Enable cURL
+ENV LLAMA_CURL=1
+RUN apt-get update && \
+ apt-get install -y libcurl4-openssl-dev
+
RUN make
ENTRYPOINT ["/app/.devops/tools.sh"]
diff --git a/.devops/full.Dockerfile b/.devops/full.Dockerfile
index cef1297d..432fb5da 100644
--- a/.devops/full.Dockerfile
+++ b/.devops/full.Dockerfile
@@ -3,7 +3,7 @@ ARG UBUNTU_VERSION=22.04
FROM ubuntu:$UBUNTU_VERSION as build
RUN apt-get update && \
- apt-get install -y build-essential python3 python3-pip git
+ apt-get install -y build-essential python3 python3-pip git libcurl4-openssl-dev
COPY requirements.txt requirements.txt
COPY requirements requirements
@@ -15,6 +15,9 @@ WORKDIR /app
COPY . .
+ENV LLAMA_CURL=1
+
+
RUN make
ENV LC_ALL=C.utf8
diff --git a/.devops/server-cuda.Dockerfile b/.devops/server-cuda.Dockerfile
index 5683a364..59a52ba2 100644
--- a/.devops/server-cuda.Dockerfile
+++ b/.devops/server-cuda.Dockerfile
@@ -12,7 +12,7 @@ FROM ${BASE_CUDA_DEV_CONTAINER} as build
ARG CUDA_DOCKER_ARCH=all
RUN apt-get update && \
- apt-get install -y build-essential git
+ apt-get install -y build-essential git libcurl4-openssl-dev
WORKDIR /app
@@ -22,11 +22,16 @@ COPY . .
ENV CUDA_DOCKER_ARCH=${CUDA_DOCKER_ARCH}
# Enable CUDA
ENV LLAMA_CUDA=1
+# Enable cURL
+ENV LLAMA_CURL=1
RUN make
FROM ${BASE_CUDA_RUN_CONTAINER} as runtime
+RUN apt-get update && \
+ apt-get install -y libcurl4-openssl-dev
+
COPY --from=build /app/server /server
ENTRYPOINT [ "/server" ]
diff --git a/.devops/server-intel.Dockerfile b/.devops/server-intel.Dockerfile
index 312f2df8..30448733 100644
--- a/.devops/server-intel.Dockerfile
+++ b/.devops/server-intel.Dockerfile
@@ -4,7 +4,7 @@ FROM intel/oneapi-basekit:$ONEAPI_VERSION as build
ARG LLAMA_SYCL_F16=OFF
RUN apt-get update && \
- apt-get install -y git
+ apt-get install -y git libcurl4-openssl-dev
WORKDIR /app
@@ -16,11 +16,14 @@ RUN mkdir build && \
echo "LLAMA_SYCL_F16 is set" && \
export OPT_SYCL_F16="-DLLAMA_SYCL_F16=ON"; \
fi && \
- cmake .. -DLLAMA_SYCL=ON -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx ${OPT_SYCL_F16} && \
+ cmake .. -DLLAMA_SYCL=ON -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -DLLAMA_CURL=ON ${OPT_SYCL_F16} && \
cmake --build . --config Release --target server
FROM intel/oneapi-basekit:$ONEAPI_VERSION as runtime
+RUN apt-get update && \
+ apt-get install -y libcurl4-openssl-dev
+
COPY --from=build /app/build/bin/server /server
ENV LC_ALL=C.utf8
diff --git a/.devops/server-rocm.Dockerfile b/.devops/server-rocm.Dockerfile
index e9a31647..c02a31dd 100644
--- a/.devops/server-rocm.Dockerfile
+++ b/.devops/server-rocm.Dockerfile
@@ -40,6 +40,11 @@ ENV LLAMA_HIPBLAS=1
ENV CC=/opt/rocm/llvm/bin/clang
ENV CXX=/opt/rocm/llvm/bin/clang++
+# Enable cURL
+ENV LLAMA_CURL=1
+RUN apt-get update && \
+ apt-get install -y libcurl4-openssl-dev
+
RUN make
ENTRYPOINT [ "/app/server" ]
diff --git a/.devops/server-vulkan.Dockerfile b/.devops/server-vulkan.Dockerfile
index e0add6fc..7e5a5283 100644
--- a/.devops/server-vulkan.Dockerfile
+++ b/.devops/server-vulkan.Dockerfile
@@ -11,12 +11,16 @@ RUN wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | apt-key
apt update -y && \
apt-get install -y vulkan-sdk
+# Install cURL
+RUN apt-get update && \
+ apt-get install -y libcurl4-openssl-dev
+
# Build it
WORKDIR /app
COPY . .
RUN mkdir build && \
cd build && \
- cmake .. -DLLAMA_VULKAN=1 && \
+ cmake .. -DLLAMA_VULKAN=1 -DLLAMA_CURL=1 && \
cmake --build . --config Release --target server
# Clean up