Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.
more logutil.Trace (#12177)
Michael Yangb3e6120736e4
diff --git a/runner/ollamarunner/runner.go b/runner/ollamarunner/runner.goindex b8605db8c..9b54a3720 100644--- a/runner/ollamarunner/runner.go+++ b/runner/ollamarunner/runner.go@@ -429,12 +429,12 @@ func (s *Server) forwardBatch(pendingBatch batchState) (nextBatch batchState, er// before setting up the next batch so the seqs inputs are ready to receive their// token values and we get the correct input pointers for the batchInputsif pendingBatch.ctx != nil {- slog.Log(context.TODO(), logutil.LevelTrace, "forwardBatch waiting for compute to start", "pendingBatch.id", pendingBatch.id)+ logutil.Trace("forwardBatch waiting for compute to start", "pendingBatch.id", pendingBatch.id)<-pendingBatch.computeStartedCh- slog.Log(context.TODO(), logutil.LevelTrace, "forwardBatch compute started, setting up next batch", "pendingBatch.id", pendingBatch.id, "id", s.batchID)+ logutil.Trace("forwardBatch compute started, setting up next batch", "pendingBatch.id", pendingBatch.id, "id", s.batchID)nextBatch.inputsReadyCh = pendingBatch.outputsReadyCh // Chain the ouputs from the pending batch to the next inputs batch} else {- slog.Log(context.TODO(), logutil.LevelTrace, "forwardBatch no pending batch detected", "batchID", s.batchID)+ logutil.Trace("forwardBatch no pending batch detected", "batchID", s.batchID)// No pendingBatch, so the inputs will be ready in the seqs immediatelynextBatch.inputsReadyCh = make(chan struct{}, 1)nextBatch.inputsReadyCh <- struct{}{}@@ -546,7 +546,7 @@ func (s *Server) forwardBatch(pendingBatch batchState) (nextBatch batchState, erif i+1 == len(seq.inputs) {batch.Outputs = append(batch.Outputs, int32(len(batchInputs)-1))}- slog.Log(context.TODO(), logutil.LevelTrace, "forwardBatch iBatch", "batchID", s.batchID, "seqIdx", seqIdx, "seq.iBatch", seq.iBatch, "i+1", i+1, "len(seq.inputs)", len(seq.inputs))+ logutil.Trace("forwardBatch iBatch", "batchID", s.batchID, "seqIdx", seqIdx, "seq.iBatch", seq.iBatch, "i+1", i+1, "len(seq.inputs)", len(seq.inputs))seq.pendingInputs = append(seq.pendingInputs, inp)}@@ -560,7 +560,7 @@ func (s *Server) forwardBatch(pendingBatch batchState) (nextBatch batchState, er}if len(batchInputs) == 0 {- slog.Log(context.TODO(), logutil.LevelTrace, "forwardBatch no batchInputs, going idle", "batchID", s.batchID)+ logutil.Trace("forwardBatch no batchInputs, going idle", "batchID", s.batchID)nextBatch.ctx.Close()nextBatch.ctx = nilreturn@@ -589,14 +589,14 @@ func (s *Server) computeBatch(activeBatch batchState) {defer activeBatch.ctx.Close()// Wait until inputs are ready- slog.Log(context.TODO(), logutil.LevelTrace, "computeBatch: waiting for inputs to be ready", "batchID", activeBatch.id)+ logutil.Trace("computeBatch: waiting for inputs to be ready", "batchID", activeBatch.id)<-activeBatch.inputsReadyCh- slog.Log(context.TODO(), logutil.LevelTrace, "computeBatch: inputs are ready", "batchID", activeBatch.id)+ logutil.Trace("computeBatch: inputs are ready", "batchID", activeBatch.id)// Once we complete, signal the next batch of inputs are ready// This will unblock the next computeBatch, or forwardBatch if new seqs come indefer func() {- slog.Log(context.TODO(), logutil.LevelTrace, "computeBatch: outputs are ready", "batchID", activeBatch.id)+ logutil.Trace("computeBatch: outputs are ready", "batchID", activeBatch.id)activeBatch.outputsReadyCh <- struct{}{}}()@@ -626,7 +626,7 @@ func (s *Server) computeBatch(activeBatch batchState) {// Detect if the sequence we're processing has already been completed and replaced// with a new sequenceif seq != activeBatch.seqs[i] {- slog.Log(context.TODO(), logutil.LevelTrace, "computeBatch: sequence replaced, discarding its results", "batchID", activeBatch.id, "seqIdx", i)+ logutil.Trace("computeBatch: sequence replaced, discarding its results", "batchID", activeBatch.id, "seqIdx", i)continue}@@ -666,18 +666,18 @@ func (s *Server) computeBatch(activeBatch batchState) {activeBatch.batch.Inputs.SetValueFromIntSlice(batchInputs)activeBatch.ctx.ComputeWithNotify(func() {- slog.Log(context.TODO(), logutil.LevelTrace, "computeBatch: signaling computeStartedCh", "batchID", activeBatch.id)+ logutil.Trace("computeBatch: signaling computeStartedCh", "batchID", activeBatch.id)activeBatch.computeStartedCh <- struct{}{}},activeBatch.modelOutput)logits := activeBatch.modelOutput.Floats()- slog.Log(context.TODO(), logutil.LevelTrace, "computeBatch: logits ready", "batchID", activeBatch.id)+ logutil.Trace("computeBatch: logits ready", "batchID", activeBatch.id)s.mu.Lock()defer s.mu.Unlock()- slog.Log(context.TODO(), logutil.LevelTrace, "computeBatch: decoding", "batchID", activeBatch.id)+ logutil.Trace("computeBatch: decoding", "batchID", activeBatch.id)for i, seq := range s.seqs {if seq == nil || nextBatchTokens[i] == nil {continue@@ -697,7 +697,7 @@ func (s *Server) computeBatch(activeBatch batchState) {// sample a tokenvocabSize := len(logits) / len(activeBatch.batch.Outputs)- slog.Log(context.TODO(), logutil.LevelTrace, "computeBatch: vocab details", "batchID", activeBatch.id, "seqIdx", i, "len(logits)", len(logits), "len(activeBatch.batch.Outputs)", len(activeBatch.batch.Outputs), "vocabSize", vocabSize, "iBatches", iBatches)+ logutil.Trace("computeBatch: vocab details", "batchID", activeBatch.id, "seqIdx", i, "len(logits)", len(logits), "len(activeBatch.batch.Outputs)", len(activeBatch.batch.Outputs), "vocabSize", vocabSize, "iBatches", iBatches)token, err := seq.sampler.Sample(logits[iBatches[i]*vocabSize : (iBatches[i]+1)*vocabSize])if err != nil {s.hardErrCh <- fmt.Errorf("failed to sample token: %w", err)@@ -711,7 +711,7 @@ func (s *Server) computeBatch(activeBatch batchState) {// TODO (jmorganca): we should send this back// as it's important for the /api/generate context// seq.responses <- piece- slog.Log(context.TODO(), logutil.LevelTrace, "computeBatch: EOS", "batchID", activeBatch.id, "seqIdx", i)+ logutil.Trace("computeBatch: EOS", "batchID", activeBatch.id, "seqIdx", i)s.removeSequence(i, llm.DoneReasonStop)continue}