jeans/ollama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server: do not attempt to parse offset file as gguf

Browse Source 
This logic was causing issues for me when importing a gguf that had some padding at the end of the file. The valid gguf would be read, but then it would try to read the offset as a different gguf file. This does not seem right.
This commit is contained in:
Bruce MacDonald 2025-04-09 09:33:33 -07:00
parent e7019c9455
commit 04950140ec
1 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/create.go
View File

@ -497,12 +497,8 @@ func ggufLayers(digest string, fn func(resp api.ProgressResponse)) ([]*layerGGML
return nil, err return nil, err
} }
var offset int64
for offset < stat.Size() {
f, n, err := ggml.Decode(blob, 0) f, n, err := ggml.Decode(blob, 0)
if errors.Is(err, io.EOF) { if err != nil {
break
} else if err != nil {
return nil, err return nil, err
} }
@ -514,7 +510,7 @@ func ggufLayers(digest string, fn func(resp api.ProgressResponse)) ([]*layerGGML
} }
var layer Layer var layer Layer
if digest != "" && n == stat.Size() && offset == 0 { if digest != "" && n == stat.Size() {
layer, err = NewLayerFromLayer(digest, mediatype, blob.Name()) layer, err = NewLayerFromLayer(digest, mediatype, blob.Name())
if err != nil { if err != nil {
slog.Debug("could not create new layer from layer", "error", err) slog.Debug("could not create new layer from layer", "error", err)
@ -524,15 +520,13 @@ func ggufLayers(digest string, fn func(resp api.ProgressResponse)) ([]*layerGGML
// Fallback to creating layer from file copy (either NewLayerFromLayer failed, or digest empty/n != stat.Size()) // Fallback to creating layer from file copy (either NewLayerFromLayer failed, or digest empty/n != stat.Size())
if layer.Digest == "" { if layer.Digest == "" {
layer, err = NewLayer(io.NewSectionReader(blob, offset, n), mediatype) layer, err = NewLayer(io.NewSectionReader(blob, 0, n), mediatype)
if err != nil { if err != nil {
return nil, err return nil, err
} }
} }
layers = append(layers, &layerGGML{layer, f}) layers = append(layers, &layerGGML{layer, f})
offset = n
}
return detectChatTemplate(layers) return detectChatTemplate(layers)
} }