Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.
remove support for multiple ggufs in a single file (#10722)
Michael Yang61aeaf7e813b
diff --git a/server/create.go b/server/create.goindex 9488de354..bd970876f 100644--- a/server/create.go+++ b/server/create.go@@ -501,48 +501,27 @@ func ggufLayers(digest string, fn func(resp api.ProgressResponse)) ([]*layerGGMLreturn nil, errOnlyGGUFSupported}- stat, err := blob.Stat()+ f, err := ggml.Decode(blob, -1)if err != nil {return nil, err}- var offset int64- for offset < stat.Size() {- f, err := ggml.Decode(blob, -1)- if errors.Is(err, io.EOF) {- break- } else if err != nil {- return nil, err- }-- mediatype := "application/vnd.ollama.image.model"- if f.KV().Kind() == "adapter" {- mediatype = "application/vnd.ollama.image.adapter"- } else if _, ok := f.KV()[fmt.Sprintf("%s.vision.block_count", f.KV().Architecture())]; ok || f.KV().Kind() == "projector" {- mediatype = "application/vnd.ollama.image.projector"- }-- var layer Layer- if digest != "" && f.Length == stat.Size() && offset == 0 {- layer, err = NewLayerFromLayer(digest, mediatype, blob.Name())- if err != nil {- slog.Debug("could not create new layer from layer", "error", err)- return nil, err- }- }-- // Fallback to creating layer from file copy (either NewLayerFromLayer failed, or digest empty/n != stat.Size())- if layer.Digest == "" {- layer, err = NewLayer(io.NewSectionReader(blob, offset, f.Length), mediatype)- if err != nil {- return nil, err- }- }+ mediatype := "application/vnd.ollama.image.model"+ if f.KV().Kind() == "adapter" {+ mediatype = "application/vnd.ollama.image.adapter"+ } else if (f.KV().Uint("block_count") == 0 && f.KV().Uint("vision.block_count") > 0) || f.KV().Kind() == "projector" {+ // if a model has vision.block_count but not block_count, it is a standalone vision model+ mediatype = "application/vnd.ollama.image.projector"+ }- layers = append(layers, &layerGGML{layer, f})- offset = f.Length+ layer, err := NewLayerFromLayer(digest, mediatype, blob.Name())+ if err != nil {+ slog.Debug("could not create new layer from layer", "error", err)+ return nil, err}+ layers = append(layers, &layerGGML{layer, f})+return detectChatTemplate(layers)}