Sync temp-10297

.github/workflows/build-apple.yml

@@ -8,21 +8,35 @@ on:
     paths: [
       '.github/workflows/build-apple.yml',
       '**/CMakeLists.txt',
-      '**/.cmake',
+      '**/*.cmake',
+      '**/*.cmake.in',
+      '**/*.pc.in',
       '**/*.h',
       '**/*.hpp',
       '**/*.c',
       '**/*.cpp',
       '**/*.swift',
       '**/*.m',
-      '**/*.metal'
+      '**/*.metal',
+      'scripts/vector-index-package-smoke.sh'
     ]
 
   pull_request:
     types: [opened, synchronize, reopened]
     paths: [
       '.github/workflows/build-apple.yml',
-      'ggml/src/ggml-metal/**'
+      '**/CMakeLists.txt',
+      '**/*.cmake',
+      '**/*.cmake.in',
+      '**/*.pc.in',
+      '**/*.h',
+      '**/*.hpp',
+      '**/*.c',
+      '**/*.cpp',
+      '**/*.swift',
+      '**/*.m',
+      '**/*.metal',
+      'scripts/vector-index-package-smoke.sh'
     ]
 
 concurrency:
@@ -36,9 +50,6 @@ env:
   LLAMA_ARG_LOG_PREFIX: 1
   LLAMA_ARG_LOG_TIMESTAMPS: 1
 
-permissions:
-  contents: read
-
 jobs:
   macos-latest-arm64:
     runs-on: macos-latest
@@ -63,10 +74,11 @@ jobs:
             -DCMAKE_BUILD_RPATH="@loader_path" \
             -DLLAMA_FATAL_WARNINGS=ON \
             -DLLAMA_BUILD_BORINGSSL=ON \
-            -DGGML_METAL_USE_BF16=ON \
             -DGGML_METAL_EMBED_LIBRARY=OFF \
             -DGGML_METAL_SHADER_DEBUG=ON \
-            -DGGML_RPC=ON
+            -DGGML_VECTOR_INDEX=ON \
+            -DGGML_RPC=ON \
+            -DCMAKE_OSX_DEPLOYMENT_TARGET=13.3
           time cmake --build build --config Release -j $(sysctl -n hw.logicalcpu)
           leaks -atExit -- ./build/bin/test-thread-safety -hf ggml-org/gemma-3-270m-qat-GGUF -ngl 99 -p "$(printf 'hello %.0s' {1..128})" -n 16 -c 512 -ub 32 -np 2 -t 2 -lv 1
 
@@ -102,6 +114,7 @@ jobs:
             -DLLAMA_FATAL_WARNINGS=ON \
             -DLLAMA_BUILD_BORINGSSL=ON \
             -DGGML_METAL=OFF \
+            -DGGML_VECTOR_INDEX=ON \
             -DGGML_RPC=ON \
             -DGGML_BLAS=OFF \
             -DCMAKE_OSX_DEPLOYMENT_TARGET=13.3
@@ -113,6 +126,39 @@ jobs:
           cd build
           ctest -L main --verbose --timeout 900
 
+      - name: Vector-index static pkg-config smoke
+        id: vector_index_static_pkg_config
+        run: |
+          STATIC_PREFIX="$RUNNER_TEMP/vector-index-static-install"
+          cmake -S ggml -B build-vector-index-package-static \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_INSTALL_PREFIX="$STATIC_PREFIX" \
+            -DBUILD_SHARED_LIBS=OFF \
+            -DGGML_BUILD_TESTS=OFF \
+            -DGGML_BUILD_EXAMPLES=OFF \
+            -DGGML_VECTOR_INDEX=ON
+          cmake --build build-vector-index-package-static -j $(sysctl -n hw.logicalcpu)
+          cmake --install build-vector-index-package-static
+          PREFIX="$STATIC_PREFIX" \
+            CONSUMER_DIR=vector-index-pkg-config-static \
+            RUN_CMAKE=0 \
+            PKG_CONFIG_STATIC=1 \
+            bash scripts/vector-index-package-smoke.sh
+          cat > ggml-pkg-config-static.c <<'EOF'
+          #include "ggml.h"
+
+          int main(void) {
+              ggml_time_init();
+              return ggml_time_us() < 0;
+          }
+          EOF
+          PKG_CONFIG_PATH="$STATIC_PREFIX/lib/pkgconfig" \
+            cc ggml-pkg-config-static.c \
+              $(PKG_CONFIG_PATH="$STATIC_PREFIX/lib/pkgconfig" \
+                pkg-config --cflags --libs --static ggml) \
+              -o ggml-pkg-config-static
+          ./ggml-pkg-config-static
+
   macos-latest-ios-xcode:
     runs-on: macos-latest
 
