mirror of
https://github.com/ollama/ollama.git
synced 2026-07-06 07:41:05 +00:00
* broad lint fixes to sidestep CI scope glitch * runner: Remove CGO engines, use llama-server exclusively for GGML models Remove the vendored GGML and llama.cpp backend, CGO runner, Go model implementations, and sample. llama-server (built from upstream llama.cpp via FetchContent) is now the sole inference engine for GGUF-based models. (Safetensor based models continue to run on the new MLX engine.) This allows us to more rapidly pick up new capabilities and fixes from llama.cpp as they come out. On windows this now requires recent AMD driver versions to support ROCm v7 as llama.cpp currently does not support building against v6. * llama/compat: load Ollama-format GGUFs in llama-server Squashed from upstream/jmorganca/llama-compat on 2026-04-29. Source tip:0c33775d37. Original source commits: -25223160dllama/compat: add in-memory shim so llama-server can load Ollama-format GGUFs -7449b539allm,server: route Ollama-format gemma3 blobs through llama/compat -436f2e2b1llama/compat: make patch-apply idempotent -8c2c9d4c8llama/compat: extend gemma3 handler to cover 1B and 270M blobs -021389f7bllama/compat: shrink clip.cpp injection from 18 lines to 1 -61b367ec2llama/compat: shrink patch to pure call-site hooks (34 -> 20 lines) -36049361cllama/compat: simplify shim (gemma3-tested) -8fa664865llama/compat: add qwen35moe text handler -db0c74530llama/compat: add qwen35moe vision (clip) support -2a388da77llama/compat: split shared infra into a util TU -9a69a17dcllama/compat: document non-public API dependencies -d0f38a915llama/compat: add gpt-oss and lfm2 handlers -086071822llama/compat: add mistral3 text handler (vision TODO) -63bde9ff7llama/compat: add mistral3 vision (clip) support -3a57b89d5llama/compat: apply LLaMA RoPE permute to mistral3 vision Q/K -99cb87439llama/compat: add qwen35, gemma4, deepseek-ocr handlers -2c7850dballama/compat: add nemotron_h_moe handler (latent FFN + MTP skip) -9e3b54225llama/compat: add llama4 text + clip handlers -034fee349llama/compat: add gemma4 clip handler (gemma4v projector) -9945c5a93server: remove dhiltgen/* compat redirect table -5d4539101llama/compat: rewrite gemma4 tokenizer model to BPE -7e0765327llama/compat: add glm-ocr text handler + text-loader load-op hook -f1bd1a25allama/compat: add glm-ocr clip handler (glm4v projector) -4b5cf3420llama/compat: collapse text-loader hook back to one new patch line -eb4ecf4fcllama/compat: extend gemma4 clip handler to gemma4a (audio) -a23a5e76fllama/compat: fix gemma4a per-block norm tensor mapping -cd2dcaff4llama/compat: add embeddinggemma handler -1ce8a6b26llama/compat: add qwen3-vl + qwen2.5-vl handlers -fd98ffa1ellama/compat: add gemma3n + glm4moelite handlers -cc7bdf0bcllama/compat: handle null buft in maybe_load_tensor -0c33775d3llama/compat: disable mmap when load_op transforms text-side tensors * refine implementation * ci: fix windows MLX build * ci: fix windows llama-server build * ci: fix windows rocm build * ci: windows mlx tuning Shorten long-tail on build, and get OllamaSetup.exe back under 2g limit * ci: fix windows dependencies * win: fix dependency gathering * disable openmp * win: arm64 cross-compile build also DRY out CI steps * scheduler improvements * ci: improvements from #15982 * win: favor ninja for faster developer builds * win: fix build * win: fix arm64 cross-compile * win: avoid spaces in compiler path * misc discovery fixes, and bos handling * lint fixes * win: fix arm cross-compile build/CI bugs * llama.cpp update * win: handle multiple CRT dirs * vulkan: add windows iGPU detection * fix creation bugs for patched models, other refactoring work * tune batch size for better performance * ci and lint fixes * fix repeat_last_n bug * build: revamp build for better developer UX * amd, sampler, qwen3next fixes * version bump * fix mlx build * revamp GPU discovery Scanning the output of llama-server is turning out to be too error prone across llama.cpp updates, so this switches to a thin dynamic library load against the bundled GGML libraries so more details can be gathered from the API. * version bump * missing file * ci: fix cache miss on rocm build * refine vulkan dep handling * fix ps reporting bug on full GPU load * improve cmake wiring for customized local builds * version bump * docker build arg cleanup * improve windows exit error logs * fix community gemma4 support and ci flakes * fix mlx unit test * tighten up ps logic to avoid double counting fit log lines * version bump * fix ps view for full gpu layer offload * add MTP wiring for llama-server and create with GGUFs * pick best template by capabilities * version bump * ci: harden apt repos * remove unused cpu core discovery * adjust batch default logic to reduce OOMs * support larger tool calls * fix audio support, template show * qwen35 mtp patch support * flesh out dtypes * rocm deps * version bump * lint fix * block broken gfx1150 on windows * fix qwen3.5 moe mtp tensors in patch * mmproj oom fallback and vulkan on by default * qwen MTP compat fix * version bump * ci: fix WoA cross-compile * ci: workaround ui tool in cross-compile * version bump * win: enable OpenMP for CPU builds * build: improve developer UX * ci: windows path workaround for CPU build * win: fix WoA dependencies * win: fix large offset reads for mmproj patched loads * version bump * fix vulkan dup detection * add OLLAMA_IGPU_ENABLE and largely disable iGPUs by default * opt-in MTP, win large offset, integraton fixes * fix unit test scheduler interaction hang * fix multi-gpu filtering * version bump * review comments * fix thinking level * fix linux rocm ordering and granite 3.3 template * version bump * ci fix - non-shallow MLX checkout * bypass linux sysfs unit test on windows --------- Co-authored-by: jmorganca <jmorganca@gmail.com>
278 lines
8.6 KiB
Go
278 lines
8.6 KiB
Go
//go:build integration && perf
|
|
|
|
package integration
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"log/slog"
|
|
"math"
|
|
"os"
|
|
"path/filepath"
|
|
"strconv"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/ollama/ollama/api"
|
|
"github.com/ollama/ollama/format"
|
|
)
|
|
|
|
var (
|
|
// Models that don't work reliably with the large context prompt in this test case
|
|
longContextFlakes = []string{
|
|
"granite-code:latest",
|
|
"nemotron-mini:latest",
|
|
"falcon:latest", // 2k model
|
|
"falcon2:latest", // 2k model
|
|
"minicpm-v:latest",
|
|
"qwen:latest",
|
|
}
|
|
)
|
|
|
|
// Note: this test case can take a long time to run, particularly on models with
|
|
// large contexts. Run with -timeout set to a large value to get reasonable coverage
|
|
// Example usage:
|
|
//
|
|
// go test --tags=integration,perf -count 1 ./integration -v -timeout 90m -run TestModelsPerf 2>&1 | tee int.log
|
|
// cat int.log | grep MODEL_PERF_HEADER | head -1| cut -f2- -d: > perf.csv
|
|
// cat int.log | grep MODEL_PERF_DATA | cut -f2- -d: >> perf.csv
|
|
func TestModelsPerf(t *testing.T) {
|
|
doModelPerfTest(t, append(ollamaEngineChatModels, llamaRunnerChatModels...))
|
|
}
|
|
|
|
func TestLibraryModelsPerf(t *testing.T) {
|
|
doModelPerfTest(t, libraryChatModels)
|
|
}
|
|
|
|
func doModelPerfTest(t *testing.T, chatModels []string) {
|
|
softTimeout, hardTimeout := getTimeouts(t)
|
|
slog.Info("Setting timeouts", "soft", softTimeout, "hard", hardTimeout)
|
|
ctx, cancel := context.WithTimeout(context.Background(), hardTimeout)
|
|
defer cancel()
|
|
client, _, cleanup := InitServerConnection(ctx, t)
|
|
defer cleanup()
|
|
|
|
// TODO use info API eventually
|
|
var maxVram uint64
|
|
var err error
|
|
if s := os.Getenv("OLLAMA_MAX_VRAM"); s != "" {
|
|
maxVram, err = strconv.ParseUint(s, 10, 64)
|
|
if err != nil {
|
|
t.Fatalf("invalid OLLAMA_MAX_VRAM %v", err)
|
|
}
|
|
} else {
|
|
slog.Warn("No VRAM info available, testing all models, so larger ones might timeout...")
|
|
}
|
|
|
|
data, err := ioutil.ReadFile(filepath.Join("testdata", "shakespeare.txt"))
|
|
if err != nil {
|
|
t.Fatalf("failed to open test data file: %s", err)
|
|
}
|
|
longPrompt := "summarize the following: " + string(data)
|
|
|
|
targetArch := os.Getenv("OLLAMA_TEST_ARCHITECTURE")
|
|
|
|
for _, model := range chatModels {
|
|
if !strings.Contains(model, ":") {
|
|
model = model + ":latest"
|
|
}
|
|
t.Run(model, func(t *testing.T) {
|
|
if time.Now().Sub(started) > softTimeout {
|
|
t.Skip("skipping remaining tests to avoid excessive runtime")
|
|
}
|
|
pullOrSkip(ctx, t, client, model)
|
|
var maxContext int
|
|
|
|
resp, err := client.Show(ctx, &api.ShowRequest{Model: model})
|
|
if err != nil {
|
|
t.Fatalf("show failed: %s", err)
|
|
}
|
|
arch := resp.ModelInfo["general.architecture"].(string)
|
|
maxContext = int(resp.ModelInfo[fmt.Sprintf("%s.context_length", arch)].(float64))
|
|
if targetArch != "" && arch != targetArch {
|
|
t.Skip(fmt.Sprintf("Skipping %s architecture %s != %s", model, arch, targetArch))
|
|
}
|
|
|
|
if maxVram > 0 {
|
|
resp, err := client.List(ctx)
|
|
if err != nil {
|
|
t.Fatalf("list models failed %v", err)
|
|
}
|
|
for _, m := range resp.Models {
|
|
// For these tests we want to exercise a some amount of overflow on the CPU
|
|
if m.Name == model && float32(m.Size)*0.75 > float32(maxVram) {
|
|
t.Skipf("model %s is too large %s for available VRAM %s", model, format.HumanBytes(m.Size), format.HumanBytes(int64(maxVram)))
|
|
}
|
|
}
|
|
}
|
|
slog.Info("scneario", "model", model, "max_context", maxContext)
|
|
loaded := false
|
|
defer func() {
|
|
// best effort unload once we're done with the model
|
|
if loaded {
|
|
client.Generate(ctx, &api.GenerateRequest{Model: model, KeepAlive: &api.Duration{Duration: 0}}, func(rsp api.GenerateResponse) error { return nil })
|
|
}
|
|
}()
|
|
|
|
// Some models don't handle the long context data well so skip them to avoid flaky test results
|
|
longContextFlake := false
|
|
for _, flake := range longContextFlakes {
|
|
if model == flake {
|
|
longContextFlake = true
|
|
break
|
|
}
|
|
}
|
|
|
|
// iterate through a few context sizes for coverage without excessive runtime
|
|
var contexts []int
|
|
keepGoing := true
|
|
if maxContext > 16384 {
|
|
contexts = []int{4096, 8192, 16384, maxContext}
|
|
} else if maxContext > 8192 {
|
|
contexts = []int{4096, 8192, maxContext}
|
|
} else if maxContext > 4096 {
|
|
contexts = []int{4096, maxContext}
|
|
} else if maxContext > 0 {
|
|
contexts = []int{maxContext}
|
|
} else {
|
|
t.Fatal("unknown max context size")
|
|
}
|
|
for _, numCtx := range contexts {
|
|
if !keepGoing && numCtx > 8192 { // Always try up to 8k before bailing out
|
|
break
|
|
}
|
|
skipLongPrompt := false
|
|
|
|
// Workaround bug 11172 temporarily...
|
|
maxPrompt := longPrompt
|
|
// If we fill the context too full with the prompt, many models
|
|
// quickly hit context shifting and go bad.
|
|
if len(maxPrompt) > numCtx*2 { // typically yields ~1/2 full context
|
|
maxPrompt = maxPrompt[:numCtx*2]
|
|
}
|
|
|
|
testCases := []struct {
|
|
prompt string
|
|
anyResp []string
|
|
}{
|
|
{blueSkyPrompt, blueSkyExpected},
|
|
{maxPrompt, []string{"shakespeare", "oppression", "sorrows", "gutenberg", "child", "license", "sonnet", "melancholy", "love", "sorrow", "beauty"}},
|
|
}
|
|
var gpuPercent int
|
|
for _, tc := range testCases {
|
|
if len(tc.prompt) > 100 && (longContextFlake || skipLongPrompt) {
|
|
slog.Info("skipping long prompt", "model", model, "num_ctx", numCtx, "gpu_percent", gpuPercent)
|
|
continue
|
|
}
|
|
req := api.ChatRequest{
|
|
Model: model,
|
|
Messages: []api.Message{
|
|
{
|
|
Role: "user",
|
|
Content: tc.prompt,
|
|
},
|
|
},
|
|
KeepAlive: &api.Duration{Duration: 20 * time.Second}, // long enough to ensure a ps returns
|
|
Options: map[string]interface{}{
|
|
"temperature": 0,
|
|
"seed": 123,
|
|
"num_ctx": numCtx,
|
|
},
|
|
}
|
|
atLeastOne := false
|
|
var resp api.ChatResponse
|
|
|
|
stream := false
|
|
req.Stream = &stream
|
|
|
|
// Avoid potentially getting stuck indefinitely
|
|
limit := 5 * time.Minute
|
|
genCtx, cancel := context.WithDeadlineCause(
|
|
ctx,
|
|
time.Now().Add(limit),
|
|
fmt.Errorf("generate on model %s with ctx %d took longer than %v", model, numCtx, limit),
|
|
)
|
|
defer cancel()
|
|
|
|
err = client.Chat(genCtx, &req, func(rsp api.ChatResponse) error {
|
|
resp = rsp
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
// Avoid excessive test runs, but don't consider a failure with massive context
|
|
if numCtx > 16384 && strings.Contains(err.Error(), "took longer") {
|
|
slog.Warn("max context was taking too long, skipping", "error", err)
|
|
keepGoing = false
|
|
skipLongPrompt = true
|
|
continue
|
|
}
|
|
t.Fatalf("generate error: ctx:%d err:%s", numCtx, err)
|
|
}
|
|
loaded = true
|
|
for _, expResp := range tc.anyResp {
|
|
if strings.Contains(strings.ToLower(resp.Message.Content), expResp) {
|
|
atLeastOne = true
|
|
break
|
|
}
|
|
}
|
|
if !atLeastOne {
|
|
t.Fatalf("response didn't contain expected values: ctx:%d expected:%v response:%s ", numCtx, tc.anyResp, resp.Message.Content)
|
|
}
|
|
models, err := client.ListRunning(ctx)
|
|
if err != nil {
|
|
slog.Warn("failed to list running models", "error", err)
|
|
continue
|
|
}
|
|
if len(models.Models) > 1 {
|
|
slog.Warn("multiple models loaded, may impact performance results", "loaded", models.Models)
|
|
}
|
|
for _, m := range models.Models {
|
|
if m.Name == model {
|
|
if m.SizeVRAM == 0 {
|
|
slog.Info("Model fully loaded into CPU")
|
|
gpuPercent = 0
|
|
keepGoing = false
|
|
skipLongPrompt = true
|
|
} else if m.SizeVRAM == m.Size {
|
|
slog.Info("Model fully loaded into GPU")
|
|
gpuPercent = 100
|
|
} else {
|
|
sizeCPU := m.Size - m.SizeVRAM
|
|
cpuPercent := math.Round(float64(sizeCPU) / float64(m.Size) * 100)
|
|
gpuPercent = int(100 - cpuPercent)
|
|
slog.Info("Model split between CPU/GPU", "CPU", cpuPercent, "GPU", gpuPercent)
|
|
keepGoing = false
|
|
|
|
// Heuristic to avoid excessive test run time
|
|
if gpuPercent < 90 {
|
|
skipLongPrompt = true
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// Round the logged prompt count for comparisons across versions/configurations which can vary slightly
|
|
fmt.Fprintf(os.Stderr, "MODEL_PERF_HEADER:%s,%s,%s,%s,%s,%s,%s\n",
|
|
"MODEL",
|
|
"CONTEXT",
|
|
"GPU PERCENT",
|
|
"APPROX PROMPT COUNT",
|
|
"LOAD TIME",
|
|
"PROMPT EVAL TPS",
|
|
"EVAL TPS",
|
|
)
|
|
fmt.Fprintf(os.Stderr, "MODEL_PERF_DATA:%s,%d,%d,%d,%0.2f,%0.2f,%0.2f\n",
|
|
model,
|
|
numCtx,
|
|
gpuPercent,
|
|
(resp.PromptEvalCount/10)*10,
|
|
float64(resp.LoadDuration)/1000000000.0,
|
|
float64(resp.PromptEvalCount)/(float64(resp.PromptEvalDuration)/1000000000.0),
|
|
float64(resp.EvalCount)/(float64(resp.EvalDuration)/1000000000.0),
|
|
)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|