mirror of
https://github.com/ollama/ollama.git
synced 2026-08-02 19:16:50 -04: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>
361 lines
9.3 KiB
Go
361 lines
9.3 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"time"
|
|
"unicode/utf8"
|
|
|
|
"github.com/ollama/ollama/x/imagegen/cache"
|
|
"github.com/ollama/ollama/x/imagegen/mlx"
|
|
"github.com/ollama/ollama/x/imagegen/tokenizer"
|
|
)
|
|
|
|
// Dedicated stream for generation (like mlx-lm's generation_stream)
|
|
var generationStream *mlx.Stream
|
|
|
|
// utf8Streamer buffers decoded text and emits only complete UTF-8 characters.
|
|
// This handles cases where tokenizers output partial multi-byte sequences.
|
|
type utf8Streamer struct {
|
|
buffer []byte
|
|
}
|
|
|
|
// Write adds decoded text to the buffer and returns complete UTF-8 characters.
|
|
func (s *utf8Streamer) Write(text string) string {
|
|
s.buffer = append(s.buffer, text...)
|
|
|
|
// Find the last position that ends with a complete UTF-8 character
|
|
validLen := 0
|
|
for i := 0; i < len(s.buffer); {
|
|
r, size := utf8.DecodeRune(s.buffer[i:])
|
|
if r == utf8.RuneError && size == 1 {
|
|
// Invalid or incomplete UTF-8 sequence at this position
|
|
// Check if it could be a valid start of a multi-byte sequence
|
|
if len(s.buffer)-i < 4 {
|
|
// Might be incomplete, keep it in buffer
|
|
break
|
|
}
|
|
// Definitely invalid, skip this byte
|
|
i++
|
|
validLen = i
|
|
} else {
|
|
i += size
|
|
validLen = i
|
|
}
|
|
}
|
|
|
|
if validLen == 0 {
|
|
return ""
|
|
}
|
|
|
|
result := string(s.buffer[:validLen])
|
|
s.buffer = s.buffer[validLen:]
|
|
return result
|
|
}
|
|
|
|
// Flush returns any remaining buffered bytes (may be incomplete UTF-8).
|
|
func (s *utf8Streamer) Flush() string {
|
|
if len(s.buffer) == 0 {
|
|
return ""
|
|
}
|
|
result := string(s.buffer)
|
|
s.buffer = nil
|
|
return result
|
|
}
|
|
|
|
// withStream runs fn with the generation stream as default
|
|
func withStream(fn func()) {
|
|
// Lazy initialization of generationStream
|
|
if generationStream == nil {
|
|
generationStream = mlx.NewStream()
|
|
}
|
|
orig := mlx.GetDefaultStream()
|
|
mlx.SetDefaultStream(generationStream)
|
|
fn()
|
|
mlx.SetDefaultStream(orig)
|
|
}
|
|
|
|
type Model interface {
|
|
Tokenizer() *tokenizer.Tokenizer
|
|
VocabSize() int32
|
|
NewCache(maxSeqLen int32) []cache.Cache
|
|
Forward(input *mlx.Array, caches []cache.Cache) *mlx.Array
|
|
}
|
|
|
|
// ChatModel is an optional interface for models that support chat formatting
|
|
type ChatModel interface {
|
|
FormatPrompt(prompt string) string
|
|
}
|
|
|
|
// MultimodalModel is for models that support image input
|
|
type MultimodalModel interface {
|
|
Model
|
|
FormatPromptWithImage(prompt string) string
|
|
ExpandImageTokens(tokens []int32) []int32
|
|
ForwardWithImage(tokens *mlx.Array, image *mlx.Array, caches []cache.Cache) *mlx.Array
|
|
ImageSize() int32 // Returns expected image size for preprocessing
|
|
}
|
|
|
|
// ImageLoader loads and preprocesses an image for multimodal models
|
|
// Returns nil if path is empty
|
|
type ImageLoader func(path string, imageSize int32) (*mlx.Array, error)
|
|
|
|
type input struct {
|
|
Prompt string
|
|
Image *mlx.Array // Optional preprocessed image for multimodal models
|
|
MaxTokens int
|
|
Temperature float32
|
|
TopP float32
|
|
TopK int
|
|
WiredLimitGB int // Metal wired memory limit in GB (default 32)
|
|
}
|
|
|
|
type output struct {
|
|
Text string
|
|
Done bool
|
|
PrefillTokSec float64
|
|
GenTokSec float64
|
|
}
|
|
|
|
// Decoder wraps model + cache for autoregressive generation.
|
|
type Decoder struct {
|
|
model Model
|
|
caches []cache.Cache
|
|
vocabSize int32
|
|
temp float32
|
|
topK int
|
|
topP float32
|
|
token *mlx.Array // Current token (kept across pools)
|
|
oldCacheState []*mlx.Array // Preallocated slice for old cache state
|
|
image *mlx.Array // Optional image for multimodal prefill
|
|
}
|
|
|
|
func NewDecoder(m Model, temp float32, topK int, topP float32) *Decoder {
|
|
caches := m.NewCache(0)
|
|
return &Decoder{
|
|
model: m,
|
|
caches: caches,
|
|
vocabSize: m.VocabSize(),
|
|
temp: temp,
|
|
topK: topK,
|
|
topP: topP,
|
|
oldCacheState: make([]*mlx.Array, 0, len(caches)*2),
|
|
}
|
|
}
|
|
|
|
// SetImage sets the image for multimodal prefill (call before prefill)
|
|
func (d *Decoder) SetImage(img *mlx.Array) {
|
|
d.image = img
|
|
}
|
|
|
|
func (d *Decoder) prefill(inputIDs []int32) int {
|
|
processed := 0
|
|
|
|
// Track old cache state to free after each chunk
|
|
var oldCacheState []*mlx.Array
|
|
|
|
// For multimodal models with an image, we need to process all tokens together
|
|
// in the first forward pass so the image embeddings can be inserted properly.
|
|
// Skip chunking for multimodal prefill.
|
|
isMultimodal := d.image != nil
|
|
|
|
// Process all-but-1 tokens in chunks, eval cache state for memory management
|
|
// Skip chunking for multimodal - process everything in the final step
|
|
if !isMultimodal {
|
|
for len(inputIDs) > 1 {
|
|
chunkSize := min(2048, len(inputIDs)-1)
|
|
if chunkSize <= 0 {
|
|
break
|
|
}
|
|
chunk := inputIDs[:chunkSize]
|
|
|
|
// Save old cache state before forward
|
|
oldCacheState = oldCacheState[:0]
|
|
for _, c := range d.caches {
|
|
oldCacheState = append(oldCacheState, c.State()...)
|
|
}
|
|
|
|
var cacheState []*mlx.Array
|
|
withStream(func() {
|
|
x := mlx.NewArrayInt32(chunk, []int32{1, int32(len(chunk))})
|
|
d.model.Forward(x, d.caches)
|
|
for _, c := range d.caches {
|
|
cacheState = append(cacheState, c.State()...)
|
|
}
|
|
})
|
|
mlx.Eval(cacheState...)
|
|
|
|
// Free old cache state
|
|
for _, arr := range oldCacheState {
|
|
if arr != nil {
|
|
arr.Free()
|
|
}
|
|
}
|
|
|
|
inputIDs = inputIDs[chunkSize:]
|
|
processed += chunkSize
|
|
}
|
|
}
|
|
|
|
// Save old cache state before final step
|
|
oldCacheState = oldCacheState[:0]
|
|
for _, c := range d.caches {
|
|
oldCacheState = append(oldCacheState, c.State()...)
|
|
}
|
|
|
|
// Final token + sampling (or all tokens for multimodal)
|
|
withStream(func() {
|
|
x := mlx.NewArrayInt32(inputIDs, []int32{1, int32(len(inputIDs))})
|
|
mlx.Eval(x) // Materialize before any other evals
|
|
|
|
var logits *mlx.Array
|
|
// Use ForwardWithImage if we have an image and model supports it
|
|
if d.image != nil {
|
|
if mm, ok := d.model.(MultimodalModel); ok {
|
|
logits = mm.ForwardWithImage(x, d.image, d.caches)
|
|
d.image = nil // Only use image for first forward
|
|
} else {
|
|
logits = d.model.Forward(x, d.caches)
|
|
}
|
|
} else {
|
|
logits = d.model.Forward(x, d.caches)
|
|
}
|
|
d.token = sample(logits, d.temp, d.topK, d.topP, d.vocabSize)
|
|
})
|
|
// Keep cache state (token auto-kept by AsyncEval)
|
|
for _, c := range d.caches {
|
|
mlx.Keep(c.State()...)
|
|
}
|
|
mlx.AsyncEval(d.token)
|
|
|
|
// Free old cache state from before final step
|
|
for _, arr := range oldCacheState {
|
|
if arr != nil {
|
|
arr.Free()
|
|
}
|
|
}
|
|
|
|
mlx.ClearCache()
|
|
|
|
return processed + len(inputIDs)
|
|
}
|
|
|
|
func (d *Decoder) step() int32 {
|
|
prevToken := d.token
|
|
|
|
// Save old cache state (reuse preallocated slice)
|
|
d.oldCacheState = d.oldCacheState[:0]
|
|
for _, c := range d.caches {
|
|
d.oldCacheState = append(d.oldCacheState, c.State()...)
|
|
}
|
|
|
|
withStream(func() {
|
|
logits := d.model.Forward(mlx.Reshape(prevToken, 1, 1), d.caches)
|
|
d.token = sample(logits, d.temp, d.topK, d.topP, d.vocabSize)
|
|
})
|
|
// Keep token and new cache state so they survive cleanup
|
|
mlx.Keep(d.token)
|
|
for _, c := range d.caches {
|
|
mlx.Keep(c.State()...)
|
|
}
|
|
mlx.AsyncEval(d.token)
|
|
|
|
// Sync on previous token (GPU already working on next step)
|
|
val := prevToken.ItemInt32()
|
|
|
|
// Free old token and old cache state
|
|
prevToken.Free()
|
|
for _, arr := range d.oldCacheState {
|
|
arr.Free()
|
|
}
|
|
return val
|
|
}
|
|
|
|
func generate(ctx context.Context, m Model, in input, cb func(output)) error {
|
|
mlx.EnableCompile()
|
|
wiredLimit := in.WiredLimitGB
|
|
if wiredLimit <= 0 {
|
|
wiredLimit = 32 // default 32GB
|
|
}
|
|
mlx.MetalSetWiredLimit(uint64(wiredLimit) << 30)
|
|
|
|
temp := in.Temperature
|
|
if temp < 0 {
|
|
temp = 0.7
|
|
}
|
|
|
|
tok := m.Tokenizer()
|
|
dec := NewDecoder(m, temp, in.TopK, in.TopP)
|
|
|
|
// Apply chat template - use image template if we have an image
|
|
prompt := in.Prompt
|
|
var tokens []int32
|
|
if mm, ok := m.(MultimodalModel); ok && in.Image != nil {
|
|
prompt = mm.FormatPromptWithImage(prompt)
|
|
tokens = tok.Encode(prompt, true)
|
|
tokens = mm.ExpandImageTokens(tokens) // Expand <start_of_image> to 256 image tokens
|
|
dec.SetImage(in.Image)
|
|
} else if cm, ok := m.(ChatModel); ok {
|
|
prompt = cm.FormatPrompt(prompt)
|
|
tokens = tok.Encode(prompt, true)
|
|
} else {
|
|
tokens = tok.Encode(prompt, true)
|
|
}
|
|
|
|
prefillStart := time.Now()
|
|
prefillTokens := dec.prefill(tokens)
|
|
// Prefill measurement should include time to first token (like mlx-lm)
|
|
// Step() waits for prefill to complete and returns first token
|
|
firstToken := dec.step()
|
|
prefillTokSec := float64(prefillTokens) / time.Since(prefillStart).Seconds()
|
|
|
|
genStart := time.Now()
|
|
maxTokens := max(in.MaxTokens, 100)
|
|
var genTokens int
|
|
|
|
// UTF-8 streamer to handle partial multi-byte characters
|
|
streamer := &utf8Streamer{}
|
|
|
|
// Handle first token
|
|
genTokens++
|
|
if tok.IsEOS(firstToken) {
|
|
cb(output{Done: true, PrefillTokSec: prefillTokSec, GenTokSec: 0})
|
|
return nil
|
|
}
|
|
if text := streamer.Write(tok.Decode([]int32{firstToken})); text != "" {
|
|
cb(output{Text: text})
|
|
}
|
|
|
|
for n := 1; n < maxTokens; n++ {
|
|
if ctx.Err() != nil {
|
|
return ctx.Err()
|
|
}
|
|
token := dec.step()
|
|
genTokens++
|
|
|
|
if tok.IsEOS(token) {
|
|
break
|
|
}
|
|
if text := streamer.Write(tok.Decode([]int32{token})); text != "" {
|
|
cb(output{Text: text})
|
|
}
|
|
|
|
if n%256 == 0 {
|
|
mlx.ClearCache()
|
|
}
|
|
}
|
|
|
|
// Flush any remaining buffered bytes
|
|
if text := streamer.Flush(); text != "" {
|
|
cb(output{Text: text})
|
|
}
|
|
|
|
fmt.Printf("\nPeak memory: %.2fGB\n", float64(mlx.MetalGetPeakMemory())/(1<<30))
|
|
cb(output{
|
|
Done: true,
|
|
PrefillTokSec: prefillTokSec,
|
|
GenTokSec: float64(genTokens) / time.Since(genStart).Seconds(),
|
|
})
|
|
return nil
|
|
}
|