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

[PR #12275] [MERGED] Undo harmony runner changes #24303

New Issue
Closed
opened 2026-04-19 17:30:18 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-19 17:30:18 -05:00
Owner
Copy Link

📋 Pull Request Information

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

Base: main ← Head: jmorganca/revert-harmony-runner

📝 Commits (2)

  • 58bb95c Revert "runner: simplify parser entrypoints in runner (#12233)"
  • a6aac6e Revert "runner: move harmony to runner (#12052)"

📊 Changes

7 files changed (+347 additions, -475 deletions)

View changed files

📝 harmony/harmonyparser.go (+21 -43)
📝 harmony/harmonyparser_test.go (+0 -200)
📝 llm/server.go (+15 -19)
➖ parser/token_parser.go (+0 -126)
📝 runner/ollamarunner/runner.go (+1 -16)
📝 server/routes.go (+89 -55)
📝 server/routes_harmony_streaming_test.go (+221 -16)

📄 Description

Reverts commits 1a558f98e2 and 8d6fffaead as there was a regression with /api/generate causing the integration test TestGenerateWithHistory to fail

🔄 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/12275 **Author:** [@jmorganca](https://github.com/jmorganca) **Created:** 9/12/2025 **Status:** ✅ Merged **Merged:** 9/12/2025 **Merged by:** [@jmorganca](https://github.com/jmorganca) **Base:** `main` ← **Head:** `jmorganca/revert-harmony-runner` --- ### 📝 Commits (2) - [`58bb95c`](https://github.com/ollama/ollama/commit/58bb95c20450b0e8db0726b67c1b70df44cdc77f) Revert "runner: simplify parser entrypoints in runner (#12233)" - [`a6aac6e`](https://github.com/ollama/ollama/commit/a6aac6ef9fa3558ff43e6e88918a5869bb76a768) Revert "runner: move harmony to runner (#12052)" ### 📊 Changes **7 files changed** (+347 additions, -475 deletions) <details> <summary>View changed files</summary> 📝 `harmony/harmonyparser.go` (+21 -43) 📝 `harmony/harmonyparser_test.go` (+0 -200) 📝 `llm/server.go` (+15 -19) ➖ `parser/token_parser.go` (+0 -126) 📝 `runner/ollamarunner/runner.go` (+1 -16) 📝 `server/routes.go` (+89 -55) 📝 `server/routes_harmony_streaming_test.go` (+221 -16) </details> ### 📄 Description Reverts commits 1a558f98e2d07885efb6cf82943ae029c647f3d0 and 8d6fffaead722d86622b17c059051796d2621858 as there was a regression with `/api/generate` causing the integration test `TestGenerateWithHistory` to fail --- <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-19 17:30:18 -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#24303
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?