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 #7345] [MERGED] Improve dependency gathering logic #12391

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

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/7345
Author: @dhiltgen
Created: 10/24/2024
Status: ✅ Merged
Merged: 10/24/2024
Merged by: @dhiltgen

Base: main ← Head: dependencies

📝 Commits (1)

  • 48096cf Improve dependency gathering logic

📊 Changes

7 files changed (+31 additions, -24 deletions)

View changed files

📝 llama/Makefile (+1 -2)
📝 llama/llama.go (+2 -2)
📝 llama/make/Makefile.default (+6 -3)
📝 llama/make/Makefile.rocm (+8 -15)
📝 llama/make/common-defs.make (+6 -0)
📝 llama/make/cuda.make (+3 -0)
📝 llama/make/gpu.make (+5 -2)

📄 Description

This unfies the rocm/cuda dependency logic into the makefile and fixes a missing define which broke windows rocm

This backports the fixes needed to get 0.4.0-rc5 over the finish line to main to reduce the amount of content I have to carry on the branch.

🔄 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/7345 **Author:** [@dhiltgen](https://github.com/dhiltgen) **Created:** 10/24/2024 **Status:** ✅ Merged **Merged:** 10/24/2024 **Merged by:** [@dhiltgen](https://github.com/dhiltgen) **Base:** `main` ← **Head:** `dependencies` --- ### 📝 Commits (1) - [`48096cf`](https://github.com/ollama/ollama/commit/48096cfd216f8c72877034f6a08fe200ef104792) Improve dependency gathering logic ### 📊 Changes **7 files changed** (+31 additions, -24 deletions) <details> <summary>View changed files</summary> 📝 `llama/Makefile` (+1 -2) 📝 `llama/llama.go` (+2 -2) 📝 `llama/make/Makefile.default` (+6 -3) 📝 `llama/make/Makefile.rocm` (+8 -15) 📝 `llama/make/common-defs.make` (+6 -0) 📝 `llama/make/cuda.make` (+3 -0) 📝 `llama/make/gpu.make` (+5 -2) </details> ### 📄 Description This unfies the rocm/cuda dependency logic into the makefile and fixes a missing define which broke windows rocm This backports the fixes needed to get 0.4.0-rc5 over the finish line to main to reduce the amount of content I have to carry on the branch. --- <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:58:00 -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#12391
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?