[PR #462] [MERGED] remove marshalPrompt which is no longer needed #10163

Closed
opened 2026-04-12 22:53:12 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/462
Author: @mxyng
Created: 9/3/2023
Status: Merged
Merged: 9/5/2023
Merged by: @mxyng

Base: mainHead: mxyng/rm-marshal-prompt


📝 Commits (5)

  • 5d3f314 remove marshalPrompt which is no longer needed
  • 59a7055 fix not forwarding last token
  • 681f3c4 fix num_keep
  • 8dc6841 Merge pull request #463 from jmorganca/mxyng/fix-last-token
  • 7efbc84 Merge pull request #464 from jmorganca/mxyng/fix-num-keep

📊 Changes

2 files changed (+38 additions, -82 deletions)

View changed files

📝 llm/ggml_llama.go (+36 -81)
📝 server/routes.go (+2 -1)

📄 Description

llama.cpp server handles truncating input


🔄 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/462 **Author:** [@mxyng](https://github.com/mxyng) **Created:** 9/3/2023 **Status:** ✅ Merged **Merged:** 9/5/2023 **Merged by:** [@mxyng](https://github.com/mxyng) **Base:** `main` ← **Head:** `mxyng/rm-marshal-prompt` --- ### 📝 Commits (5) - [`5d3f314`](https://github.com/ollama/ollama/commit/5d3f314b0bdcc7a599f65e947bee65e3cc4c73bd) remove marshalPrompt which is no longer needed - [`59a7055`](https://github.com/ollama/ollama/commit/59a705525c91bfa407c2f5fa58eac33c109bdd4a) fix not forwarding last token - [`681f3c4`](https://github.com/ollama/ollama/commit/681f3c4c42a645fb3e9cbc4311ae6662d838a684) fix num_keep - [`8dc6841`](https://github.com/ollama/ollama/commit/8dc68417e7aa5598832fe8748a44de104871b4da) Merge pull request #463 from jmorganca/mxyng/fix-last-token - [`7efbc84`](https://github.com/ollama/ollama/commit/7efbc843204388b291b66623f40d603beacca094) Merge pull request #464 from jmorganca/mxyng/fix-num-keep ### 📊 Changes **2 files changed** (+38 additions, -82 deletions) <details> <summary>View changed files</summary> 📝 `llm/ggml_llama.go` (+36 -81) 📝 `server/routes.go` (+2 -1) </details> ### 📄 Description llama.cpp server handles truncating input --- <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 22:53:12 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#10163