Commit b3e1b0f
Merge upstream/master: Gemma 4 support + 288 upstream commits
Merges ggml-org/llama.cpp upstream (d23355a..7992aa7) including:
- Gemma 4 model support (PR ggml-org#21309)
- KV cache rotation for better quantization (ggml-org#21038)
- Auto GPU memory fitting (llama_params_fit)
- Many new model architectures (Qwen3.5, Kimi K2, LFM2, etc.)
C++14/CUDA 7.5 compatibility fixes applied to merged code:
- Replaced if constexpr with runtime if across CUDA files
- Replaced constexpr __device__ functions with macros
- Replaced structured bindings with .first/.second access
- Replaced std::string_view/std::optional with std::string
- Template specializations for ggml_cuda_cast (convert.cuh)
- BF16 flash attention guarded behind CUDART_VERSION >= 11000
- Eager CUDA context init restored for accurate VRAM on non-VMM GPUs
- Jinja C++17 structured bindings fixed (caused Qwen 3.5 segfault)
Build system updates:
- Added hf-cache-stub.cpp, server-tools-stub.cpp for C++14 compat
- Added mtmd-image.cpp, httplib.cpp to build
- convert_hf_to_gguf.py patched for PyTorch 1.13 compatibility
- gguf vocab.py fallback for old tokenizers library
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>599 files changed
Lines changed: 84846 additions & 35206 deletions
File tree
- .devops
- nix
- .github
- ISSUE_TEMPLATE
- workflows
- benches/nemotron
- build-manual
- ci
- common
- jinja
- docs
- backend
- ops
- examples
- batched
- debug
- diffusion
- embedding
- eval-callback
- idle
- llama.android/lib/src/main/cpp
- lookahead
- lookup
- model-conversion/scripts
- causal
- embedding
- utils
- parallel
- passkey
- retrieval
- save-load-state
- speculative-simple
- speculative
- sycl
- training
- ggml
- include
- src
- ggml-blas
- ggml-cann
- ggml-cpu
- arch
- arm
- riscv
- x86
- kleidiai
- llamafile
- ggml-cuda
- template-instances
- vendors
- ggml-hexagon
- htp
- ggml-hip
- ggml-metal
- ggml-musa
- ggml-opencl
- kernels
- ggml-openvino
- ggml-rpc
- ggml-sycl
- ggml-vulkan
- vulkan-shaders
- ggml-webgpu
- wgsl-shaders
- gguf-py/gguf
- include
- models/templates
- requirements
- scripts
- hip
- jinja
- snapdragon
- adb
- windows
- src
- models
- tests
- peg-parser
- snapshots
- tools
- batched-bench
- cli
- completion
- cvector-generator
- export-lora
- fit-params
- gguf-split
- imatrix
- llama-bench
- mtmd
- debug
- models
- tests
- parser
- perplexity
- quantize
- results
- server
- bench
- public
- tests
- unit
- webui
- scripts
- src
- lib
- actions
- components/app
- actions
- chat
- ChatForm
- ChatFormActions
- ChatMessages
- ChatScreen
- ChatSettings
- ChatSidebar
- content
- dialogs
- mcp
- models
- constants
- contexts
- enums
- hooks
- services
- stores
- types
- utils
- routes
- tests
- e2e
- stories
- unit
- tts
- vendor/cpp-httplib
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
9 | 11 | | |
10 | 12 | | |
11 | 13 | | |
| |||
34 | 36 | | |
35 | 37 | | |
36 | 38 | | |
37 | | - | |
| 39 | + | |
38 | 40 | | |
39 | 41 | | |
40 | 42 | | |
| |||
55 | 57 | | |
56 | 58 | | |
57 | 59 | | |
58 | | - | |
59 | | - | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
60 | 63 | | |
61 | 64 | | |
62 | 65 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
16 | 18 | | |
17 | 19 | | |
18 | 20 | | |
| |||
39 | 41 | | |
40 | 42 | | |
41 | 43 | | |
42 | | - | |
| 44 | + | |
43 | 45 | | |
44 | 46 | | |
45 | 47 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
16 | 18 | | |
17 | 19 | | |
18 | 20 | | |
| |||
39 | 41 | | |
40 | 42 | | |
41 | 43 | | |
42 | | - | |
| 44 | + | |
43 | 45 | | |
44 | 46 | | |
45 | 47 | | |
| |||
60 | 62 | | |
61 | 63 | | |
62 | 64 | | |
63 | | - | |
| 65 | + | |
| 66 | + | |
64 | 67 | | |
65 | 68 | | |
66 | 69 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
36 | 53 | | |
37 | | - | |
| 54 | + | |
38 | 55 | | |
39 | 56 | | |
40 | 57 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| 44 | + | |
44 | 45 | | |
45 | 46 | | |
46 | 47 | | |
| |||
164 | 165 | | |
165 | 166 | | |
166 | 167 | | |
| 168 | + | |
167 | 169 | | |
168 | 170 | | |
169 | 171 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
81 | | - | |
| 81 | + | |
82 | 82 | | |
83 | 83 | | |
84 | 84 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | | - | |
| 61 | + | |
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
| |||
79 | 79 | | |
80 | 80 | | |
81 | 81 | | |
82 | | - | |
| 82 | + | |
83 | 83 | | |
84 | 84 | | |
85 | 85 | | |
| |||
0 commit comments