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

[PR #1788] [MERGED] Revamp code layout for the llm directory and llama.cpp submodule #10676

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

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/1788
Author: @dhiltgen
Created: 1/4/2024
Status: ✅ Merged
Merged: 1/4/2024
Merged by: @dhiltgen

Base: main ← Head: llm_code_shuffle

📝 Commits (3)

  • 77d96da Code shuffle to clean up the llm dir
  • a554616 remove old llama.cpp submodule path
  • fac9060 Init submodule with new path

📊 Changes

19 files changed (+57 additions, -51 deletions)

View changed files

📝 .dockerignore (+1 -1)
📝 .gitmodules (+4 -5)
📝 llm/ext_server/CMakeLists.txt (+1 -1)
➕ llm/ext_server/README.md (+4 -0)
📝 llm/ext_server/ext_server.cpp (+0 -0)
📝 llm/ext_server/ext_server.h (+0 -0)
📝 llm/ext_server_common.go (+9 -9)
📝 llm/generate/gen_common.sh (+7 -7)
📝 llm/generate/gen_darwin.sh (+2 -2)
📝 llm/generate/gen_linux.sh (+4 -4)
📝 llm/generate/gen_windows.ps1 (+12 -11)
📝 llm/generate/generate_darwin.go (+1 -1)
📝 llm/generate/generate_linux.go (+1 -1)
📝 llm/generate/generate_windows.go (+1 -1)
📝 llm/llama.cpp (+0 -0)
📝 llm/shim_darwin.go (+2 -2)
📝 llm/shim_ext_server.go (+6 -4)
📝 llm/shim_ext_server_linux.go (+1 -1)
📝 llm/shim_ext_server_windows.go (+1 -1)

📄 Description

Now that we only submodule llama.cpp once, we can tidy up the paths a bit.

This also moves the ext_server c++ code to a distinct directory to solve the go test glitch.

% go test ./...
# github.com/jmorganca/ollama/llm
cgo-gcc-prolog:153:33: warning: unused variable '_cgo_a' [-Wunused-variable]
cgo-gcc-prolog:165:33: warning: unused variable '_cgo_a' [-Wunused-variable]
?       github.com/jmorganca/ollama     [no test files]
?       github.com/jmorganca/ollama/cmd [no test files]
?       github.com/jmorganca/ollama/examples/golang-simplegenerate      [no test files]
?       github.com/jmorganca/ollama/llm [no test files]
?       github.com/jmorganca/ollama/llm/generate        [no test files]
?       github.com/jmorganca/ollama/parser      [no test files]
?       github.com/jmorganca/ollama/progress    [no test files]
?       github.com/jmorganca/ollama/readline    [no test files]
ok      github.com/jmorganca/ollama/api 0.317s
ok      github.com/jmorganca/ollama/format      0.212s
?       github.com/jmorganca/ollama/version     [no test files]
ok      github.com/jmorganca/ollama/gpu 0.211s
ok      github.com/jmorganca/ollama/server      0.203s

🔄 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/1788 **Author:** [@dhiltgen](https://github.com/dhiltgen) **Created:** 1/4/2024 **Status:** ✅ Merged **Merged:** 1/4/2024 **Merged by:** [@dhiltgen](https://github.com/dhiltgen) **Base:** `main` ← **Head:** `llm_code_shuffle` --- ### 📝 Commits (3) - [`77d96da`](https://github.com/ollama/ollama/commit/77d96da94b74c34ad806fddf825fda97690a8dec) Code shuffle to clean up the llm dir - [`a554616`](https://github.com/ollama/ollama/commit/a554616f8e9c5d217040c96d2722e4c5c0b05811) remove old llama.cpp submodule path - [`fac9060`](https://github.com/ollama/ollama/commit/fac9060da5769feea3ec867a4eb190dabed9e38c) Init submodule with new path ### 📊 Changes **19 files changed** (+57 additions, -51 deletions) <details> <summary>View changed files</summary> 📝 `.dockerignore` (+1 -1) 📝 `.gitmodules` (+4 -5) 📝 `llm/ext_server/CMakeLists.txt` (+1 -1) ➕ `llm/ext_server/README.md` (+4 -0) 📝 `llm/ext_server/ext_server.cpp` (+0 -0) 📝 `llm/ext_server/ext_server.h` (+0 -0) 📝 `llm/ext_server_common.go` (+9 -9) 📝 `llm/generate/gen_common.sh` (+7 -7) 📝 `llm/generate/gen_darwin.sh` (+2 -2) 📝 `llm/generate/gen_linux.sh` (+4 -4) 📝 `llm/generate/gen_windows.ps1` (+12 -11) 📝 `llm/generate/generate_darwin.go` (+1 -1) 📝 `llm/generate/generate_linux.go` (+1 -1) 📝 `llm/generate/generate_windows.go` (+1 -1) 📝 `llm/llama.cpp` (+0 -0) 📝 `llm/shim_darwin.go` (+2 -2) 📝 `llm/shim_ext_server.go` (+6 -4) 📝 `llm/shim_ext_server_linux.go` (+1 -1) 📝 `llm/shim_ext_server_windows.go` (+1 -1) </details> ### 📄 Description Now that we only submodule llama.cpp once, we can tidy up the paths a bit. This also moves the ext_server c++ code to a distinct directory to solve the go test glitch. ``` % go test ./... # github.com/jmorganca/ollama/llm cgo-gcc-prolog:153:33: warning: unused variable '_cgo_a' [-Wunused-variable] cgo-gcc-prolog:165:33: warning: unused variable '_cgo_a' [-Wunused-variable] ? github.com/jmorganca/ollama [no test files] ? github.com/jmorganca/ollama/cmd [no test files] ? github.com/jmorganca/ollama/examples/golang-simplegenerate [no test files] ? github.com/jmorganca/ollama/llm [no test files] ? github.com/jmorganca/ollama/llm/generate [no test files] ? github.com/jmorganca/ollama/parser [no test files] ? github.com/jmorganca/ollama/progress [no test files] ? github.com/jmorganca/ollama/readline [no test files] ok github.com/jmorganca/ollama/api 0.317s ok github.com/jmorganca/ollama/format 0.212s ? github.com/jmorganca/ollama/version [no test files] ok github.com/jmorganca/ollama/gpu 0.211s ok github.com/jmorganca/ollama/server 0.203s ``` --- <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:07:11 -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#10676
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?