github-starred/ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-05-06 16:11:34 -05:00
Code Issues 14.5k Packages Projects Releases 120 Wiki Activity

[PR #9356] [MERGED] llama: update llama.cpp and ggml vendor code to commit d7cfe1ff #12925

New Issue
Closed
opened 2026-04-13 00:12:50 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-13 00:12:50 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/9356
Author: @jmorganca
Created: 2/26/2025
Status: ✅ Merged
Merged: 2/27/2025
Merged by: @jmorganca

Base: main ← Head: jmorganca/llama-update

📝 Commits (1)

📊 Changes

149 files changed (+18221 additions, -11015 deletions)

View changed files

📝 Makefile.sync (+1 -1)
📝 llama/build-info.cpp (+1 -1)
📝 llama/llama.cpp/common/common.cpp (+206 -147)
📝 llama/llama.cpp/common/common.h (+74 -54)
📝 llama/llama.cpp/common/json-schema-to-grammar.cpp (+46 -66)
📝 llama/llama.cpp/common/json-schema-to-grammar.h (+15 -1)
📝 llama/llama.cpp/common/log.cpp (+2 -10)
📝 llama/llama.cpp/common/log.h (+12 -1)
📝 llama/llama.cpp/common/sampling.cpp (+76 -44)
📝 llama/llama.cpp/common/sampling.h (+3 -0)
📝 llama/llama.cpp/examples/llava/clip.cpp (+234 -39)
📝 llama/llama.cpp/examples/llava/clip.h (+8 -0)
📝 llama/llama.cpp/examples/llava/llava.cpp (+28 -12)
📝 llama/llama.cpp/include/llama-cpp.h (+4 -4)
📝 llama/llama.cpp/include/llama.h (+152 -90)
📝 llama/llama.cpp/src/llama-adapter.cpp (+57 -44)
📝 llama/llama.cpp/src/llama-adapter.h (+36 -28)
📝 llama/llama.cpp/src/llama-arch.cpp (+96 -38)
📝 llama/llama.cpp/src/llama-arch.h (+8 -1)
📝 llama/llama.cpp/src/llama-chat.cpp (+23 -3)

...and 80 more files

📄 Description

No description provided

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/9356 **Author:** [@jmorganca](https://github.com/jmorganca) **Created:** 2/26/2025 **Status:** ✅ Merged **Merged:** 2/27/2025 **Merged by:** [@jmorganca](https://github.com/jmorganca) **Base:** `main` ← **Head:** `jmorganca/llama-update` --- ### 📝 Commits (1) - [`659117a`](https://github.com/ollama/ollama/commit/659117a7a85310ab186c7c6aeeccca3f8d507e67) update llama.cpp commit ### 📊 Changes **149 files changed** (+18221 additions, -11015 deletions) <details> <summary>View changed files</summary> 📝 `Makefile.sync` (+1 -1) 📝 `llama/build-info.cpp` (+1 -1) 📝 `llama/llama.cpp/common/common.cpp` (+206 -147) 📝 `llama/llama.cpp/common/common.h` (+74 -54) 📝 `llama/llama.cpp/common/json-schema-to-grammar.cpp` (+46 -66) 📝 `llama/llama.cpp/common/json-schema-to-grammar.h` (+15 -1) 📝 `llama/llama.cpp/common/log.cpp` (+2 -10) 📝 `llama/llama.cpp/common/log.h` (+12 -1) 📝 `llama/llama.cpp/common/sampling.cpp` (+76 -44) 📝 `llama/llama.cpp/common/sampling.h` (+3 -0) 📝 `llama/llama.cpp/examples/llava/clip.cpp` (+234 -39) 📝 `llama/llama.cpp/examples/llava/clip.h` (+8 -0) 📝 `llama/llama.cpp/examples/llava/llava.cpp` (+28 -12) 📝 `llama/llama.cpp/include/llama-cpp.h` (+4 -4) 📝 `llama/llama.cpp/include/llama.h` (+152 -90) 📝 `llama/llama.cpp/src/llama-adapter.cpp` (+57 -44) 📝 `llama/llama.cpp/src/llama-adapter.h` (+36 -28) 📝 `llama/llama.cpp/src/llama-arch.cpp` (+96 -38) 📝 `llama/llama.cpp/src/llama-arch.h` (+8 -1) 📝 `llama/llama.cpp/src/llama-chat.cpp` (+23 -3) _...and 80 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-13 00:12:50 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
amd
api
app
bug
build
cli
cloud
compatibility
context-length
create
docker
documentation
embeddings
feature request
feedback wanted
good first issue
gpt-oss
gpu
harmony
help wanted
image
install
intel
js
launch
linux
macos
memory
mlx
model
needs more info
networking
nvidia
ollama.com
performance
pull-request
Mirrored from GitHub Pull Request
 python
question
registry
rendering
thinking
tools
top
vulkan
windows
wsl
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#12925
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?