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 #5475] [MERGED] update llama.cpp submodule to d7fd29f #11795

New Issue
Closed
opened 2026-04-12 23:39:06 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-12 23:39:06 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/5475
Author: @jmorganca
Created: 7/4/2024
Status: ✅ Merged
Merged: 7/5/2024
Merged by: @jmorganca

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

📝 Commits (10+)

📊 Changes

15 files changed (+150 additions, -422 deletions)

View changed files

📝 docs/development.md (+1 -1)
📝 llm/ext_server/CMakeLists.txt (+13 -13)
📝 llm/generate/gen_darwin.sh (+8 -8)
📝 llm/generate/gen_linux.sh (+18 -18)
📝 llm/generate/gen_windows.ps1 (+22 -22)
📝 llm/llama.cpp (+1 -1)
📝 llm/llm.go (+7 -7)
📝 llm/patches/01-load-progress.diff (+7 -7)
📝 llm/patches/03-load_exception.diff (+6 -18)
📝 llm/patches/04-metal.diff (+3 -3)
📝 llm/patches/05-default-pretokenizer.diff (+9 -9)
📝 llm/patches/06-qwen2.diff (+3 -3)
➕ llm/patches/07-embeddings.diff (+45 -0)
➖ llm/patches/07-gemma.diff (+0 -305)
📝 llm/patches/09-pooling.diff (+7 -7)

📄 Description

Fixes #5157

🔄 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/5475 **Author:** [@jmorganca](https://github.com/jmorganca) **Created:** 7/4/2024 **Status:** ✅ Merged **Merged:** 7/5/2024 **Merged by:** [@jmorganca](https://github.com/jmorganca) **Base:** `main` ← **Head:** `jmorganca/llama-cpp-update` --- ### 📝 Commits (10+) - [`2c32af2`](https://github.com/ollama/ollama/commit/2c32af211f0d2d3c28a7c3ae5a301129c7cf636b) update llama.cpp submodule to `a27152b6` - [`7bc0923`](https://github.com/ollama/ollama/commit/7bc09238726a513c08e0c938ee3a19aff4ca26dc) fix build - [`6bd11e2`](https://github.com/ollama/ollama/commit/6bd11e22438bbe85c9e7af762c2dea1fa068217f) fix build on macOS - [`97caca5`](https://github.com/ollama/ollama/commit/97caca505e1eb9f8cf924beb078c0faa8d7cea47) fix rocm build on windows - [`287674a`](https://github.com/ollama/ollama/commit/287674ade3ecb30fdcbe46ccf336b8dce3cbb86e) fix windows build - [`9d09ced`](https://github.com/ollama/ollama/commit/9d09ced36940886ad85fadef6dd559ee7acaa172) link `ggml` and `llama` - [`e502e45`](https://github.com/ollama/ollama/commit/e502e4567020ed35c0fa0ddc2331ee66c3832fcb) maybe fix linux build - [`44a0ff8`](https://github.com/ollama/ollama/commit/44a0ff860d362bcf7a8e0addd63a825d106eeb1a) maybe fix linux build - [`8134277`](https://github.com/ollama/ollama/commit/8134277c1a1790ae41ff6e2161b1d60762323039) update commit to `807b0c4` - [`987572b`](https://github.com/ollama/ollama/commit/987572b035261fbb1fa065f2e0237baccfedf068) update patches ### 📊 Changes **15 files changed** (+150 additions, -422 deletions) <details> <summary>View changed files</summary> 📝 `docs/development.md` (+1 -1) 📝 `llm/ext_server/CMakeLists.txt` (+13 -13) 📝 `llm/generate/gen_darwin.sh` (+8 -8) 📝 `llm/generate/gen_linux.sh` (+18 -18) 📝 `llm/generate/gen_windows.ps1` (+22 -22) 📝 `llm/llama.cpp` (+1 -1) 📝 `llm/llm.go` (+7 -7) 📝 `llm/patches/01-load-progress.diff` (+7 -7) 📝 `llm/patches/03-load_exception.diff` (+6 -18) 📝 `llm/patches/04-metal.diff` (+3 -3) 📝 `llm/patches/05-default-pretokenizer.diff` (+9 -9) 📝 `llm/patches/06-qwen2.diff` (+3 -3) ➕ `llm/patches/07-embeddings.diff` (+45 -0) ➖ `llm/patches/07-gemma.diff` (+0 -305) 📝 `llm/patches/09-pooling.diff` (+7 -7) </details> ### 📄 Description Fixes #5157 --- <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-12 23:39:06 -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#11795
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?