github-starred/ollama-ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-03-09 03:12:11 -05:00
Code Issues 2.2k Packages Projects Releases 100 Wiki Activity

[PR #10655] [MERGED] llama: update to commit de4c07f9 #12052

New Issue
Closed
opened 2025-11-12 16:27:46 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-12 16:27:46 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/10655
Author: @jmorganca
Created: 5/11/2025
Status: ✅ Merged
Merged: 5/12/2025
Merged by: @jmorganca

Base: main ← Head: jmorganca/llama-update-4

📝 Commits (1)

  • cf43d80 llama: update to commit de4c07f93

📊 Changes

113 files changed (+7953 additions, -4239 deletions)

View changed files

📝 Makefile.sync (+1 -1)
📝 llama/build-info.cpp (+1 -1)
📝 llama/llama.cpp/.rsync-filter (+5 -5)
📝 llama/llama.cpp/common/common.cpp (+18 -1)
📝 llama/llama.cpp/common/common.h (+13 -5)
📝 llama/llama.cpp/common/sampling.cpp (+57 -50)
📝 llama/llama.cpp/include/llama.h (+51 -10)
📝 llama/llama.cpp/src/llama-adapter.cpp (+6 -0)
📝 llama/llama.cpp/src/llama-batch.cpp (+5 -1)
📝 llama/llama.cpp/src/llama-batch.h (+2 -1)
📝 llama/llama.cpp/src/llama-chat.cpp (+17 -7)
📝 llama/llama.cpp/src/llama-chat.h (+1 -0)
📝 llama/llama.cpp/src/llama-context.cpp (+401 -476)
📝 llama/llama.cpp/src/llama-context.h (+44 -33)
📝 llama/llama.cpp/src/llama-cparams.h (+2 -1)
📝 llama/llama.cpp/src/llama-graph.cpp (+20 -38)
📝 llama/llama.cpp/src/llama-graph.h (+12 -8)
📝 llama/llama.cpp/src/llama-kv-cache.cpp (+1485 -389)
📝 llama/llama.cpp/src/llama-kv-cache.h (+274 -81)
📝 llama/llama.cpp/src/llama-memory.h (+11 -1)

...and 80 more files

📄 Description

Fixes #10590

🔄 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/10655 **Author:** [@jmorganca](https://github.com/jmorganca) **Created:** 5/11/2025 **Status:** ✅ Merged **Merged:** 5/12/2025 **Merged by:** [@jmorganca](https://github.com/jmorganca) **Base:** `main` ← **Head:** `jmorganca/llama-update-4` --- ### 📝 Commits (1) - [`cf43d80`](https://github.com/ollama/ollama/commit/cf43d80fbeb9b5bf23e553d4684cced8e127ab15) llama: update to commit de4c07f93 ### 📊 Changes **113 files changed** (+7953 additions, -4239 deletions) <details> <summary>View changed files</summary> 📝 `Makefile.sync` (+1 -1) 📝 `llama/build-info.cpp` (+1 -1) 📝 `llama/llama.cpp/.rsync-filter` (+5 -5) 📝 `llama/llama.cpp/common/common.cpp` (+18 -1) 📝 `llama/llama.cpp/common/common.h` (+13 -5) 📝 `llama/llama.cpp/common/sampling.cpp` (+57 -50) 📝 `llama/llama.cpp/include/llama.h` (+51 -10) 📝 `llama/llama.cpp/src/llama-adapter.cpp` (+6 -0) 📝 `llama/llama.cpp/src/llama-batch.cpp` (+5 -1) 📝 `llama/llama.cpp/src/llama-batch.h` (+2 -1) 📝 `llama/llama.cpp/src/llama-chat.cpp` (+17 -7) 📝 `llama/llama.cpp/src/llama-chat.h` (+1 -0) 📝 `llama/llama.cpp/src/llama-context.cpp` (+401 -476) 📝 `llama/llama.cpp/src/llama-context.h` (+44 -33) 📝 `llama/llama.cpp/src/llama-cparams.h` (+2 -1) 📝 `llama/llama.cpp/src/llama-graph.cpp` (+20 -38) 📝 `llama/llama.cpp/src/llama-graph.h` (+12 -8) 📝 `llama/llama.cpp/src/llama-kv-cache.cpp` (+1485 -389) 📝 `llama/llama.cpp/src/llama-kv-cache.h` (+274 -81) 📝 `llama/llama.cpp/src/llama-memory.h` (+11 -1) _...and 80 more files_ </details> ### 📄 Description Fixes #10590 --- <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 2025-11-12 16:27:46 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
amd
api
app
bug
build
cli
client2
cloud
compatibility
context-length
create
docker
documentation
embeddings
engine
feature request
feedback wanted
good first issue
gpt-oss
gpu
harmony
help wanted
install
integration
intel
js
linux
macos
memory
model
needs more info
networking
nvidia
ollama.com
performance
pull-request
Mirrored from GitHub Pull Request
 python
question
registry
rendering
thinking
tools
top
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-ollama#12052
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?