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

[PR #12377] [MERGED] refactor: using testing.B.Loop #76098

New Issue
Closed
opened 2026-05-05 08:33:24 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-05 08:33:24 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/12377
Author: @yajianggroup
Created: 9/23/2025
Status: ✅ Merged
Merged: 10/10/2025
Merged by: @mxyng

Base: main ← Head: main

📝 Commits (1)

  • e96d2d1 refactor: using testing.B.Loop

📊 Changes

1 file changed (+3 additions, -3 deletions)

View changed files

📝 model/bytepairencoding_test.go (+3 -3)

📄 Description

use b.Loop() to simplify the code and improve performance

before:

go test -run=^$ -bench=. ./model -timeout=1h             
goos: darwin
goarch: arm64
pkg: github.com/ollama/ollama/model
cpu: Apple M4
BenchmarkBytePairEncoding/encode1-10         	 2034903	       604.4 ns/op
BenchmarkBytePairEncoding/decode1-10         	22407132	        56.35 ns/op
BenchmarkBytePairEncoding/split1-10          	 2190558	       487.3 ns/op
BenchmarkBytePairEncoding/encode10-10        	  808230	      1478 ns/op
BenchmarkBytePairEncoding/decode10-10        	14217931	        85.32 ns/op
BenchmarkBytePairEncoding/split10-10         	  904519	      1296 ns/op
BenchmarkBytePairEncoding/encode100-10       	   80082	     15268 ns/op
BenchmarkBytePairEncoding/decode100-10       	 3367110	       353.2 ns/op
BenchmarkBytePairEncoding/split100-10        	  126951	      9483 ns/op
BenchmarkBytePairEncoding/encode1000-10      	    8446	    135918 ns/op
BenchmarkBytePairEncoding/decode1000-10      	  362342	      3012 ns/op
BenchmarkBytePairEncoding/split1000-10       	   13258	     90312 ns/op
BenchmarkBytePairEncoding/encode10000-10     	     892	   1377467 ns/op
BenchmarkBytePairEncoding/decode10000-10     	   39751	     27501 ns/op
BenchmarkBytePairEncoding/split10000-10      	    1444	    834748 ns/op
BenchmarkBytePairEncoding/encode100000-10    	      86	  12968816 ns/op
BenchmarkBytePairEncoding/decode100000-10    	    3208	    350494 ns/op
BenchmarkBytePairEncoding/split100000-10     	     141	   8554128 ns/op
BenchmarkBytePairEncoding/encode1000000-10   	       8	 136400802 ns/op
BenchmarkBytePairEncoding/decode1000000-10   	     318	   3855845 ns/op
BenchmarkBytePairEncoding/split1000000-10    	      12	  84651771 ns/op
BenchmarkBytePairEncoding/encode3202320-10   	       3	 437016222 ns/op
BenchmarkBytePairEncoding/decode3202320-10   	      90	  12046368 ns/op
BenchmarkBytePairEncoding/split3202320-10    	       4	 269510136 ns/op
PASS
ok  	github.com/ollama/ollama/model	38.540s

after:

go test -run=^$ -bench=. ./model -timeout=1h
goos: darwin
goarch: arm64
pkg: github.com/ollama/ollama/model
cpu: Apple M4
BenchmarkBytePairEncoding/encode1-10         	 2024184	       590.8 ns/op
BenchmarkBytePairEncoding/decode1-10         	22583328	        58.97 ns/op
BenchmarkBytePairEncoding/split1-10          	 2303569	       518.9 ns/op
BenchmarkBytePairEncoding/encode10-10        	  841950	      1474 ns/op
BenchmarkBytePairEncoding/decode10-10        	13812796	        84.28 ns/op
BenchmarkBytePairEncoding/split10-10         	  918715	      1345 ns/op
BenchmarkBytePairEncoding/encode100-10       	   77550	     14722 ns/op
BenchmarkBytePairEncoding/decode100-10       	 3577322	       329.9 ns/op
BenchmarkBytePairEncoding/split100-10        	  125736	      9480 ns/op
BenchmarkBytePairEncoding/encode1000-10      	    9220	    133805 ns/op
BenchmarkBytePairEncoding/decode1000-10      	  469340	      2507 ns/op
BenchmarkBytePairEncoding/split1000-10       	   13192	     91128 ns/op
BenchmarkBytePairEncoding/encode10000-10     	     892	   1308327 ns/op
BenchmarkBytePairEncoding/decode10000-10     	   40533	     29673 ns/op
BenchmarkBytePairEncoding/split10000-10      	    1460	    820587 ns/op
BenchmarkBytePairEncoding/encode100000-10    	      84	  12846453 ns/op
BenchmarkBytePairEncoding/decode100000-10    	    3222	    356956 ns/op
BenchmarkBytePairEncoding/split100000-10     	     144	   8591398 ns/op
BenchmarkBytePairEncoding/encode1000000-10   	       8	 132183818 ns/op
BenchmarkBytePairEncoding/decode1000000-10   	     315	   3747281 ns/op
BenchmarkBytePairEncoding/split1000000-10    	      13	  83538782 ns/op
BenchmarkBytePairEncoding/encode3202320-10   	       3	 423927208 ns/op
BenchmarkBytePairEncoding/decode3202320-10   	     100	  11806510 ns/op
BenchmarkBytePairEncoding/split3202320-10    	       4	 267830042 ns/op
PASS
ok  	github.com/ollama/ollama/model	29.521s

🔄 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/12377 **Author:** [@yajianggroup](https://github.com/yajianggroup) **Created:** 9/23/2025 **Status:** ✅ Merged **Merged:** 10/10/2025 **Merged by:** [@mxyng](https://github.com/mxyng) **Base:** `main` ← **Head:** `main` --- ### 📝 Commits (1) - [`e96d2d1`](https://github.com/ollama/ollama/commit/e96d2d1d07ba68c8c932cffd74d7f7146e127c1e) refactor: using testing.B.Loop ### 📊 Changes **1 file changed** (+3 additions, -3 deletions) <details> <summary>View changed files</summary> 📝 `model/bytepairencoding_test.go` (+3 -3) </details> ### 📄 Description use b.Loop() to simplify the code and improve performance before: ```shell go test -run=^$ -bench=. ./model -timeout=1h goos: darwin goarch: arm64 pkg: github.com/ollama/ollama/model cpu: Apple M4 BenchmarkBytePairEncoding/encode1-10 2034903 604.4 ns/op BenchmarkBytePairEncoding/decode1-10 22407132 56.35 ns/op BenchmarkBytePairEncoding/split1-10 2190558 487.3 ns/op BenchmarkBytePairEncoding/encode10-10 808230 1478 ns/op BenchmarkBytePairEncoding/decode10-10 14217931 85.32 ns/op BenchmarkBytePairEncoding/split10-10 904519 1296 ns/op BenchmarkBytePairEncoding/encode100-10 80082 15268 ns/op BenchmarkBytePairEncoding/decode100-10 3367110 353.2 ns/op BenchmarkBytePairEncoding/split100-10 126951 9483 ns/op BenchmarkBytePairEncoding/encode1000-10 8446 135918 ns/op BenchmarkBytePairEncoding/decode1000-10 362342 3012 ns/op BenchmarkBytePairEncoding/split1000-10 13258 90312 ns/op BenchmarkBytePairEncoding/encode10000-10 892 1377467 ns/op BenchmarkBytePairEncoding/decode10000-10 39751 27501 ns/op BenchmarkBytePairEncoding/split10000-10 1444 834748 ns/op BenchmarkBytePairEncoding/encode100000-10 86 12968816 ns/op BenchmarkBytePairEncoding/decode100000-10 3208 350494 ns/op BenchmarkBytePairEncoding/split100000-10 141 8554128 ns/op BenchmarkBytePairEncoding/encode1000000-10 8 136400802 ns/op BenchmarkBytePairEncoding/decode1000000-10 318 3855845 ns/op BenchmarkBytePairEncoding/split1000000-10 12 84651771 ns/op BenchmarkBytePairEncoding/encode3202320-10 3 437016222 ns/op BenchmarkBytePairEncoding/decode3202320-10 90 12046368 ns/op BenchmarkBytePairEncoding/split3202320-10 4 269510136 ns/op PASS ok github.com/ollama/ollama/model 38.540s ``` after: ```shell go test -run=^$ -bench=. ./model -timeout=1h goos: darwin goarch: arm64 pkg: github.com/ollama/ollama/model cpu: Apple M4 BenchmarkBytePairEncoding/encode1-10 2024184 590.8 ns/op BenchmarkBytePairEncoding/decode1-10 22583328 58.97 ns/op BenchmarkBytePairEncoding/split1-10 2303569 518.9 ns/op BenchmarkBytePairEncoding/encode10-10 841950 1474 ns/op BenchmarkBytePairEncoding/decode10-10 13812796 84.28 ns/op BenchmarkBytePairEncoding/split10-10 918715 1345 ns/op BenchmarkBytePairEncoding/encode100-10 77550 14722 ns/op BenchmarkBytePairEncoding/decode100-10 3577322 329.9 ns/op BenchmarkBytePairEncoding/split100-10 125736 9480 ns/op BenchmarkBytePairEncoding/encode1000-10 9220 133805 ns/op BenchmarkBytePairEncoding/decode1000-10 469340 2507 ns/op BenchmarkBytePairEncoding/split1000-10 13192 91128 ns/op BenchmarkBytePairEncoding/encode10000-10 892 1308327 ns/op BenchmarkBytePairEncoding/decode10000-10 40533 29673 ns/op BenchmarkBytePairEncoding/split10000-10 1460 820587 ns/op BenchmarkBytePairEncoding/encode100000-10 84 12846453 ns/op BenchmarkBytePairEncoding/decode100000-10 3222 356956 ns/op BenchmarkBytePairEncoding/split100000-10 144 8591398 ns/op BenchmarkBytePairEncoding/encode1000000-10 8 132183818 ns/op BenchmarkBytePairEncoding/decode1000000-10 315 3747281 ns/op BenchmarkBytePairEncoding/split1000000-10 13 83538782 ns/op BenchmarkBytePairEncoding/encode3202320-10 3 423927208 ns/op BenchmarkBytePairEncoding/decode3202320-10 100 11806510 ns/op BenchmarkBytePairEncoding/split3202320-10 4 267830042 ns/op PASS ok github.com/ollama/ollama/model 29.521s ``` --- <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-05-05 08:33:24 -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#76098
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?