@@ -130,7 +176,6 @@ jobs:
         run: |
           sysctl -a
           cmake -B build -G Xcode \
-            -DGGML_METAL_USE_BF16=ON \
             -DGGML_METAL_EMBED_LIBRARY=ON \
             -DLLAMA_OPENSSL=OFF \
             -DLLAMA_BUILD_APP=OFF \
@@ -181,7 +226,6 @@ jobs:
         run: |
           sysctl -a
           cmake -B build -G Xcode \
-            -DGGML_METAL_USE_BF16=ON \
             -DGGML_METAL_EMBED_LIBRARY=ON \
             -DLLAMA_BUILD_COMMON=OFF \
             -DLLAMA_BUILD_APP=OFF \
@@ -215,7 +259,6 @@ jobs:
         run: |
           sysctl -a
           cmake -B build -G Xcode \
-            -DGGML_METAL_USE_BF16=ON \
             -DGGML_METAL_EMBED_LIBRARY=ON \
             -DLLAMA_BUILD_COMMON=OFF \
             -DLLAMA_BUILD_APP=OFF \
@@ -260,7 +303,6 @@ jobs:
         run: |
           sysctl -a
           cmake -B build -G Xcode \
-            -DGGML_METAL_USE_BF16=ON \
             -DGGML_METAL_EMBED_LIBRARY=ON \
             -DLLAMA_OPENSSL=OFF \
             -DLLAMA_BUILD_APP=OFF \

.github/workflows/build-cache.yml

@@ -9,9 +9,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
   cancel-in-progress: true
 
-permissions:
-  contents: read
-
 jobs:
   ubuntu-24-vulkan-cache:
     runs-on: ubuntu-24.04

.github/workflows/build-cann.yml

@@ -33,9 +33,6 @@ env:
   LLAMA_ARG_LOG_PREFIX: 1
   LLAMA_ARG_LOG_TIMESTAMPS: 1
 
-permissions:
-  contents: read
-
 jobs:
  openEuler-latest-cann:
    defaults:

.github/workflows/build-cmake-pkg.yml

@@ -21,10 +21,33 @@ jobs:
                 -DLLAMA_BUILD_TOOLS=OFF \
                 -DLLAMA_BUILD_EXAMPLES=OFF \
                 -DLLAMA_BUILD_APP=OFF \
+                -DGGML_VECTOR_INDEX=ON \
                 -DCMAKE_BUILD_TYPE=Release
           cmake --build build --config Release
           cmake --install build --prefix "$PREFIX" --config Release
 
+          PREFIX="$PREFIX" \
+            CONSUMER_DIR=vector-index-cmake-pkg \
+            RUN_PKG_CONFIG=0 \
+            bash scripts/vector-index-package-smoke.sh
+
+          GGML_PREFIX="$(pwd)"/inst-ggml
+          cmake -S ggml -B build-ggml \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DCMAKE_INSTALL_PREFIX="$GGML_PREFIX" \
+                -DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu \
+                -DBUILD_SHARED_LIBS=OFF \
+                -DGGML_BUILD_TESTS=OFF \
+                -DGGML_BUILD_EXAMPLES=OFF \
+                -DGGML_VECTOR_INDEX=ON
+          cmake --build build-ggml --config Release
+          cmake --install build-ggml --config Release
+          PREFIX="$GGML_PREFIX" \
+            CONSUMER_DIR=vector-index-pkg-config \
+            LIBDIR=lib/x86_64-linux-gnu \
+            PKG_CONFIG_STATIC=1 \
+            bash scripts/vector-index-package-smoke.sh
+
           export LLAMA_CONFIG="$PREFIX"/share/llama/llama-config.cmake
           tclsh <<'EOF'
           set build(commit)  [string trim [exec git rev-parse --short HEAD]]

