Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.
ollamarunner: Fix memory leak when processing images
Jesse Gross8e8f2c6d67ff
diff --git a/runner/ollamarunner/runner.go b/runner/ollamarunner/runner.goindex 7ca6dc8c1..9597f7cdd 100644--- a/runner/ollamarunner/runner.go+++ b/runner/ollamarunner/runner.go@@ -34,14 +34,10 @@ import (_ "github.com/ollama/ollama/model/models")-type contextList struct {- list []ml.Context-}-type Sequence struct {// ctxs are used for allocating tensors that last the lifetime of the sequence, such as// multimodal embeddings- ctxs *contextList+ ctxs []ml.Context// batch indexiBatch int@@ -177,8 +173,10 @@ func (s *Server) NewSequence(prompt string, images []llm.ImageData, params NewSe// inputs processes the prompt and images into a list of inputs// by splitting the prompt on [img-<n>] tags, tokenizing text and// decoding images-func (s *Server) inputs(prompt string, images []llm.ImageData) ([]input.Input, *contextList, error) {+func (s *Server) inputs(prompt string, images []llm.ImageData) ([]input.Input, []ml.Context, error) {var inputs []input.Input+ var ctxs []ml.Context+var parts []stringvar matches [][]string@@ -192,13 +190,6 @@ func (s *Server) inputs(prompt string, images []llm.ImageData) ([]input.Input, *parts = []string{prompt}}- var contexts contextList- runtime.AddCleanup(&contexts, func(ctxs []ml.Context) {- for _, ctx := range ctxs {- ctx.Close()- }- }, contexts.list)-postTokenize := falsefor i, part := range parts {// text - tokenize@@ -228,7 +219,8 @@ func (s *Server) inputs(prompt string, images []llm.ImageData) ([]input.Input, *}ctx := s.model.Backend().NewContext()- contexts.list = append(contexts.list, ctx)+ runtime.SetFinalizer(ctx, func(c ml.Context) { c.Close() })+ ctxs = append(ctxs, ctx)imageEmbeddings, err := multimodalProcessor.EncodeMultimodal(ctx, images[imageIndex].Data)if err != nil {return nil, nil, err@@ -251,7 +243,7 @@ func (s *Server) inputs(prompt string, images []llm.ImageData) ([]input.Input, *}}- return inputs, &contexts, nil+ return inputs, ctxs, nil}type Server struct {