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

[PR #7499] [MERGED] build: Make target improvements #22982

New Issue
Closed
opened 2026-04-19 16:42:01 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-19 16:42:01 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/7499
Author: @dhiltgen
Created: 11/5/2024
Status: ✅ Merged
Merged: 12/10/2024
Merged by: @dhiltgen

Base: main ← Head: make_targets

📝 Commits (6)

  • c2481db llama: wire up builtin runner
  • f107f4d build: Make target improvements
  • a0442d3 Support customized CPU flags for runners
  • 0cf9c37 Use relative paths
  • d4aaf40 Remove payloads from main binary
  • 603bbbd install: clean up prior libraries

📊 Changes

58 files changed (+873 additions, -1164 deletions)

View changed files

📝 .github/workflows/release.yaml (+4 -7)
📝 .gitignore (+0 -3)
📝 Dockerfile (+30 -106)
📝 Makefile (+105 -4)
➖ build/darwin/amd64/placeholder (+0 -1)
➖ build/darwin/arm64/placeholder (+0 -1)
➖ build/embed_darwin_amd64.go (+0 -8)
➖ build/embed_darwin_arm64.go (+0 -8)
➖ build/embed_linux.go (+0 -6)
➖ build/embed_unused.go (+0 -8)
➖ build/linux/amd64/placeholder (+0 -1)
➖ build/linux/arm64/placeholder (+0 -1)
📝 cmd/cmd.go (+16 -0)
➕ cmd/runner/main.go (+15 -0)
📝 discover/amd_linux.go (+8 -3)
📝 discover/amd_windows.go (+3 -1)
📝 discover/cpu_common.go (+0 -13)
📝 discover/gpu.go (+52 -47)
📝 discover/gpu_darwin.go (+3 -2)
📝 discover/types.go (+9 -24)

...and 38 more files

📄 Description

Add a few new targets and help for building locally. This also adjusts the runner lookup to favor local builds, then runners relative to the executable.

Fixes #7491
Fixes #7483
Fixes #7452
Fixes #2187
Fixes #2205
Fixes #2281
Fixes #7457
Fixes #7622
Fixes #7577
Fixes #1756
Fixes #7817
Fixes #6857

Carries #7199

🔄 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/7499 **Author:** [@dhiltgen](https://github.com/dhiltgen) **Created:** 11/5/2024 **Status:** ✅ Merged **Merged:** 12/10/2024 **Merged by:** [@dhiltgen](https://github.com/dhiltgen) **Base:** `main` ← **Head:** `make_targets` --- ### 📝 Commits (6) - [`c2481db`](https://github.com/ollama/ollama/commit/c2481db0a912c8bcf2ea86fb344d464d4021249e) llama: wire up builtin runner - [`f107f4d`](https://github.com/ollama/ollama/commit/f107f4d6952b315207eead6aad7cdba27a8a1e79) build: Make target improvements - [`a0442d3`](https://github.com/ollama/ollama/commit/a0442d36848ac1ded3a2eaf05dbafa19f9c6bed9) Support customized CPU flags for runners - [`0cf9c37`](https://github.com/ollama/ollama/commit/0cf9c373deddd1213e7d027a032593c15ee0baa5) Use relative paths - [`d4aaf40`](https://github.com/ollama/ollama/commit/d4aaf40b32c45c39a61fc0daaeff7e8c668a2bd6) Remove payloads from main binary - [`603bbbd`](https://github.com/ollama/ollama/commit/603bbbdf91c6db720f9c70439ba239a768e4c68f) install: clean up prior libraries ### 📊 Changes **58 files changed** (+873 additions, -1164 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/release.yaml` (+4 -7) 📝 `.gitignore` (+0 -3) 📝 `Dockerfile` (+30 -106) 📝 `Makefile` (+105 -4) ➖ `build/darwin/amd64/placeholder` (+0 -1) ➖ `build/darwin/arm64/placeholder` (+0 -1) ➖ `build/embed_darwin_amd64.go` (+0 -8) ➖ `build/embed_darwin_arm64.go` (+0 -8) ➖ `build/embed_linux.go` (+0 -6) ➖ `build/embed_unused.go` (+0 -8) ➖ `build/linux/amd64/placeholder` (+0 -1) ➖ `build/linux/arm64/placeholder` (+0 -1) 📝 `cmd/cmd.go` (+16 -0) ➕ `cmd/runner/main.go` (+15 -0) 📝 `discover/amd_linux.go` (+8 -3) 📝 `discover/amd_windows.go` (+3 -1) 📝 `discover/cpu_common.go` (+0 -13) 📝 `discover/gpu.go` (+52 -47) 📝 `discover/gpu_darwin.go` (+3 -2) 📝 `discover/types.go` (+9 -24) _...and 38 more files_ </details> ### 📄 Description Add a few new targets and help for building locally. This also adjusts the runner lookup to favor local builds, then runners relative to the executable. Fixes #7491 Fixes #7483 Fixes #7452 Fixes #2187 Fixes #2205 Fixes #2281 Fixes #7457 Fixes #7622 Fixes #7577 Fixes #1756 Fixes #7817 Fixes #6857 Carries #7199 --- <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 16:42:01 -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#22982
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?