.github/workflows/build-cpu.yml

@@ -7,32 +7,36 @@ on:
       - master
     paths: [
       '.github/workflows/build-cpu.yml',
-      # Disable. There are some modifications in the fork
-      # so that ggml dynamic builds work with vcpkg.
-      # '.github/workflows/build-cmake-pkg.yml',
+      '.github/workflows/build-cmake-pkg.yml',
       '.github/workflows/build-linux-cross.yml',
+      'scripts/vector-index-package-smoke.sh',
       '**/CMakeLists.txt',
-      '**/.cmake',
+      '**/*.cmake',
+      '**/*.cmake.in',
+      '**/*.pc.in',
       '**/*.h',
       '**/*.hpp',
       '**/*.c',
       '**/*.cpp',
+      '**/*.inc',
     ]
 
   pull_request:
     types: [opened, synchronize, reopened]
     paths: [
       '.github/workflows/build-cpu.yml',
-      # Disable. There are some modifications in the fork
-      # so that ggml dynamic builds work with vcpkg.
-      # '.github/workflows/build-cmake-pkg.yml',
+      '.github/workflows/build-cmake-pkg.yml',
       '.github/workflows/build-linux-cross.yml',
+      'scripts/vector-index-package-smoke.sh',
       '**/CMakeLists.txt',
-      '**/.cmake',
+      '**/*.cmake',
+      '**/*.cmake.in',
+      '**/*.pc.in',
       '**/*.h',
       '**/*.hpp',
       '**/*.c',
-      '**/*.cpp'
+      '**/*.cpp',
+      '**/*.inc'
     ]
 
 concurrency:
@@ -46,13 +50,7 @@ env:
   LLAMA_ARG_LOG_PREFIX: 1
   LLAMA_ARG_LOG_TIMESTAMPS: 1
 
-permissions:
-  contents: read
-
 jobs:
-  # build-cmake-pkg:
-    # uses: ./.github/workflows/build-cmake-pkg.yml
-
   ubuntu:
     strategy:
       matrix:
@@ -111,6 +109,7 @@ jobs:
         run: |
           cmake -B build \
             -DLLAMA_FATAL_WARNINGS=ON \
+            -DGGML_VECTOR_INDEX=ON \
             -DGGML_RPC=ON
           time cmake --build build --config Release -j $(nproc)
 
@@ -120,6 +119,101 @@ jobs:
           cd build
           ctest -L main --verbose --timeout 900
 
