mirror of
https://github.com/ggml-org/llama.cpp.git
synced 2025-11-12 10:47:01 +00:00
Switch to using Ubuntu 25.10 vulkan/mesa (#16497)
Because "Ubuntu packages to be discontinued in Vulkan SDK" Signed-off-by: Eric Curtin <eric.curtin@docker.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
ARG UBUNTU_VERSION=24.04
|
ARG UBUNTU_VERSION=25.10
|
||||||
|
|
||||||
FROM ubuntu:$UBUNTU_VERSION AS build
|
FROM ubuntu:$UBUNTU_VERSION AS build
|
||||||
|
|
||||||
@@ -7,32 +7,16 @@ FROM ubuntu:$UBUNTU_VERSION AS build
|
|||||||
# Install build tools
|
# Install build tools
|
||||||
RUN apt update && apt install -y git build-essential cmake wget xz-utils
|
RUN apt update && apt install -y git build-essential cmake wget xz-utils
|
||||||
|
|
||||||
# Install Vulkan SDK
|
|
||||||
ARG VULKAN_VERSION=1.4.321.1
|
|
||||||
RUN ARCH=$(uname -m) && \
|
|
||||||
wget -qO /tmp/vulkan-sdk.tar.xz https://sdk.lunarg.com/sdk/download/${VULKAN_VERSION}/linux/vulkan-sdk-linux-${ARCH}-${VULKAN_VERSION}.tar.xz && \
|
|
||||||
mkdir -p /opt/vulkan && \
|
|
||||||
tar -xf /tmp/vulkan-sdk.tar.xz -C /tmp --strip-components=1 && \
|
|
||||||
mv /tmp/${ARCH}/* /opt/vulkan/ && \
|
|
||||||
rm -rf /tmp/*
|
|
||||||
|
|
||||||
# Install cURL and Vulkan SDK dependencies
|
# Install cURL and Vulkan SDK dependencies
|
||||||
RUN apt install -y libcurl4-openssl-dev curl \
|
RUN apt install -y libcurl4-openssl-dev curl \
|
||||||
libxcb-xinput0 libxcb-xinerama0 libxcb-cursor-dev
|
libxcb-xinput0 libxcb-xinerama0 libxcb-cursor-dev libvulkan-dev glslc
|
||||||
|
|
||||||
# Set environment variables
|
|
||||||
ENV VULKAN_SDK=/opt/vulkan
|
|
||||||
ENV PATH=$VULKAN_SDK/bin:$PATH
|
|
||||||
ENV LD_LIBRARY_PATH=$VULKAN_SDK/lib:$LD_LIBRARY_PATH
|
|
||||||
ENV CMAKE_PREFIX_PATH=$VULKAN_SDK:$CMAKE_PREFIX_PATH
|
|
||||||
ENV PKG_CONFIG_PATH=$VULKAN_SDK/lib/pkgconfig:$PKG_CONFIG_PATH
|
|
||||||
|
|
||||||
# Build it
|
# Build it
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
RUN cmake -B build -DGGML_NATIVE=OFF -DGGML_VULKAN=1 -DLLAMA_BUILD_TESTS=OFF -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON && \
|
RUN cmake -B build -DGGML_NATIVE=OFF -DGGML_VULKAN=ON -DLLAMA_BUILD_TESTS=OFF -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON && \
|
||||||
cmake --build build --config Release -j$(nproc)
|
cmake --build build --config Release -j$(nproc)
|
||||||
|
|
||||||
RUN mkdir -p /app/lib && \
|
RUN mkdir -p /app/lib && \
|
||||||
@@ -50,7 +34,7 @@ RUN mkdir -p /app/full \
|
|||||||
FROM ubuntu:$UBUNTU_VERSION AS base
|
FROM ubuntu:$UBUNTU_VERSION AS base
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y libgomp1 curl libvulkan-dev \
|
&& apt-get install -y libgomp1 curl libvulkan1 mesa-vulkan-drivers \
|
||||||
&& apt autoremove -y \
|
&& apt autoremove -y \
|
||||||
&& apt clean -y \
|
&& apt clean -y \
|
||||||
&& rm -rf /tmp/* /var/tmp/* \
|
&& rm -rf /tmp/* /var/tmp/* \
|
||||||
|
|||||||
Reference in New Issue
Block a user