From a53c085de9f3e27dadf1f3f3025708d5c7542f92 Mon Sep 17 00:00:00 2001 From: Jonas Knobloch Date: Wed, 25 Mar 2026 21:23:41 +0100 Subject: Refactor evaluator initialization --- llm/cmd/eval/logprobs.go | 8 ++------ llm/cmd/eval/ppl.go | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'llm/cmd/eval') diff --git a/llm/cmd/eval/logprobs.go b/llm/cmd/eval/logprobs.go index eaa7459..7c04626 100644 --- a/llm/cmd/eval/logprobs.go +++ b/llm/cmd/eval/logprobs.go @@ -24,15 +24,11 @@ type logProbs []logProb func logprobs() { d := data() + m := model() t := tokenizer() - e := llm.NewEvaluator[logProbs]() - - e.SetTokenizer(t) - e.AddModel(m) - - e.SetCallback(func(j llm.Job, logits [][]float32, tokens []int) logProbs { + e := llm.NewEvaluator(m, t, func(j llm.Job, logits [][]float32, tokens []int) logProbs { probs := selectLogProbs(logits, tokens) r := make(logProbs, len(tokens)) diff --git a/llm/cmd/eval/ppl.go b/llm/cmd/eval/ppl.go index fdbcff3..0a028d2 100644 --- a/llm/cmd/eval/ppl.go +++ b/llm/cmd/eval/ppl.go @@ -18,15 +18,11 @@ type pplResult struct { func perplexity() { d := data() + m := model() t := tokenizer() - e := llm.NewEvaluator[pplResult]() - - e.SetTokenizer(t) - e.AddModel(m) - - e.SetCallback(func(job llm.Job, logits [][]float32, tokens []int) pplResult { + e := llm.NewEvaluator(m, t, func(job llm.Job, logits [][]float32, tokens []int) pplResult { p, n := llm.NegLogLikelihood(logits, tokens) return pplResult{ -- cgit v1.3.1