Skip to content

Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.

native: pf-serve-vulkan finds SPIR-V's headers, and glslc on Ubuntu 22.04

yetone1f98f5ba655b
diff --git a/.github/workflows/privacy-filter.yml b/.github/workflows/privacy-filter.yml
index 2c366e5c6..09c6db975 100644
--- a/.github/workflows/privacy-filter.yml
+++ b/.github/workflows/privacy-filter.yml
@@ -35,8 +35,9 @@ jobs:
if: runner.os == 'macOS'
run: brew install ninja
- name: tools (Linux)
+ # no glslc in Ubuntu 22.04: build.sh takes LunarG's
if: startsWith(matrix.target, 'linux')
- run: sudo apt-get update && sudo apt-get install -y ninja-build libvulkan-dev glslc zip
+ run: sudo apt-get update && sudo apt-get install -y ninja-build libvulkan-dev xz-utils zip
- name: tools (Windows, cross)
if: matrix.target == 'windows-amd64'
run: sudo apt-get update && sudo apt-get install -y ninja-build mingw-w64 glslc zip
diff --git a/native/privacy-filter/build.sh b/native/privacy-filter/build.sh
index 525860df6..efd4efa6c 100755
--- a/native/privacy-filter/build.sh
+++ b/native/privacy-filter/build.sh
@@ -14,6 +14,11 @@ PF_REPO=https://github.com/localai-org/privacy-filter.cpp
PF_COMMIT=735a6c28607ee82afc3a670383f41b55266a3b9a
VULKAN_SDK_TAG=1.4.309
SPIRV_TAG=vulkan-sdk-1.4.309.0
+# LunarG's Linux SDK, for its glslc where the system has none (Ubuntu
+# 22.04, whose older glibc the program is built against); its sha256 as
+# LunarG publishes it
+LUNARG_SDK=1.4.309.0
+LUNARG_SHA256=616a25a9d8b33336e83957f97ca273b8e95461649723354300d02c26ae52a1f6
target=$1
out=$(cd "$(dirname "$2")" && pwd)/$(basename "$2")
@@ -37,18 +42,37 @@ for p in "$here"/patches/*.patch; do
git -C "$src" apply "$p"
done
-# Vulkan's headers, SPIR-V's and the loader's exports, for the targets
-# that build pf-serve-vulkan
+# Vulkan's headers, SPIR-V's (installed, for its CMake config) and the
+# loader's exports, for the targets that build pf-serve-vulkan; vkargs
+# are what cmake is given for them
vk=$work/vulkan
+vkargs=()
fetch_vulkan() {
- [ -f "$vk/.done-$VULKAN_SDK_TAG" ] && return
- rm -rf "$vk" && mkdir -p "$vk/include" "$vk/lib"
- curl -fsSL "https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/v$VULKAN_SDK_TAG.tar.gz" | tar -xz -C "$vk"
- curl -fsSL "https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/$SPIRV_TAG.tar.gz" | tar -xz -C "$vk"
- cp -R "$vk/Vulkan-Headers-$VULKAN_SDK_TAG/include/"* "$vk/include/"
- cp -R "$vk/SPIRV-Headers-$SPIRV_TAG/include/"* "$vk/include/"
- curl -fsSL -o "$vk/vulkan-1.def" "https://raw.githubusercontent.com/KhronosGroup/Vulkan-Loader/v$VULKAN_SDK_TAG/loader/vulkan-1.def"
- touch "$vk/.done-$VULKAN_SDK_TAG"
+ if [ ! -f "$vk/.done-$VULKAN_SDK_TAG" ]; then
+ rm -rf "$vk" && mkdir -p "$vk/include" "$vk/lib"
+ curl -fsSL "https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/v$VULKAN_SDK_TAG.tar.gz" | tar -xz -C "$vk"
+ curl -fsSL "https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/$SPIRV_TAG.tar.gz" | tar -xz -C "$vk"
+ cp -R "$vk/Vulkan-Headers-$VULKAN_SDK_TAG/include/"* "$vk/include/"
+ cmake -S "$vk/SPIRV-Headers-$SPIRV_TAG" -B "$vk/spirv-build" -G Ninja -DSPIRV_HEADERS_ENABLE_TESTS=OFF >/dev/null
+ cmake --install "$vk/spirv-build" --prefix "$vk/spirv" >/dev/null
+ curl -fsSL -o "$vk/vulkan-1.def" "https://raw.githubusercontent.com/KhronosGroup/Vulkan-Loader/v$VULKAN_SDK_TAG/loader/vulkan-1.def"
+ touch "$vk/.done-$VULKAN_SDK_TAG"
+ fi
+ local cfg
+ cfg=$(find "$vk/spirv" -name SPIRV-HeadersConfig.cmake | head -1)
+ local glslc
+ glslc=$(command -v glslc || true)
+ if [ -z "$glslc" ]; then
+ glslc=$vk/glslc
+ if [ ! -x "$glslc" ]; then
+ local sdk=$work/vulkansdk-$LUNARG_SDK.tar.xz
+ [ -f "$sdk" ] || curl -fsSL -o "$sdk" "https://sdk.lunarg.com/sdk/download/$LUNARG_SDK/linux/vulkansdk-linux-x86_64-$LUNARG_SDK.tar.xz"
+ echo "$LUNARG_SHA256 $sdk" | sha256sum -c - >/dev/null
+ tar -xJf "$sdk" -C "$vk" --strip-components 3 "$LUNARG_SDK/x86_64/bin/glslc"
+ fi
+ fi
+ vkargs=(-DPF_VULKAN=ON -DVulkan_INCLUDE_DIR="$vk/include" -DSPIRV-Headers_DIR="$(dirname "$cfg")"
+ -DVulkan_GLSLC_EXECUTABLE="$glslc")
}
jobs=$(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 4)
@@ -83,7 +107,7 @@ case $target in
fetch_vulkan
static=(-DCMAKE_EXE_LINKER_FLAGS="-static-libgcc -static-libstdc++")
build pf-serve "${static[@]}" "${x86[@]}"
- build pf-serve-vulkan "${static[@]}" "${x86[@]}" -DPF_VULKAN=ON -DVulkan_INCLUDE_DIR="$vk/include"
+ build pf-serve-vulkan "${static[@]}" "${x86[@]}" "${vkargs[@]}"
;;
linux-arm64)
build pf-serve -DCMAKE_EXE_LINKER_FLAGS="-static-libgcc -static-libstdc++"
@@ -93,8 +117,7 @@ case $target in
x86_64-w64-mingw32-dlltool -d "$vk/vulkan-1.def" -l "$vk/lib/libvulkan-1.a"
win=(-DCMAKE_TOOLCHAIN_FILE="$here/mingw.cmake" -DCMAKE_C_FLAGS=-D_WIN32_WINNT=0x0A00 -DCMAKE_CXX_FLAGS=-D_WIN32_WINNT=0x0A00)
build pf-serve "${win[@]}" "${x86[@]}"
- build pf-serve-vulkan "${win[@]}" "${x86[@]}" -DPF_VULKAN=ON -DVulkan_INCLUDE_DIR="$vk/include" \
- -DVulkan_LIBRARY="$vk/lib/libvulkan-1.a" -DVulkan_GLSLC_EXECUTABLE="$(command -v glslc)"
+ build pf-serve-vulkan "${win[@]}" "${x86[@]}" "${vkargs[@]}" -DVulkan_LIBRARY="$vk/lib/libvulkan-1.a"
;;
*)
echo "unknown target $target" >&2