Merge tag 'b9888' of https://github.com/ggml-org/llama.cpp into feature/turboquant-kv-cache

[sxlmnwb]

Summary Merge 'b9888' of https://github.com/ggml-org/llama.cpp

Resolved files conflicts:

1. ggml/src/ggml-cuda/fattn.cu

• Added TurboQuant types (turbo2, turbo3, turbo4) to the ggml_cuda_fattn_kv_type_supported function
• Used the upstream helper function for KV type validation with an additional 64-byte alignment check for turbo types

2. ggml/src/ggml-metal/ggml-metal.metal

• Combined template instantiation for kernel_cpy_tq3_1s and kernel_cpy_tq4_1s (TurboQuant copy kernels)

3. src/llama-kv-cache.cpp

• Incorporate Hadamard rotation logic for DeepSeek architectures (DEEPSEEK32 and DEEPSEEK4)
• Use more comprehensive upstream conditions

4. src/llama-model-loader.cpp

• Adopts the llama_ftype_name structure from upstream with guessed_prefix_len
• Adds the TQ3_1S and TQ4_1S types to the switch case

5. tests/test-backend-ops.cpp

• Incorporates test cases from upstream (Q4_0, Q8_0, MXFP4)
• Retained the TurboQuant TQ4_1S test cases for kernel validation

6. tests/test-quantize-fns.cpp

• Added TQ3_1S to the list of types that use MAX_DOT_PRODUCT_ERROR_LOWBIT

7. tools/server/server-context.cpp (5 conflicts)

• Fixed slot selection logic by using task.id_slot instead of id_slot
• Merged the cache_key slot selection from the fork
• Used batch.size() instead of batch.n_tokens for consistency with upstream
• Fixed the prompt_checkpoint_restored flag
• Merged checkpoint logic with is_last_user_message
• Replaced continue/break with return in the iterate lambda
• Removed references to nonexistent functions (llama_get_ctx_other, process_chunk)

8. tools/server/server-models.cpp (6 conflicts)

• Use the upstream state-based protocol structure (CMD_CHILD_TO_ROUTER_STATE)
• Retain the CMD_CHILD_TO_ROUTER_ERROR handler for the abort callback
• Use the update_status_args struct for the update_status signature
• Fix the should_wake lambda with an inline lambda
• Use the child_proc->is_alive() and child_proc->terminate() methods instead of direct C functions
• Merged update_last_error and update_download_progress

9. tools/server/server-models.h

• Added the CMD_CHILD_TO_ROUTER_STATE define
• Merged method declarations from upstream and fork

10. tools/server/server.cpp

• Merged the common_models_handler initialization from upstream
• Retained the abort callback for error reporting from child processes
• Used a more comprehensive router condition (path.empty() && hf_repo.empty())

Additional information

Build environment:

export MY_FLAGS_NVIDIA="-march=znver5 -mtune=znver5 -O3 -pipe -flto=thin -fno-fat-lto-objects -fno-strict-aliasing -Wno-unused-command-line-argument -Wno-missing-noreturn -Wno-unreachable-code-break -mllvm -polly -mllvm -polly-tiling=1 -mllvm -polly-run-inliner -mllvm -polly-dependences-computeout=0 -mllvm -polly-ast-use-context"
export MY_LINKER_FLAGS="-fuse-ld=mold -Wl,--thinlto-jobs=$(nproc) -Wl,-rpath,/home/sxlmnwb/kernel-build/xBoreUp_Clang/lib/x86_64-unknown-linux-gnu"

cmake -B build-nvidia \
    -DGGML_CUDA=ON \
    -DGGML_CUDA_CUDNN=ON \
    -DGGML_RPC=ON \
    -DCUDAToolkit_ROOT=/opt/cuda \
    -DCMAKE_CUDA_COMPILER=/opt/cuda/bin/nvcc \
    -DCMAKE_CUDA_ARCHITECTURES=89 \
    -DCMAKE_BUILD_TYPE=Release \
    -DCMAKE_C_COMPILER=/home/sxlmnwb/kernel-build/xBoreUp_Clang/bin/clang \
    -DCMAKE_CXX_COMPILER=/home/sxlmnwb/kernel-build/xBoreUp_Clang/bin/clang++ \
    -DCMAKE_CUDA_HOST_COMPILER=clang++ \
    -DCMAKE_C_FLAGS="$MY_FLAGS_NVIDIA" \
    -DCMAKE_CXX_FLAGS="$MY_FLAGS_NVIDIA -stdlib=libc++" \
    -DCMAKE_EXE_LINKER_FLAGS="$MY_LINKER_FLAGS -lc++ -lc++abi" \
    -DCMAKE_SHARED_LINKER_FLAGS="$MY_LINKER_FLAGS -lc++ -lc++abi"

Build log:
PANd6hWU

Tested on:
CPU: AMD Ryzen AI 9 HX 370 (8+16) @ 5.16 GHz
GPU 2: NVIDIA GeForce RTX 4060 Max-Q / Mobile [Discrete]

MoE model:
Qwen3.6-35B-A3B-Uncensored-HauhauCS-Aggressive - Q4_K_P

Requirements

• I have read and agree with the contributing guidelines
• AI usage disclosure: NO