github-starred/ollama-ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-04-27 16:36:54 -05:00
Code Issues 2.2k Packages Projects Releases 100 Wiki Activity

[PR #10513] [MERGED] llama: update to e1e8e099 #11999

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

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/10513
Author: @jmorganca
Created: 5/1/2025
Status: ✅ Merged
Merged: 5/2/2025
Merged by: @jmorganca

Base: main ← Head: jmorganca/llama-update

📝 Commits (1)

  • 48e3548 llama: update to e1e8e099

📊 Changes

68 files changed (+3745 additions, -1736 deletions)

View changed files

📝 Makefile.sync (+1 -1)
📝 llama/build-info.cpp (+1 -1)
📝 llama/llama.cpp/common/common.h (+2 -0)
📝 llama/llama.cpp/common/json-schema-to-grammar.cpp (+3 -0)
📝 llama/llama.cpp/examples/llava/clip-impl.h (+27 -23)
📝 llama/llama.cpp/examples/llava/clip.cpp (+1088 -421)
📝 llama/llama.cpp/examples/llava/clip.h (+15 -6)
📝 llama/llama.cpp/examples/llava/llava.cpp (+8 -7)
📝 llama/llama.cpp/include/llama.h (+2 -0)
📝 llama/llama.cpp/src/llama-arch.cpp (+20 -0)
📝 llama/llama.cpp/src/llama-arch.h (+2 -0)
📝 llama/llama.cpp/src/llama-chat.cpp (+30 -17)
📝 llama/llama.cpp/src/llama-chat.h (+3 -2)
📝 llama/llama.cpp/src/llama-context.cpp (+4 -17)
📝 llama/llama.cpp/src/llama-context.h (+1 -2)
📝 llama/llama.cpp/src/llama-graph.cpp (+42 -16)
📝 llama/llama.cpp/src/llama-graph.h (+5 -7)
📝 llama/llama.cpp/src/llama-hparams.h (+1 -0)
📝 llama/llama.cpp/src/llama-model.cpp (+59 -11)
📝 llama/llama.cpp/src/llama-model.h (+6 -2)

...and 48 more files

📄 Description

No description provided

🔄 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/10513 **Author:** [@jmorganca](https://github.com/jmorganca) **Created:** 5/1/2025 **Status:** ✅ Merged **Merged:** 5/2/2025 **Merged by:** [@jmorganca](https://github.com/jmorganca) **Base:** `main` ← **Head:** `jmorganca/llama-update` --- ### 📝 Commits (1) - [`48e3548`](https://github.com/ollama/ollama/commit/48e35482517a60e0e302efd1b53dff9a08791bb6) llama: update to e1e8e099 ### 📊 Changes **68 files changed** (+3745 additions, -1736 deletions) <details> <summary>View changed files</summary> 📝 `Makefile.sync` (+1 -1) 📝 `llama/build-info.cpp` (+1 -1) 📝 `llama/llama.cpp/common/common.h` (+2 -0) 📝 `llama/llama.cpp/common/json-schema-to-grammar.cpp` (+3 -0) 📝 `llama/llama.cpp/examples/llava/clip-impl.h` (+27 -23) 📝 `llama/llama.cpp/examples/llava/clip.cpp` (+1088 -421) 📝 `llama/llama.cpp/examples/llava/clip.h` (+15 -6) 📝 `llama/llama.cpp/examples/llava/llava.cpp` (+8 -7) 📝 `llama/llama.cpp/include/llama.h` (+2 -0) 📝 `llama/llama.cpp/src/llama-arch.cpp` (+20 -0) 📝 `llama/llama.cpp/src/llama-arch.h` (+2 -0) 📝 `llama/llama.cpp/src/llama-chat.cpp` (+30 -17) 📝 `llama/llama.cpp/src/llama-chat.h` (+3 -2) 📝 `llama/llama.cpp/src/llama-context.cpp` (+4 -17) 📝 `llama/llama.cpp/src/llama-context.h` (+1 -2) 📝 `llama/llama.cpp/src/llama-graph.cpp` (+42 -16) 📝 `llama/llama.cpp/src/llama-graph.h` (+5 -7) 📝 `llama/llama.cpp/src/llama-hparams.h` (+1 -0) 📝 `llama/llama.cpp/src/llama-model.cpp` (+59 -11) 📝 `llama/llama.cpp/src/llama-model.h` (+6 -2) _...and 48 more files_ </details> ### 📄 Description _No description provided_ --- <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:26:30 -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#11999
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?