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

feed the linter

Browse Source
This commit is contained in:
Patrick Devine 2024-07-08 12:15:31 -07:00
parent a451611761
commit a3058002c4
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
convert/convert_test.go
View File

@ -134,8 +134,8 @@ func TestConvertNPZ(t *testing.T) {
for _, fn := range cases { for _, fn := range cases {
ts, err := parseNPZ(filepath.Join("testdata", fn)) ts, err := parseNPZ(filepath.Join("testdata", fn))
assert.Nil(t, err) assert.NoError(t, err)
assert.Equal(t, 16*2*2, len(ts)) // 16 layers, 2 tensors, 2 loras assert.Len(t, ts, 16*2*2) // 16 layers, 2 tensors, 2 loras
a := adapter{} a := adapter{}
@ -143,19 +143,19 @@ func TestConvertNPZ(t *testing.T) {
at := m.(adapterTensor) at := m.(adapterTensor)
assert.Equal(t, filepath.Join("testdata", fn), at.path) assert.Equal(t, filepath.Join("testdata", fn), at.path)
assert.Equal(t, "F32", at.dtype) // only float32s supported assert.Equal(t, "F32", at.dtype) // only float32s supported
assert.Equal(t, 2, len(at.tensorBase.shape)) assert.Len(t, at.tensorBase.shape, 2)
} }
var ws io.WriteSeeker = &memWriter{} var ws io.WriteSeeker = &memWriter{}
err = llm.WriteGGLA(ws, a.KV(nil), a.Tensors(ts)) err = llm.WriteGGLA(ws, a.KV(nil), a.Tensors(ts))
assert.Nil(t, err) assert.NoError(t, err)
mw := ws.(*memWriter) mw := ws.(*memWriter)
slog.Info(fmt.Sprintf("buffer len = %d", len(mw.buf))) slog.Info(fmt.Sprintf("buffer len = %d", len(mw.buf)))
assert.NotEqual(t, 0, len(mw.buf)) assert.NotEmpty(t, mw.buf)
rs := bytes.NewReader(mw.buf) rs := bytes.NewReader(mw.buf)
ggml, _, err := llm.DecodeGGML(rs, len(mw.buf)) ggml, _, err := llm.DecodeGGML(rs, len(mw.buf))
assert.Nil(t, err, "decode ggml failed") assert.NoError(t, err, "decode ggml failed")
assert.NotNil(t, ggml, "ggml was empty") assert.NotNil(t, ggml, "ggml was empty")
kv := ggml.KV() kv := ggml.KV()

4
convert/reader_npz.go
View File

@ -110,11 +110,9 @@ func (t adapterTensor) WriteTo(w io.Writer) (int64, error) {
} }
return 0, binary.Write(w, binary.LittleEndian, f32s) return 0, binary.Write(w, binary.LittleEndian, f32s)
default:
return 0, fmt.Errorf("unknown data type: %s", t.dtype)
} }
return 0, fmt.Errorf("unknown error") return 0, fmt.Errorf("unknown data type: %s", t.dtype)
} }
func transpose(f32s []float32, shape []uint64) ([]float32, error) { func transpose(f32s []float32, shape []uint64) ([]float32, error) {

6
llm/ggla.go
View File

@ -86,7 +86,7 @@ func (llm *ggla) decode(rs io.ReadSeeker) error {
var dims uint32 var dims uint32
if err := binary.Read(rs, binary.LittleEndian, &dims); err != nil { if err := binary.Read(rs, binary.LittleEndian, &dims); err != nil {
if errors.Is(err, io.EOF) { if errors.Is(err, io.EOF) {
return nil break
} }
return err return err
} }
@ -180,7 +180,7 @@ func WriteGGLA(ws io.WriteSeeker, kv KV, ts []*Tensor) error {
for _, t := range ts { for _, t := range ts {
dims := 0 dims := 0
for cnt := 0; cnt < len(t.Shape); cnt++ { for cnt := range len(t.Shape) {
if t.Shape[cnt] > 0 { if t.Shape[cnt] > 0 {
dims++ dims++
} }
@ -198,7 +198,7 @@ func WriteGGLA(ws io.WriteSeeker, kv KV, ts []*Tensor) error {
return err return err
} }
for cnt := 0; cnt < dims; cnt++ { for cnt := range dims {
if err := binary.Write(ws, binary.LittleEndian, uint32(t.Shape[dims-1-cnt])); err != nil { if err := binary.Write(ws, binary.LittleEndian, uint32(t.Shape[dims-1-cnt])); err != nil {
return err return err
} }