highperfocused/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2025-11-10 20:57:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

feed the linter

Browse Source
This commit is contained in:
Patrick Devine
2025-11-05 00:20:54 -08:00
parent 6669ecd99a
commit ddc4a39386
2 changed files with 11 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bench/bench.go
View File

@@ -86,9 +86,9 @@ func OutputMetrics(w io.Writer, format string, metrics []Metrics, verbose bool)
nsPerToken = float64(m.Duration.Nanoseconds()) / float64(m.Count) nsPerToken = float64(m.Duration.Nanoseconds()) / float64(m.Count)
tokensPerSec = float64(m.Count) / (float64(m.Duration.Nanoseconds()) + 1e-12) * 1e9 tokensPerSec = float64(m.Count) / (float64(m.Duration.Nanoseconds()) + 1e-12) * 1e9
} }
fmt.Fprintln(w, fmt.Sprintf("%s,%s,%d,%.2f,%.2f", m.Model, m.Step, m.Count, nsPerToken, tokensPerSec)) fmt.Fprintf(w, "%s,%s,%d,%.2f,%.2f\n", m.Model, m.Step, m.Count, nsPerToken, tokensPerSec)
} else { } else {
fmt.Fprintln(w, fmt.Sprintf("%s,%s,1,%d,0", m.Model, m.Step, m.Duration.Nanoseconds())) fmt.Fprintf(w, "%s,%s,1,%d,0\n", m.Model, m.Step, m.Duration.Nanoseconds())
} }
} }
default: default:
@@ -121,7 +121,7 @@ func BenchmarkChat(fOpt flagOptions) error {
} }
for _, model := range models { for _, model := range models {
for i := 0; i < *fOpt.epochs; i++ { for range *fOpt.epochs {
options := make(map[string]interface{}) options := make(map[string]interface{})
if *fOpt.maxTokens > 0 { if *fOpt.maxTokens > 0 {
options["num_predict"] = *fOpt.maxTokens options["num_predict"] = *fOpt.maxTokens

58
bench/bench_test.go
View File

@@ -131,9 +131,7 @@ func TestBenchmarkChat_Success(t *testing.T) {
server := createMockOllamaServer(t, mockResponses) server := createMockOllamaServer(t, mockResponses)
defer server.Close() defer server.Close()
oldEnv := os.Getenv("OLLAMA_HOST") t.Setenv("OLLAMA_HOST", server.URL)
os.Setenv("OLLAMA_HOST", server.URL)
defer os.Setenv("OLLAMA_HOST", oldEnv)
output := captureOutput(func() { output := captureOutput(func() {
err := BenchmarkChat(fOpt) err := BenchmarkChat(fOpt)
@@ -161,9 +159,7 @@ func TestBenchmarkChat_ServerError(t *testing.T) {
})) }))
defer server.Close() defer server.Close()
oldEnv := os.Getenv("OLLAMA_HOST") t.Setenv("OLLAMA_HOST", server.URL)
os.Setenv("OLLAMA_HOST", server.URL)
defer os.Setenv("OLLAMA_HOST", oldEnv)
output := captureOutput(func() { output := captureOutput(func() {
err := BenchmarkChat(fOpt) err := BenchmarkChat(fOpt)
@@ -208,10 +204,7 @@ func TestBenchmarkChat_Timeout(t *testing.T) {
})) }))
defer server.Close() defer server.Close()
// Set the environment variable to use our mock server t.Setenv("OLLAMA_HOST", server.URL)
oldEnv := os.Getenv("OLLAMA_HOST")
os.Setenv("OLLAMA_HOST", server.URL)
defer os.Setenv("OLLAMA_HOST", oldEnv)
output := captureOutput(func() { output := captureOutput(func() {
err := BenchmarkChat(fOpt) err := BenchmarkChat(fOpt)
@@ -242,9 +235,7 @@ func TestBenchmarkChat_NoMetrics(t *testing.T) {
server := createMockOllamaServer(t, mockResponses) server := createMockOllamaServer(t, mockResponses)
defer server.Close() defer server.Close()
oldEnv := os.Getenv("OLLAMA_HOST") t.Setenv("OLLAMA_HOST", server.URL)
os.Setenv("OLLAMA_HOST", server.URL)
defer os.Setenv("OLLAMA_HOST", oldEnv)
output := captureOutput(func() { output := captureOutput(func() {
err := BenchmarkChat(fOpt) err := BenchmarkChat(fOpt)
@@ -296,9 +287,7 @@ func TestBenchmarkChat_MultipleModels(t *testing.T) {
})) }))
defer server.Close() defer server.Close()
oldEnv := os.Getenv("OLLAMA_HOST") t.Setenv("OLLAMA_HOST", server.URL)
os.Setenv("OLLAMA_HOST", server.URL)
defer os.Setenv("OLLAMA_HOST", oldEnv)
output := captureOutput(func() { output := captureOutput(func() {
err := BenchmarkChat(fOpt) err := BenchmarkChat(fOpt)
@@ -320,7 +309,7 @@ func TestBenchmarkChat_MultipleModels(t *testing.T) {
func TestBenchmarkChat_WithImage(t *testing.T) { func TestBenchmarkChat_WithImage(t *testing.T) {
fOpt := createTestFlagOptions() fOpt := createTestFlagOptions()
tmpfile, err := os.CreateTemp("", "testimage") tmpfile, err := os.CreateTemp(t.TempDir(), "testimage")
if err != nil { if err != nil {
t.Fatalf("Failed to create temp file: %v", err) t.Fatalf("Failed to create temp file: %v", err)
} }
@@ -367,9 +356,7 @@ func TestBenchmarkChat_WithImage(t *testing.T) {
})) }))
defer server.Close() defer server.Close()
oldEnv := os.Getenv("OLLAMA_HOST") t.Setenv("OLLAMA_HOST", server.URL)
os.Setenv("OLLAMA_HOST", server.URL)
defer os.Setenv("OLLAMA_HOST", oldEnv)
output := captureOutput(func() { output := captureOutput(func() {
err := BenchmarkChat(fOpt) err := BenchmarkChat(fOpt)
@@ -415,7 +402,7 @@ func TestBenchmarkChat_ImageError(t *testing.T) {
} }
func TestReadImage_Success(t *testing.T) { func TestReadImage_Success(t *testing.T) {
tmpfile, err := os.CreateTemp("", "testimage") tmpfile, err := os.CreateTemp(t.TempDir(), "testimage")
if err != nil { if err != nil {
t.Fatalf("Failed to create temp file: %v", err) t.Fatalf("Failed to create temp file: %v", err)
} }
@@ -474,32 +461,3 @@ func TestOptionsMapCreation(t *testing.T) {
t.Errorf("Expected seed %d, got %v", *fOpt.seed, options["seed"]) t.Errorf("Expected seed %d, got %v", *fOpt.seed, options["seed"])
} }
} }
func TestKeepAliveDuration(t *testing.T) {
keepAlive := 5.0
var keepAliveDuration *api.Duration
if keepAlive > 0 {
duration := api.Duration{Duration: time.Duration(keepAlive * float64(time.Second))}
keepAliveDuration = &duration
}
if keepAliveDuration == nil {
t.Error("Expected keepAliveDuration to be set")
}
if keepAliveDuration.Duration != 5*time.Second {
t.Errorf("Expected 5 seconds, got %v", keepAliveDuration.Duration)
}
keepAlive = 0.0
keepAliveDuration = nil
if keepAlive > 0 {
duration := api.Duration{Duration: time.Duration(keepAlive * float64(time.Second))}
keepAliveDuration = &duration
}
if keepAliveDuration != nil {
t.Error("Expected keepAliveDuration to be nil for zero keepAlive")
}
}