github-starred/ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-05-21 05:01:48 -05:00
Code Issues 16.9k Packages Projects Releases 122 Wiki Activity

[PR #6642] [MERGED] llm: use json.hpp from common #12181

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

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/6642
Author: @iscy
Created: 9/4/2024
Status: ✅ Merged
Merged: 9/4/2024
Merged by: @jmorganca

Base: main ← Head: use-json-from-common

📝 Commits (1)

  • e58e1f2 llm: use json.hpp from common

📊 Changes

2 files changed (+1 additions, -24597 deletions)

View changed files

📝 llm/ext_server/CMakeLists.txt (+1 -1)
➖ llm/ext_server/json.hpp (+0 -24596)

📄 Description

The version of json.hpp from the 'common' module was no longer the same as the one within the 'ext_server' module. The discrepancy can cause linking errors depending on the functions used. This patch remove the old version in favor of using the one found in the common module.

🔄 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/6642 **Author:** [@iscy](https://github.com/iscy) **Created:** 9/4/2024 **Status:** ✅ Merged **Merged:** 9/4/2024 **Merged by:** [@jmorganca](https://github.com/jmorganca) **Base:** `main` ← **Head:** `use-json-from-common` --- ### 📝 Commits (1) - [`e58e1f2`](https://github.com/ollama/ollama/commit/e58e1f250ea7f0ad052667146dfa79dea0174527) llm: use json.hpp from common ### 📊 Changes **2 files changed** (+1 additions, -24597 deletions) <details> <summary>View changed files</summary> 📝 `llm/ext_server/CMakeLists.txt` (+1 -1) ➖ `llm/ext_server/json.hpp` (+0 -24596) </details> ### 📄 Description The version of json.hpp from the 'common' module was no longer the same as the one within the 'ext_server' module. The discrepancy can cause linking errors depending on the functions used. This patch remove the old version in favor of using the one found in the common module. --- <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:51:27 -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#12181
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?