[PR #14022] [CLOSED] Merge remote-tracking branch 'upstream/main' #40347

Closed
opened 2026-04-23 01:15:55 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/14022
Author: @sheigl
Created: 2/2/2026
Status: Closed

Base: mainHead: sycl-support


📝 Commits (1)

  • d416841 Merge remote-tracking branch 'upstream/main'

📊 Changes

75 files changed (+24355 additions, -1 deletions)

View changed files

📝 .gitignore (+1 -0)
📝 CMakeLists.txt (+117 -0)
📝 CMakePresets.json (+14 -0)
📝 discover/runner.go (+4 -0)
📝 envconfig/config.go (+5 -0)
📝 ml/backend/ggml/ggml/.rsync-filter (+1 -0)
ml/backend/ggml/ggml/src/ggml-sycl/CMakeLists.txt (+193 -0)
ml/backend/ggml/ggml/src/ggml-sycl/add-id.cpp (+77 -0)
ml/backend/ggml/ggml/src/ggml-sycl/add-id.hpp (+8 -0)
ml/backend/ggml/ggml/src/ggml-sycl/backend.hpp (+45 -0)
ml/backend/ggml/ggml/src/ggml-sycl/binbcast.cpp (+345 -0)
ml/backend/ggml/ggml/src/ggml-sycl/binbcast.hpp (+39 -0)
ml/backend/ggml/ggml/src/ggml-sycl/common.cpp (+83 -0)
ml/backend/ggml/ggml/src/ggml-sycl/common.hpp (+663 -0)
ml/backend/ggml/ggml/src/ggml-sycl/concat.cpp (+202 -0)
ml/backend/ggml/ggml/src/ggml-sycl/concat.hpp (+20 -0)
ml/backend/ggml/ggml/src/ggml-sycl/conv.cpp (+101 -0)
ml/backend/ggml/ggml/src/ggml-sycl/conv.hpp (+20 -0)
ml/backend/ggml/ggml/src/ggml-sycl/convert.cpp (+676 -0)
ml/backend/ggml/ggml/src/ggml-sycl/convert.hpp (+34 -0)

...and 55 more files

📄 Description

No description provided


🔄 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/14022 **Author:** [@sheigl](https://github.com/sheigl) **Created:** 2/2/2026 **Status:** ❌ Closed **Base:** `main` ← **Head:** `sycl-support` --- ### 📝 Commits (1) - [`d416841`](https://github.com/ollama/ollama/commit/d416841f3588a24b0506234b6f1eaca1c63a2f55) Merge remote-tracking branch 'upstream/main' ### 📊 Changes **75 files changed** (+24355 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+1 -0) 📝 `CMakeLists.txt` (+117 -0) 📝 `CMakePresets.json` (+14 -0) 📝 `discover/runner.go` (+4 -0) 📝 `envconfig/config.go` (+5 -0) 📝 `ml/backend/ggml/ggml/.rsync-filter` (+1 -0) ➕ `ml/backend/ggml/ggml/src/ggml-sycl/CMakeLists.txt` (+193 -0) ➕ `ml/backend/ggml/ggml/src/ggml-sycl/add-id.cpp` (+77 -0) ➕ `ml/backend/ggml/ggml/src/ggml-sycl/add-id.hpp` (+8 -0) ➕ `ml/backend/ggml/ggml/src/ggml-sycl/backend.hpp` (+45 -0) ➕ `ml/backend/ggml/ggml/src/ggml-sycl/binbcast.cpp` (+345 -0) ➕ `ml/backend/ggml/ggml/src/ggml-sycl/binbcast.hpp` (+39 -0) ➕ `ml/backend/ggml/ggml/src/ggml-sycl/common.cpp` (+83 -0) ➕ `ml/backend/ggml/ggml/src/ggml-sycl/common.hpp` (+663 -0) ➕ `ml/backend/ggml/ggml/src/ggml-sycl/concat.cpp` (+202 -0) ➕ `ml/backend/ggml/ggml/src/ggml-sycl/concat.hpp` (+20 -0) ➕ `ml/backend/ggml/ggml/src/ggml-sycl/conv.cpp` (+101 -0) ➕ `ml/backend/ggml/ggml/src/ggml-sycl/conv.hpp` (+20 -0) ➕ `ml/backend/ggml/ggml/src/ggml-sycl/convert.cpp` (+676 -0) ➕ `ml/backend/ggml/ggml/src/ggml-sycl/convert.hpp` (+34 -0) _...and 55 more files_ </details> ### 📄 Description _No description provided_ --- <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-23 01:15:55 -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#40347