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

[PR #6242] [MERGED] whisper branch merge conflicts #17332

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

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/6242
Author: @royjhan
Created: 8/7/2024
Status: ✅ Merged
Merged: 8/7/2024
Merged by: @royjhan

Base: royh/whisper ← Head: main

📝 Commits (10+)

  • 6b25291 update convert test to check result data
  • 0f3271d patches: phi3 default sliding window attention
  • 5e9db9f refactor convert
  • df993fa comments
  • 781fc2d Update convert/reader_safetensors.go
  • eafc607 convert: only extract large files
  • d8e2664 convert: fix parse functions
  • 4c14855 Merge pull request #6106 from ollama/mxyng/default-sliding-window-attention
  • d87b4a4 fix modelfile message quotes
  • 3e61426 Merge pull request #6109 from ollama/mxyng/fix-modelfile

📊 Changes

107 files changed (+3191 additions, -2012 deletions)

View changed files

📝 .gitattributes (+1 -0)
📝 .github/workflows/test.yaml (+1 -1)
📝 .golangci.yaml (+14 -4)
📝 README.md (+2 -0)
📝 api/client.go (+2 -1)
📝 api/types.go (+1 -3)
📝 api/types_test.go (+2 -2)
📝 app/lifecycle/getstarted_nonwindows.go (+2 -2)
📝 app/lifecycle/getstarted_windows.go (+0 -1)
📝 app/lifecycle/logging.go (+1 -1)
📝 app/lifecycle/logging_nonwindows.go (+1 -1)
📝 app/lifecycle/logging_test.go (+2 -2)
📝 app/lifecycle/server.go (+1 -1)
📝 app/lifecycle/updater.go (+2 -1)
📝 app/lifecycle/updater_nonwindows.go (+2 -2)
📝 app/lifecycle/updater_windows.go (+3 -2)
📝 app/tray/tray_nonwindows.go (+2 -2)
📝 app/tray/wintray/eventloop.go (+1 -3)
📝 app/tray/wintray/tray.go (+3 -2)
📝 auth/auth.go (+2 -1)

...and 80 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/6242 **Author:** [@royjhan](https://github.com/royjhan) **Created:** 8/7/2024 **Status:** ✅ Merged **Merged:** 8/7/2024 **Merged by:** [@royjhan](https://github.com/royjhan) **Base:** `royh/whisper` ← **Head:** `main` --- ### 📝 Commits (10+) - [`6b25291`](https://github.com/ollama/ollama/commit/6b252918fb5e17f9be5975efe1681a92153b8379) update convert test to check result data - [`0f3271d`](https://github.com/ollama/ollama/commit/0f3271db8892581f800b6f1c4a795aac4f3127c6) patches: phi3 default sliding window attention - [`5e9db9f`](https://github.com/ollama/ollama/commit/5e9db9fb0bcefbe599734b02dd030f4a347ce576) refactor convert - [`df993fa`](https://github.com/ollama/ollama/commit/df993fa37bde19039231001be9f852386a12a860) comments - [`781fc2d`](https://github.com/ollama/ollama/commit/781fc2d5769bd1df7895dc2a18ab44830f6684fc) Update convert/reader_safetensors.go - [`eafc607`](https://github.com/ollama/ollama/commit/eafc607abb3422a7d8e488aeb7a129a67a1f75c6) convert: only extract large files - [`d8e2664`](https://github.com/ollama/ollama/commit/d8e2664c33e81af0549aa9e75c57e08317d0322d) convert: fix parse functions - [`4c14855`](https://github.com/ollama/ollama/commit/4c14855ad78cde21862ae5286e18e31a4ae9147a) Merge pull request #6106 from ollama/mxyng/default-sliding-window-attention - [`d87b4a4`](https://github.com/ollama/ollama/commit/d87b4a488eaf6e52bc0ba170a803cbf4d63921cd) fix modelfile message quotes - [`3e61426`](https://github.com/ollama/ollama/commit/3e614260af0a5668dad032f4be477ce2aeb42931) Merge pull request #6109 from ollama/mxyng/fix-modelfile ### 📊 Changes **107 files changed** (+3191 additions, -2012 deletions) <details> <summary>View changed files</summary> 📝 `.gitattributes` (+1 -0) 📝 `.github/workflows/test.yaml` (+1 -1) 📝 `.golangci.yaml` (+14 -4) 📝 `README.md` (+2 -0) 📝 `api/client.go` (+2 -1) 📝 `api/types.go` (+1 -3) 📝 `api/types_test.go` (+2 -2) 📝 `app/lifecycle/getstarted_nonwindows.go` (+2 -2) 📝 `app/lifecycle/getstarted_windows.go` (+0 -1) 📝 `app/lifecycle/logging.go` (+1 -1) 📝 `app/lifecycle/logging_nonwindows.go` (+1 -1) 📝 `app/lifecycle/logging_test.go` (+2 -2) 📝 `app/lifecycle/server.go` (+1 -1) 📝 `app/lifecycle/updater.go` (+2 -1) 📝 `app/lifecycle/updater_nonwindows.go` (+2 -2) 📝 `app/lifecycle/updater_windows.go` (+3 -2) 📝 `app/tray/tray_nonwindows.go` (+2 -2) 📝 `app/tray/wintray/eventloop.go` (+1 -3) 📝 `app/tray/wintray/tray.go` (+3 -2) 📝 `auth/auth.go` (+2 -1) _...and 80 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-16 05:59:43 -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#17332
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?