diff --git a/.devops/vulkan.Dockerfile b/.devops/vulkan.Dockerfile index 5d6c87ed6b98..148c69ef5555 100644 --- a/.devops/vulkan.Dockerfile +++ b/.devops/vulkan.Dockerfile @@ -1,13 +1,20 @@ -ARG UBUNTU_VERSION=26.04 +ARG UBUNTU_VERSION=24.04 FROM ubuntu:$UBUNTU_VERSION AS build # Install build tools RUN apt update && apt install -y git build-essential cmake wget xz-utils -# Install SSL and Vulkan SDK dependencies -RUN apt install -y libssl-dev curl \ - libxcb-xinput0 libxcb-xinerama0 libxcb-cursor-dev libvulkan-dev glslc +# Install cURL and Vulkan SDK dependencies. +RUN apt install -y libcurl4-openssl-dev curl \ + libxcb-xinput0 libxcb-xinerama0 libxcb-cursor-dev libvulkan-dev + +# glslc package naming differs across Ubuntu releases/runners. +RUN apt install -y glslc \ + || apt install -y shaderc \ + || apt install -y shaderc-tools + +RUN command -v glslc # Build it WORKDIR /app diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8062177ba5af..043c3172da4d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -33,6 +33,7 @@ jobs: COMMIT_SHA: ${{ github.sha }} strategy: fail-fast: false + max-parallel: 2 matrix: config: # Multi-stage build diff --git a/CMakePresets.json b/CMakePresets.json index b5afeb3c0f2f..4499d49bd804 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -1,5 +1,5 @@ { - "version": 4, + "version": 3, "configurePresets": [ { "name": "base", @@ -64,6 +64,15 @@ }, { "name": "x64-linux-gcc-debug", "inherits": [ "base", "x64-linux-gcc", "debug" ] }, { "name": "x64-linux-gcc-release", "inherits": [ "base", "x64-linux-gcc", "release" ] }, + { + "name": "x64-linux-gcc-lowmem-release", + "inherits": [ "base", "x64-linux-gcc", "release" ], + "cacheVariables": { + "LLAMA_BUILD_SERVER": "OFF", + "LLAMA_BUILD_TESTS": "OFF", + "LLAMA_BUILD_EXAMPLES": "OFF" + } + }, { "name": "x64-linux-gcc-reldbg", "inherits": [ "base", "x64-linux-gcc", "reldbg" ] }, { "name": "x64-linux-gcc+static-release", "inherits": [ "base", "x64-linux-gcc", "release", "static" ] }, @@ -89,7 +98,15 @@ { "name": "x64-windows-sycl-release", "inherits": [ "sycl-base", "release" ] }, { "name": "x64-windows-sycl-release-f16", "inherits": [ "sycl-base", "release", "sycl_f16" ] }, - { "name": "x64-windows-vulkan-debug", "inherits": [ "base", "vulkan", "debug" ] }, - { "name": "x64-windows-vulkan-release", "inherits": [ "base", "vulkan", "release" ] } - ] + { "name": "x64-windows-vulkan-debug", "inherits": [ "base", "vulkan", "debug" ] }, + { "name": "x64-windows-vulkan-release", "inherits": [ "base", "vulkan", "release" ] } + ], + "buildPresets": [ + { + "name": "x64-linux-gcc-lowmem-release-cli", + "configurePreset": "x64-linux-gcc-lowmem-release", + "targets": [ "llama-cli" ], + "jobs": 1 + } + ] }