+      - name: Static vector-index smoke
+        if: ${{ matrix.build == 'x64' || matrix.build == 'arm64' }}
+        id: vector_index_static
+        run: |
+          cmake -B build-vector-index-static \
+            -DLLAMA_FATAL_WARNINGS=ON \
+            -DLLAMA_BUILD_TESTS=ON \
+            -DGGML_VECTOR_INDEX=ON \
+            -DBUILD_SHARED_LIBS=OFF
+          cmake --build build-vector-index-static --target test-vector-index test-vector-index-hooks test-vector-index-faults -j $(nproc)
+          ctest --test-dir build-vector-index-static -R '^test-vector-index(-hooks|-faults)?$' --output-on-failure
+
+      - name: Vector-index package smoke
+        if: ${{ matrix.build == 'x64' || matrix.build == 'arm64' }}
+        id: vector_index_package
+        run: |
+          PREFIX="$RUNNER_TEMP/vector-index-install"
+          cmake --install build --prefix "$PREFIX" --config Release
+
+          mkdir -p vector-index-consumer
+          cat > vector-index-consumer/CMakeLists.txt <<'EOF'
+          cmake_minimum_required(VERSION 3.16)
+          project(vector_index_consumer C CXX)
+          find_package(ggml CONFIG REQUIRED)
+          add_executable(vector_index_consumer main.c)
+          target_link_libraries(vector_index_consumer PRIVATE ggml::vector-index)
+          EOF
+          cat > vector-index-consumer/main.c <<'EOF'
+          #include "ggml-vector-index.h"
+
+          #include <stdint.h>
+          #include <stdio.h>
+
+          int main(void) {
+              ggml_vec_index_t * idx = ggml_vec_index_create(2, 32);
+              if (idx == 0) {
+                  return 1;
+              }
+              const float vector[2] = { 1.0f, 0.0f };
+              const uint64_t id = 7;
+              float score = 0.0f;
+              uint64_t out_id = 0;
+              if (ggml_vec_index_add(idx, vector, 1, &id) != GGML_VEC_INDEX_OK ||
+                  ggml_vec_index_search(idx, vector, 1, 1, &score, &out_id) != GGML_VEC_INDEX_OK ||
+                  out_id != id) {
+                  ggml_vec_index_free(idx);
+                  return 2;
+              }
+              const char * snapshot_path = "vector-index-consumer.tvim";
+              if (ggml_vec_index_write(idx, snapshot_path) != GGML_VEC_INDEX_OK) {
+                  ggml_vec_index_free(idx);
+                  return 3;
+              }
+              ggml_vec_index_free(idx);
+              idx = ggml_vec_index_load(snapshot_path);
+              remove(snapshot_path);
+              if (idx == 0 || ggml_vec_index_contains(idx, id) != 1) {
+                  ggml_vec_index_free(idx);
+                  return 4;
+              }
+              ggml_vec_index_free(idx);
+              return 0;
+          }
+          EOF
+
+          cmake -S vector-index-consumer -B vector-index-consumer/build \
+            -DCMAKE_PREFIX_PATH="$PREFIX/share"
+          cmake --build vector-index-consumer/build
+          vector-index-consumer/build/vector_index_consumer
+
+          export PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig"
+          cc vector-index-consumer/main.c \
+            $(pkg-config --cflags --libs ggml-vector-index) \
+            -o vector-index-pkg-config
+          LD_LIBRARY_PATH="$PREFIX/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \
+            ./vector-index-pkg-config
+
+          STATIC_PREFIX="$RUNNER_TEMP/vector-index-static-install"
+          STATIC_LIBDIR="lib/$(gcc -print-multiarch)"
+          cmake -S ggml -B build-vector-index-package-static \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_INSTALL_PREFIX="$STATIC_PREFIX" \
+            -DCMAKE_INSTALL_LIBDIR="$STATIC_LIBDIR" \
+            -DBUILD_SHARED_LIBS=OFF \
+            -DGGML_BUILD_TESTS=OFF \
+            -DGGML_BUILD_EXAMPLES=OFF \
+            -DGGML_VECTOR_INDEX=ON
+          cmake --build build-vector-index-package-static -j $(nproc)
+          cmake --install build-vector-index-package-static
+          PREFIX="$STATIC_PREFIX" \
+            CONSUMER_DIR=vector-index-consumer-static \
+            LIBDIR="$STATIC_LIBDIR" \
+            PKG_CONFIG_STATIC=1 \
+            bash scripts/vector-index-package-smoke.sh
+
       - name: Test llama2c conversion
         id: llama2c_test
         run: |
@@ -137,23 +231,23 @@ jobs:
     env:
       OPENBLAS_VERSION: 0.3.23
       SDE_VERSION: 9.33.0-2024-01-07
-      VULKAN_VERSION: 1.4.313.2
+      VULKAN_VERSION: 1.4.357.0
 
     strategy:
       matrix:
         include:
           - build: 'x64-cpu-static'
             arch: 'x64'
-            defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DBUILD_SHARED_LIBS=OFF'
+            defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_VECTOR_INDEX=ON -DBUILD_SHARED_LIBS=OFF'
           - build: 'x64-openblas'
             arch: 'x64'
-            defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_OPENMP=OFF -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS -DBLAS_INCLUDE_DIRS="$env:RUNNER_TEMP/openblas/include" -DBLAS_LIBRARIES="$env:RUNNER_TEMP/openblas/lib/openblas.lib"'
+            defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_VECTOR_INDEX=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_OPENMP=OFF -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS -DBLAS_INCLUDE_DIRS="$env:RUNNER_TEMP/openblas/include" -DBLAS_LIBRARIES="$env:RUNNER_TEMP/openblas/lib/openblas.lib"'
           - build: 'x64-vulkan'
             arch: 'x64'
             defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DCMAKE_BUILD_TYPE=Release -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_VULKAN=ON'
           - build: 'arm64'
             arch: 'arm64'
-            defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON'
+            defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_VECTOR_INDEX=ON'
 
     steps:
       - name: Clone