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 #12992] [MERGED] ggml update to b7209 #60729

New Issue
Closed
opened 2026-04-29 15:51:35 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-29 15:51:35 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/12992
Author: @dhiltgen
Created: 11/7/2025
Status: ✅ Merged
Merged: 12/4/2025
Merged by: @dhiltgen

Base: main ← Head: ggml_bump

📝 Commits (8)

📊 Changes

303 files changed (+32972 additions, -23696 deletions)

View changed files

📝 Makefile.sync (+1 -1)
📝 llama/build-info.cpp (+1 -1)
📝 llama/llama.cpp/.rsync-filter (+3 -0)
📝 llama/llama.cpp/common/common.cpp (+97 -6)
📝 llama/llama.cpp/common/common.h (+45 -6)
📝 llama/llama.cpp/common/json-schema-to-grammar.cpp (+23 -5)
📝 llama/llama.cpp/common/json-schema-to-grammar.h (+2 -0)
📝 llama/llama.cpp/common/log.cpp (+6 -0)
📝 llama/llama.cpp/common/log.h (+2 -0)
📝 llama/llama.cpp/common/sampling.cpp (+60 -6)
📝 llama/llama.cpp/include/llama.h (+25 -3)
📝 llama/llama.cpp/src/llama-arch.cpp (+235 -16)
📝 llama/llama.cpp/src/llama-arch.h (+28 -0)
📝 llama/llama.cpp/src/llama-batch.cpp (+63 -31)
📝 llama/llama.cpp/src/llama-batch.h (+12 -1)
📝 llama/llama.cpp/src/llama-chat.cpp (+32 -0)
📝 llama/llama.cpp/src/llama-chat.h (+1 -0)
📝 llama/llama.cpp/src/llama-context.cpp (+51 -19)
📝 llama/llama.cpp/src/llama-context.h (+5 -5)
📝 llama/llama.cpp/src/llama-cparams.h (+1 -0)

...and 80 more files

📄 Description

solar-pro required adjusting to the recent model definition refactoring upstream, along with argsort on metal.

🔄 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/12992 **Author:** [@dhiltgen](https://github.com/dhiltgen) **Created:** 11/7/2025 **Status:** ✅ Merged **Merged:** 12/4/2025 **Merged by:** [@dhiltgen](https://github.com/dhiltgen) **Base:** `main` ← **Head:** `ggml_bump` --- ### 📝 Commits (8) - [`25f4ffa`](https://github.com/ollama/ollama/commit/25f4ffaab215865a084c7f49ae4e77d17e852f3e) Revert "vulkan: temporary cary of vulkan fixes (#12971)" - [`202a34f`](https://github.com/ollama/ollama/commit/202a34fb6152367d06586120c9b288d7f4daec97) ggml update to b7087 - [`98376ed`](https://github.com/ollama/ollama/commit/98376ed43889e78596de901695952a6cac6c7dfb) fix argsort on metal - [`a946171`](https://github.com/ollama/ollama/commit/a946171b909ed29634504f9a00cd7deca22833f4) update to b7108 - [`58e5939`](https://github.com/ollama/ollama/commit/58e5939b287851af09ac2562b9ddb2f096126c7e) fix bakllava regression - [`8d09845`](https://github.com/ollama/ollama/commit/8d09845e4c8f21b77a749e4124d8c3d470cba1bd) update to b7209 - [`06367bd`](https://github.com/ollama/ollama/commit/06367bd0da24dc9680529d0f03816bed1ad08a44) fix TopK perf - [`7c546e6`](https://github.com/ollama/ollama/commit/7c546e641c3b55b9fb8236488d775e4e7795673e) only build arm code on arm ### 📊 Changes **303 files changed** (+32972 additions, -23696 deletions) <details> <summary>View changed files</summary> 📝 `Makefile.sync` (+1 -1) 📝 `llama/build-info.cpp` (+1 -1) 📝 `llama/llama.cpp/.rsync-filter` (+3 -0) 📝 `llama/llama.cpp/common/common.cpp` (+97 -6) 📝 `llama/llama.cpp/common/common.h` (+45 -6) 📝 `llama/llama.cpp/common/json-schema-to-grammar.cpp` (+23 -5) 📝 `llama/llama.cpp/common/json-schema-to-grammar.h` (+2 -0) 📝 `llama/llama.cpp/common/log.cpp` (+6 -0) 📝 `llama/llama.cpp/common/log.h` (+2 -0) 📝 `llama/llama.cpp/common/sampling.cpp` (+60 -6) 📝 `llama/llama.cpp/include/llama.h` (+25 -3) 📝 `llama/llama.cpp/src/llama-arch.cpp` (+235 -16) 📝 `llama/llama.cpp/src/llama-arch.h` (+28 -0) 📝 `llama/llama.cpp/src/llama-batch.cpp` (+63 -31) 📝 `llama/llama.cpp/src/llama-batch.h` (+12 -1) 📝 `llama/llama.cpp/src/llama-chat.cpp` (+32 -0) 📝 `llama/llama.cpp/src/llama-chat.h` (+1 -0) 📝 `llama/llama.cpp/src/llama-context.cpp` (+51 -19) 📝 `llama/llama.cpp/src/llama-context.h` (+5 -5) 📝 `llama/llama.cpp/src/llama-cparams.h` (+1 -0) _...and 80 more files_ </details> ### 📄 Description solar-pro required adjusting to the recent model definition refactoring upstream, along with argsort on metal. --- <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-29 15:51:35 -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#60729
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?