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 #14061] [MERGED] Revert "Update vendored llama.cpp to b7847" #61188

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

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/14061
Author: @jmorganca
Created: 2/4/2026
Status: ✅ Merged
Merged: 2/4/2026
Merged by: @jmorganca

Base: main ← Head: revert-13832-llama-update

📝 Commits (2)

  • 2bd40f8 Revert "Update vendor ggml code to a5bb8ba4 (#13832)"
  • ce52486 Fix gofmt formatting in capability.go

📊 Changes

240 files changed (+5022 additions, -21219 deletions)

View changed files

📝 .github/workflows/release.yaml (+1 -1)
📝 CMakePresets.json (+1 -16)
📝 Makefile.sync (+1 -1)
📝 integration/embed_test.go (+2 -12)
📝 integration/tools_test.go (+3 -8)
📝 llama/README.md (+14 -17)
📝 llama/build-info.cpp (+1 -1)
📝 llama/llama.cpp/common/common.cpp (+25 -44)
📝 llama/llama.cpp/common/common.h (+34 -59)
📝 llama/llama.cpp/common/sampling.cpp (+69 -160)
📝 llama/llama.cpp/common/sampling.h (+4 -9)
📝 llama/llama.cpp/include/llama-cpp.h (+1 -3)
📝 llama/llama.cpp/include/llama.h (+17 -136)
📝 llama/llama.cpp/src/llama-adapter.cpp (+2 -5)
📝 llama/llama.cpp/src/llama-adapter.h (+0 -4)
📝 llama/llama.cpp/src/llama-arch.cpp (+1 -114)
📝 llama/llama.cpp/src/llama-arch.h (+0 -9)
📝 llama/llama.cpp/src/llama-chat.cpp (+0 -31)
📝 llama/llama.cpp/src/llama-chat.h (+0 -2)
📝 llama/llama.cpp/src/llama-context.cpp (+177 -847)

...and 80 more files

📄 Description

Reverts ollama/ollama#13832 until we find out the source of slowness for GLM-4.7-Flash

🔄 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/14061 **Author:** [@jmorganca](https://github.com/jmorganca) **Created:** 2/4/2026 **Status:** ✅ Merged **Merged:** 2/4/2026 **Merged by:** [@jmorganca](https://github.com/jmorganca) **Base:** `main` ← **Head:** `revert-13832-llama-update` --- ### 📝 Commits (2) - [`2bd40f8`](https://github.com/ollama/ollama/commit/2bd40f845d7b0a304bc49c303355d014fac853af) Revert "Update vendor ggml code to a5bb8ba4 (#13832)" - [`ce52486`](https://github.com/ollama/ollama/commit/ce524860f0e13c73c656135792b4cb76d80dc111) Fix gofmt formatting in capability.go ### 📊 Changes **240 files changed** (+5022 additions, -21219 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/release.yaml` (+1 -1) 📝 `CMakePresets.json` (+1 -16) 📝 `Makefile.sync` (+1 -1) 📝 `integration/embed_test.go` (+2 -12) 📝 `integration/tools_test.go` (+3 -8) 📝 `llama/README.md` (+14 -17) 📝 `llama/build-info.cpp` (+1 -1) 📝 `llama/llama.cpp/common/common.cpp` (+25 -44) 📝 `llama/llama.cpp/common/common.h` (+34 -59) 📝 `llama/llama.cpp/common/sampling.cpp` (+69 -160) 📝 `llama/llama.cpp/common/sampling.h` (+4 -9) 📝 `llama/llama.cpp/include/llama-cpp.h` (+1 -3) 📝 `llama/llama.cpp/include/llama.h` (+17 -136) 📝 `llama/llama.cpp/src/llama-adapter.cpp` (+2 -5) 📝 `llama/llama.cpp/src/llama-adapter.h` (+0 -4) 📝 `llama/llama.cpp/src/llama-arch.cpp` (+1 -114) 📝 `llama/llama.cpp/src/llama-arch.h` (+0 -9) 📝 `llama/llama.cpp/src/llama-chat.cpp` (+0 -31) 📝 `llama/llama.cpp/src/llama-chat.h` (+0 -2) 📝 `llama/llama.cpp/src/llama-context.cpp` (+177 -847) _...and 80 more files_ </details> ### 📄 Description Reverts ollama/ollama#13832 until we find out the source of slowness for GLM-4.7-Flash --- <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 16:15:55 -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#61188
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?