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

[PR #11009] [CLOSED] llama: update vendored code to commit 1caae7fc #18683

New Issue
Closed
opened 2026-04-16 06:43:14 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-16 06:43:14 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/11009
Author: @jmorganca
Created: 6/7/2025
Status: ❌ Closed

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

📝 Commits (2)

  • e520977 llama: update vendored code to commit 1caae7fc6c77551cb1066515e0f414713eebb367
  • f5d663e update patches

📊 Changes

126 files changed (+142322 additions, -6224 deletions)

View changed files

📝 Makefile.sync (+1 -1)
📝 llama/build-info.cpp (+1 -1)
📝 llama/llama.cpp/.rsync-filter (+18 -2)
➕ llama/llama.cpp/common/arg.cpp (+3380 -0)
➕ llama/llama.cpp/common/arg.h (+89 -0)
➕ llama/llama.cpp/common/chat-parser.cpp (+380 -0)
➕ llama/llama.cpp/common/chat-parser.h (+118 -0)
➕ llama/llama.cpp/common/chat.cpp (+1930 -0)
➕ llama/llama.cpp/common/chat.h (+202 -0)
📝 llama/llama.cpp/common/common.cpp (+35 -82)
📝 llama/llama.cpp/common/common.go (+2 -1)
📝 llama/llama.cpp/common/common.h (+17 -18)
➕ llama/llama.cpp/common/console.cpp (+504 -0)
➕ llama/llama.cpp/common/console.h (+19 -0)
➕ llama/llama.cpp/common/json-partial.cpp (+256 -0)
➕ llama/llama.cpp/common/json-partial.h (+38 -0)
📝 llama/llama.cpp/common/json-schema-to-grammar.cpp (+2 -1)
📝 llama/llama.cpp/common/json-schema-to-grammar.h (+4 -4)
➕ llama/llama.cpp/common/regex-partial.cpp (+204 -0)
➕ llama/llama.cpp/common/regex-partial.h (+56 -0)

...and 80 more files

📄 Description

This is missing the KV cache patch which needs to be applied

🔄 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/11009 **Author:** [@jmorganca](https://github.com/jmorganca) **Created:** 6/7/2025 **Status:** ❌ Closed **Base:** `main` ← **Head:** `jmorganca/llama-update-6` --- ### 📝 Commits (2) - [`e520977`](https://github.com/ollama/ollama/commit/e5209778f1e23987286bc68f35abc352c9b12f63) llama: update vendored code to commit 1caae7fc6c77551cb1066515e0f414713eebb367 - [`f5d663e`](https://github.com/ollama/ollama/commit/f5d663e370a7bdb0acda66a448f21cc8f96f9b83) update patches ### 📊 Changes **126 files changed** (+142322 additions, -6224 deletions) <details> <summary>View changed files</summary> 📝 `Makefile.sync` (+1 -1) 📝 `llama/build-info.cpp` (+1 -1) 📝 `llama/llama.cpp/.rsync-filter` (+18 -2) ➕ `llama/llama.cpp/common/arg.cpp` (+3380 -0) ➕ `llama/llama.cpp/common/arg.h` (+89 -0) ➕ `llama/llama.cpp/common/chat-parser.cpp` (+380 -0) ➕ `llama/llama.cpp/common/chat-parser.h` (+118 -0) ➕ `llama/llama.cpp/common/chat.cpp` (+1930 -0) ➕ `llama/llama.cpp/common/chat.h` (+202 -0) 📝 `llama/llama.cpp/common/common.cpp` (+35 -82) 📝 `llama/llama.cpp/common/common.go` (+2 -1) 📝 `llama/llama.cpp/common/common.h` (+17 -18) ➕ `llama/llama.cpp/common/console.cpp` (+504 -0) ➕ `llama/llama.cpp/common/console.h` (+19 -0) ➕ `llama/llama.cpp/common/json-partial.cpp` (+256 -0) ➕ `llama/llama.cpp/common/json-partial.h` (+38 -0) 📝 `llama/llama.cpp/common/json-schema-to-grammar.cpp` (+2 -1) 📝 `llama/llama.cpp/common/json-schema-to-grammar.h` (+4 -4) ➕ `llama/llama.cpp/common/regex-partial.cpp` (+204 -0) ➕ `llama/llama.cpp/common/regex-partial.h` (+56 -0) _...and 80 more files_ </details> ### 📄 Description This is missing the KV cache patch which needs to be applied --- <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-16 06:43:14 -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#18683
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?