github-starred/ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-05-08 17:49:24 -05:00
Code Issues 14.5k Packages Projects Releases 122 Wiki Activity

[PR #10352] [MERGED] llama: update to commit 2016f07b #13219

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

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/10352
Author: @jmorganca
Created: 4/20/2025
Status: ✅ Merged
Merged: 4/25/2025
Merged by: @jmorganca

Base: main ← Head: jmorganca/llama-update

📝 Commits (1)

  • 2131fb7 llama: update to commit 2016f07

📊 Changes

46 files changed (+1956 additions, -1742 deletions)

View changed files

📝 Makefile.sync (+1 -1)
📝 llama/build-info.cpp (+1 -1)
📝 llama/llama.cpp/examples/llava/clip-impl.h (+0 -3)
📝 llama/llama.cpp/examples/llava/clip.cpp (+456 -450)
📝 llama/llama.cpp/src/llama-arch.cpp (+6 -17)
📝 llama/llama.cpp/src/llama-arch.h (+4 -0)
📝 llama/llama.cpp/src/llama-context.cpp (+5 -1)
📝 llama/llama.cpp/src/llama-graph.cpp (+20 -9)
📝 llama/llama.cpp/src/llama-graph.h (+7 -3)
📝 llama/llama.cpp/src/llama-hparams.h (+4 -0)
📝 llama/llama.cpp/src/llama-kv-cache.cpp (+1 -1)
📝 llama/llama.cpp/src/llama-model.cpp (+190 -138)
📝 llama/llama.cpp/src/llama-model.h (+2 -0)
📝 llama/llama.cpp/src/llama-vocab.cpp (+5 -0)
📝 llama/patches/0001-ggml-backend-malloc-and-free-using-the-same-compiler.patch (+17 -17)
📝 llama/patches/0002-pretokenizer.patch (+1 -1)
📝 llama/patches/0003-embeddings.patch (+4 -4)
📝 llama/patches/0004-clip-unicode.patch (+5 -5)
📝 llama/patches/0005-solar-pro.patch (+23 -23)
📝 llama/patches/0006-add-mllama-support.patch (+46 -46)

...and 26 more files

📄 Description

Reduces how many patches are being carried

🔄 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/10352 **Author:** [@jmorganca](https://github.com/jmorganca) **Created:** 4/20/2025 **Status:** ✅ Merged **Merged:** 4/25/2025 **Merged by:** [@jmorganca](https://github.com/jmorganca) **Base:** `main` ← **Head:** `jmorganca/llama-update` --- ### 📝 Commits (1) - [`2131fb7`](https://github.com/ollama/ollama/commit/2131fb73f5394ce9e3b780403cfe1cf8f2eb19b7) llama: update to commit 2016f07 ### 📊 Changes **46 files changed** (+1956 additions, -1742 deletions) <details> <summary>View changed files</summary> 📝 `Makefile.sync` (+1 -1) 📝 `llama/build-info.cpp` (+1 -1) 📝 `llama/llama.cpp/examples/llava/clip-impl.h` (+0 -3) 📝 `llama/llama.cpp/examples/llava/clip.cpp` (+456 -450) 📝 `llama/llama.cpp/src/llama-arch.cpp` (+6 -17) 📝 `llama/llama.cpp/src/llama-arch.h` (+4 -0) 📝 `llama/llama.cpp/src/llama-context.cpp` (+5 -1) 📝 `llama/llama.cpp/src/llama-graph.cpp` (+20 -9) 📝 `llama/llama.cpp/src/llama-graph.h` (+7 -3) 📝 `llama/llama.cpp/src/llama-hparams.h` (+4 -0) 📝 `llama/llama.cpp/src/llama-kv-cache.cpp` (+1 -1) 📝 `llama/llama.cpp/src/llama-model.cpp` (+190 -138) 📝 `llama/llama.cpp/src/llama-model.h` (+2 -0) 📝 `llama/llama.cpp/src/llama-vocab.cpp` (+5 -0) 📝 `llama/patches/0001-ggml-backend-malloc-and-free-using-the-same-compiler.patch` (+17 -17) 📝 `llama/patches/0002-pretokenizer.patch` (+1 -1) 📝 `llama/patches/0003-embeddings.patch` (+4 -4) 📝 `llama/patches/0004-clip-unicode.patch` (+5 -5) 📝 `llama/patches/0005-solar-pro.patch` (+23 -23) 📝 `llama/patches/0006-add-mllama-support.patch` (+46 -46) _...and 26 more files_ </details> ### 📄 Description Reduces how many patches are being carried --- <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:21:16 -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#13219
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?