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

update test, remove comments

Browse Source
This commit is contained in:
Josh Yan 2024-07-17 10:46:50 -07:00
parent f378058b51
commit 309307c8f9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llm/gguf.go
View File

@ -227,7 +227,6 @@ func (llm *gguf) Decode(rs io.ReadSeeker) error {
return fmt.Errorf("failed to read tensor offset: %w", err) return fmt.Errorf("failed to read tensor offset: %w", err)
} }
fmt.Println("tensor", name, shape, kind, offset)
tensor := Tensor{ tensor := Tensor{
Name: name, Name: name,
Kind: kind, Kind: kind,
@ -765,9 +764,9 @@ func (gguf GGUFWriter) WriteTo(w io.Writer) (int64, error) {
slices.Sort(keys) slices.Sort(keys)
for _, key := range keys { for _, key := range keys {
fmt.Println(key)
switch key { switch key {
case "general.parameter_count": case "general.parameter_count":
// don't write general param count as its added in by us
continue continue
default: default:
if err := ggufWriteKV(wo, key, gguf.KV[key]); err != nil { if err := ggufWriteKV(wo, key, gguf.KV[key]); err != nil {

9
llm/gguf_test.go
View File

@ -14,11 +14,12 @@ import (
// TestGGUFDecode tests the decoding and rewriting of (unsorted) GGUF files // TestGGUFDecode tests the decoding and rewriting of (unsorted) GGUF files
// To run, add GGUF files to /llm/testdata and add the name of the file to the tests slice // To run, add GGUF files to /llm/testdata and add the name of the file to the tests slice
// Should comment //sort.Sort(tensors) in gguf.go
// This creates a temporary file in /llm/testdata that will deleted only if the test passes // This creates a temporary file in /llm/testdata that will deleted only if the test passes
// Note: map[Tensor.Name + " offset"] is commented since sorting will reorder the tensors
// Comment out sort.Sort(gguf.Tensors) in gguf.go to test offsets
func TestGGUFRewrite(t *testing.T) { func TestGGUFRewrite(t *testing.T) {
tests := []string{ tests := []string{
"nutiny.gguf", "phi3.gguf",
} }
for i := range tests { for i := range tests {
@ -112,7 +113,7 @@ func compareGGML(t *testing.T, gotGGML, wantGGML *GGML, f *os.File, f2 *os.File)
got[tensor.Name] = fmt.Sprintf("%x", sha256sum.Sum(nil)) got[tensor.Name] = fmt.Sprintf("%x", sha256sum.Sum(nil))
got[tensor.Name+" size"] = fmt.Sprintf("%d", s) got[tensor.Name+" size"] = fmt.Sprintf("%d", s)
got[tensor.Name+" offset"] = fmt.Sprintf("%v", tensor.Offset) // got[tensor.Name+" offset"] = fmt.Sprintf("%v", tensor.Offset)
} }
for _, tensor := range wantTensors { for _, tensor := range wantTensors {
@ -126,7 +127,7 @@ func compareGGML(t *testing.T, gotGGML, wantGGML *GGML, f *os.File, f2 *os.File)
want[tensor.Name] = fmt.Sprintf("%x", sha256sum.Sum(nil)) want[tensor.Name] = fmt.Sprintf("%x", sha256sum.Sum(nil))
want[tensor.Name+" size"] = fmt.Sprintf("%d", s) want[tensor.Name+" size"] = fmt.Sprintf("%d", s)
want[tensor.Name+" offset"] = fmt.Sprintf("%v", tensor.Offset) // want[tensor.Name+" offset"] = fmt.Sprintf("%v", tensor.Offset)
} }
return got, want return got, want
} }