Compare commits

..

1 Commits

Author SHA1 Message Date
Michael Yang
bdfc82b351 add model benchmark
```
go test ./runner/ollamarunner -run ^$ -bench Runner -model <model>
```
2025-08-25 13:59:44 -07:00
3 changed files with 194 additions and 17 deletions

View File

@@ -69,10 +69,10 @@ func New(c fs.Config) (model.Model, error) {
},
}
m.Cache = kvcache.NewWrapperCache(
kvcache.NewSWACache(int32(c.Uint("attention.sliding_window")), m.Shift),
kvcache.NewCausalCache(m.Shift),
)
slidingWindowLen := int32(c.Uint("attention.sliding_window"))
m.Cache = kvcache.NewWrapperCache(kvcache.NewSWACache(slidingWindowLen, m.Shift), kvcache.NewCausalCache(m.Shift))
m.Cache.SetConfig(ml.CacheConfig{})
return &m, nil
}
@@ -90,6 +90,12 @@ func (sa *SelfAttention) Forward(ctx ml.Context, hiddenState, positionIDs ml.Ten
q = q.Reshape(ctx, opts.attnKeyLen, opts.numHeads, batchSize)
q = fast.RoPE(ctx, q, positionIDs, opts.attnKeyLen, opts.ropeBase, opts.ropeScale, rope.WithTypeNeoX())
if opts.largeModelScaling {
q = q.Scale(ctx, 1.0/math.Sqrt(float64(opts.hiddenSize/opts.numHeads)))
} else {
q = q.Scale(ctx, 1.0/math.Sqrt(float64(opts.attnKeyLen)))
}
k := sa.Key.Forward(ctx, hiddenState)
k = k.Reshape(ctx, opts.attnKeyLen, opts.numKVHeads, batchSize)
k = fast.RoPE(ctx, k, positionIDs, opts.attnKeyLen, opts.ropeBase, opts.ropeScale, rope.WithTypeNeoX())
@@ -97,14 +103,28 @@ func (sa *SelfAttention) Forward(ctx ml.Context, hiddenState, positionIDs ml.Ten
v := sa.Value.Forward(ctx, hiddenState)
v = v.Reshape(ctx, opts.attnValLen, opts.numKVHeads, batchSize)
scale := 1.0 / math.Sqrt(float64(opts.attnKeyLen))
if opts.largeModelScaling {
scale = 1.0 / math.Sqrt(float64(opts.hiddenSize/opts.numHeads))
}
cache.Put(ctx, k, v)
k, v, mask := cache.Get(ctx)
attn := nn.Attention(ctx, q, k, v, scale, cache)
attn = attn.Reshape(ctx, opts.attnValLen*opts.numHeads, batchSize)
return sa.Output.Forward(ctx, attn)
q = q.Permute(ctx, 0, 2, 1, 3)
k = k.Permute(ctx, 0, 2, 1, 3)
v = v.Permute(ctx, 1, 2, 0, 3).Contiguous(ctx)
kq := k.Mulmat(ctx, q)
// logit softcap
kq = kq.Scale(ctx, 1.0/float64(opts.attnLogitSoftcap))
kq = kq.Tanh(ctx)
kq = kq.Scale(ctx, float64(opts.attnLogitSoftcap))
kq = kq.Add(ctx, mask)
kq = kq.Softmax(ctx)
kqv := v.Mulmat(ctx, kq)
kqv = kqv.Permute(ctx, 0, 2, 1, 3).Contiguous(ctx)
kqv = kqv.Reshape(ctx, opts.attnValLen*opts.numHeads, batchSize)
return sa.Output.Forward(ctx, kqv)
}
func (m *Model) Shift(ctx ml.Context, layer int, key, shift ml.Tensor) (ml.Tensor, error) {

View File

@@ -86,6 +86,12 @@ func (sa *TextSelfAttention) Forward(ctx ml.Context, layer int, hiddenState, pos
q = sa.QueryNorm.Forward(ctx, q, opts.eps)
q = fast.RoPE(ctx, q, positionIDs, opts.attnKeyLen, ropeBase, opts.ropeScale, rope.WithTypeNeoX())
if opts.largeModelScaling {
q = q.Scale(ctx, 1.0/math.Sqrt(float64(opts.hiddenSize/opts.numHeads)))
} else {
q = q.Scale(ctx, 1.0/math.Sqrt(float64(opts.attnKeyLen)))
}
k := sa.Key.Forward(ctx, hiddenState)
k = k.Reshape(ctx, opts.attnKeyLen, opts.numKVHeads, batchSize)
k = sa.KeyNorm.Forward(ctx, k, opts.eps)
@@ -94,12 +100,8 @@ func (sa *TextSelfAttention) Forward(ctx ml.Context, layer int, hiddenState, pos
v := sa.Value.Forward(ctx, hiddenState)
v = v.Reshape(ctx, opts.attnValLen, opts.numKVHeads, batchSize)
scale := 1.0 / math.Sqrt(float64(opts.attnKeyLen))
if opts.largeModelScaling {
scale = 1.0 / math.Sqrt(float64(opts.hiddenSize/opts.numHeads))
}
kqv := nn.Attention(ctx, q, k, v, scale, cache)
scaleFactor := 1.0
kqv := nn.Attention(ctx, q, k, v, scaleFactor, cache)
kqv = kqv.Reshape(ctx, opts.attnValLen*opts.numHeads, batchSize)
return sa.Output.Forward(ctx, kqv)

View File

@@ -0,0 +1,155 @@
package ollamarunner
import (
"encoding/json"
"flag"
"log/slog"
"math"
"os"
"path/filepath"
"runtime"
"slices"
"strings"
"testing"
"time"
"github.com/ollama/ollama/discover"
"github.com/ollama/ollama/envconfig"
"github.com/ollama/ollama/logutil"
"github.com/ollama/ollama/ml"
"github.com/ollama/ollama/model"
_ "github.com/ollama/ollama/model/models"
typemodel "github.com/ollama/ollama/types/model"
)
var args struct {
model,
prompt string
layers int
}
func TestMain(m *testing.M) {
flag.StringVar(&args.model, "model", "", "path to model")
flag.StringVar(&args.prompt, "prompt", "The capital of France is", "model prompt")
flag.IntVar(&args.layers, "layers", math.MaxInt, "num of gpu layers")
flag.Parse()
slog.SetDefault(logutil.NewLogger(os.Stderr, envconfig.LogLevel()))
os.Exit(m.Run())
}
func blob(tb testing.TB, model string) string {
tb.Helper()
models := envconfig.Models()
manifest, err := os.Open(filepath.Join(models, "manifests", typemodel.ParseName(model).Filepath()))
if err != nil {
tb.Fatal(err)
}
defer manifest.Close()
var m struct {
Layers []struct {
MediaType string `json:"mediaType"`
Digest string `json:"digest"`
} `json:"layers"`
}
if err := json.NewDecoder(manifest).Decode(&m); err != nil {
tb.Fatal(err)
}
for _, layer := range m.Layers {
if layer.MediaType == "application/vnd.ollama.image.model" {
tb.Log("using model blob", layer.Digest)
return filepath.Join(models, "blobs", strings.ReplaceAll(layer.Digest, ":", "-"))
}
}
return ""
}
func BenchmarkRunner(b *testing.B) {
libraryPath, ok := os.LookupEnv("OLLAMA_LIBRARY_PATH")
if !ok {
libraryPath = filepath.Join("..", "..", "build", "lib", "ollama")
}
b.Setenv("OLLAMA_LIBRARY_PATH", libraryPath)
if runtime.GOOS == "windows" {
b.Setenv("PATH", strings.Join(append(filepath.SplitList(os.Getenv("PATH")), libraryPath), string(filepath.ListSeparator)))
}
var s Server
s.modelPath = blob(b, args.model)
s.batchSize = 512
s.ready.Add(1)
model, err := model.New(s.modelPath, ml.BackendParams{})
if err != nil {
b.Fatal(err)
}
layers := args.layers
if layers < 0 || layers > int(model.Backend().Config().Uint("block_count")+1) {
layers = int(model.Backend().Config().Uint("block_count") + 1)
}
gpus := discover.GetGPUInfo()
if err := s.allocModel(s.modelPath, ml.BackendParams{
AllocMemory: true,
NumThreads: 1,
GPULayers: ml.GPULayersList{
ml.GPULayers{
ID: gpus[0].ID,
Layers: slices.Collect(func(yield func(int) bool) {
for i := range layers {
if !yield(i) {
return
}
}
}),
},
},
FlashAttention: envconfig.FlashAttention(),
}, nil, 1, "f16", int(envconfig.ContextLength()), false); err != nil {
b.Fatal(err)
}
s.loadModel()
seq, err := s.NewSequence(args.prompt, nil, NewSequenceParams{})
if err != nil {
b.Fatal(err)
}
seq.cache, seq.inputs, err = s.cache.LoadCacheSlot(seq.inputs)
if err != nil {
b.Fatal(err)
}
s.seqs = []*Sequence{seq}
go func() {
for s := range seq.responses {
slog.Debug("response", "text", s)
}
}()
// process prompt
if err := s.processBatch(); err != nil {
b.Fatal(err)
}
for b.Loop() {
if err := s.processBatch(); err != nil {
b.Fatal(err)
}
}
b.ReportMetric(float64(seq.numPromptInputs)/float64(seq.startGenerationTime.Sub(seq.startProcessingTime).Seconds()), "prefilltokens/s")
b.ReportMetric(float64(seq.numPredicted)/float64(time.Since(seq.startGenerationTime).Seconds()), "tokens/s")
// suppress ns/op
b.ReportMetric(0, "ns/op")
}