Skip to content

Commit 6c733bf

Browse files
authored
s#x/exp/maps#maps# (ollama#11506)
1 parent 3bac5cb commit 6c733bf

File tree

5 files changed

+10
-22
lines changed

5 files changed

+10
-22
lines changed

convert/convert_test.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ import (
1111
"io"
1212
"io/fs"
1313
"log/slog"
14+
"maps"
1415
"os"
1516
"path/filepath"
1617
"slices"
1718
"strings"
1819
"testing"
1920

20-
"golang.org/x/exp/maps"
21-
2221
"github.com/ollama/ollama/fs/ggml"
2322
)
2423

@@ -137,9 +136,7 @@ func TestConvertModel(t *testing.T) {
137136
t.Fatal(err)
138137
}
139138

140-
keys := maps.Keys(expect)
141-
slices.Sort(keys)
142-
for _, k := range keys {
139+
for _, k := range slices.Sorted(maps.Keys(expect)) {
143140
if v, ok := actual[k]; !ok {
144141
t.Errorf("missing %s", k)
145142
} else if v != expect[k] {
@@ -343,9 +340,7 @@ func TestConvertAdapter(t *testing.T) {
343340

344341
actual := generateResultsJSON(t, r, m.KV(), m.Tensors())
345342

346-
keys := maps.Keys(c.Expected)
347-
slices.Sort(keys)
348-
for _, k := range keys {
343+
for _, k := range slices.Sorted(maps.Keys(c.Expected)) {
349344
if v, ok := actual[k]; !ok {
350345
t.Errorf("missing %s", k)
351346
} else if v != c.Expected[k] {

convert/reader_safetensors.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"fmt"
99
"io"
1010
"io/fs"
11+
"maps"
1112
"slices"
1213
"strings"
1314

1415
"github.com/d4l3k/go-bfloat16"
1516
"github.com/x448/float16"
16-
"golang.org/x/exp/maps"
1717
)
1818

1919
type safetensorMetadata struct {
@@ -46,8 +46,7 @@ func parseSafetensors(fsys fs.FS, replacer *strings.Replacer, ps ...string) ([]T
4646
return nil, err
4747
}
4848

49-
keys := maps.Keys(headers)
50-
slices.Sort(keys)
49+
keys := slices.Sorted(maps.Keys(headers))
5150

5251
names := make(map[string]struct{}, len(keys))
5352

convert/tokenizer.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ import (
88
"fmt"
99
"io/fs"
1010
"log/slog"
11+
"maps"
1112
"os"
1213
"slices"
1314
"strings"
14-
15-
"golang.org/x/exp/maps"
1615
)
1716

1817
const (
@@ -260,11 +259,8 @@ func parseVocabularyFromTokenizer(fsys fs.FS) (*Vocabulary, error) {
260259
tokens[token.ID] = token
261260
}
262261

263-
keys := maps.Keys(tokens)
264-
slices.Sort(keys)
265-
266262
v := Vocabulary{Model: "gpt2"}
267-
for _, k := range keys {
263+
for _, k := range slices.Sorted(maps.Keys(tokens)) {
268264
token := tokens[k]
269265
v.Tokens = append(v.Tokens, token.Content)
270266
v.Scores = append(v.Scores, float32(token.ID))

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ require (
7171
github.com/ugorji/go/codec v1.2.12 // indirect
7272
golang.org/x/arch v0.8.0 // indirect
7373
golang.org/x/crypto v0.36.0
74-
golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa
74+
golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect
7575
golang.org/x/net v0.38.0 // indirect
7676
golang.org/x/sys v0.31.0
7777
golang.org/x/term v0.30.0

template/template.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"encoding/json"
77
"errors"
88
"io"
9+
"maps"
910
"math"
1011
"slices"
1112
"strings"
@@ -14,7 +15,6 @@ import (
1415
"text/template/parse"
1516

1617
"github.com/agnivade/levenshtein"
17-
"golang.org/x/exp/maps"
1818

1919
"github.com/ollama/ollama/api"
2020
)
@@ -157,9 +157,7 @@ func (t *Template) Vars() []string {
157157
set[strings.ToLower(n)] = struct{}{}
158158
}
159159

160-
vars = maps.Keys(set)
161-
slices.Sort(vars)
162-
return vars
160+
return slices.Sorted(maps.Keys(set))
163161
}
164162

165163
type Values struct {

0 commit comments

Comments
 (0)