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

ml/backend/ggml: fix debug logging

Browse Source
This commit is contained in:
Michael Yang 2025-02-26 17:00:25 -08:00
parent 688925aca9
commit a59f665235
3 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
llama/llama.go
View File

@ -37,23 +37,36 @@ COMPILER inline get_compiler() {
import "C" import "C"
import ( import (
"context"
_ "embed" _ "embed"
"errors" "errors"
"fmt" "fmt"
"log/slog"
"os" "os"
"runtime" "runtime"
"runtime/cgo" "runtime/cgo"
"slices" "slices"
"strings" "strings"
"sync/atomic"
"unsafe" "unsafe"
_ "github.com/ollama/ollama/llama/llama.cpp/common" _ "github.com/ollama/ollama/llama/llama.cpp/common"
_ "github.com/ollama/ollama/llama/llama.cpp/examples/llava" _ "github.com/ollama/ollama/llama/llama.cpp/examples/llava"
_ "github.com/ollama/ollama/llama/llama.cpp/src" _ "github.com/ollama/ollama/llama/llama.cpp/src"
"github.com/ollama/ollama/ml/backend/ggml/ggml/src" ggml "github.com/ollama/ollama/ml/backend/ggml/ggml/src"
) )
func init() {
C.llama_log_set(C.ggml_log_callback(C.llamaLog), nil)
}
//export llamaLog
func llamaLog(level C.int, text *C.char, _ unsafe.Pointer) {
// slog levels zeros INFO and are multiples of 4
if slog.Default().Enabled(context.TODO(), slog.Level(int(level-C.GGML_LOG_LEVEL_INFO)*4)) {
fmt.Fprint(os.Stderr, C.GoString(text))
}
}
func BackendInit() { func BackendInit() {
ggml.OnceLoad() ggml.OnceLoad()
C.llama_backend_init() C.llama_backend_init()
@ -72,26 +85,6 @@ func PrintSystemInfo() string {
return C.GoString(C.llama_print_system_info()) + compiler return C.GoString(C.llama_print_system_info()) + compiler
} }
var logLevel atomic.Int32
func init() {
logLevel.Store(int32(C.GGML_LOG_LEVEL_INFO))
C.llama_log_set((C.ggml_log_callback)(C.llamaLog), nil)
}
func EnableDebug() {
logLevel.Store(int32(C.GGML_LOG_LEVEL_DEBUG))
}
//export llamaLog
func llamaLog(level int32, text *C.char, _ unsafe.Pointer) {
if level < logLevel.Load() {
return
}
fmt.Fprint(os.Stderr, C.GoString(text))
}
func GetModelArch(modelPath string) (string, error) { func GetModelArch(modelPath string) (string, error) {
mp := C.CString(modelPath) mp := C.CString(modelPath)
defer C.free(unsafe.Pointer(mp)) defer C.free(unsafe.Pointer(mp))

17
ml/backend/ggml/ggml/src/ggml.go
View File

@ -10,6 +10,8 @@ package ggml
import "C" import "C"
import ( import (
"context"
"fmt"
"log/slog" "log/slog"
"os" "os"
"path/filepath" "path/filepath"
@ -22,21 +24,14 @@ import (
) )
func init() { func init() {
C.ggml_log_set((C.ggml_log_callback)(C.sink), nil) C.ggml_log_set(C.ggml_log_callback(C.sink), nil)
} }
//export sink //export sink
func sink(level C.int, text *C.char, _ unsafe.Pointer) { func sink(level C.int, text *C.char, _ unsafe.Pointer) {
msg := strings.TrimSpace(C.GoString(text)) // slog levels zeros INFO and are multiples of 4
switch level { if slog.Default().Enabled(context.TODO(), slog.Level(int(level-C.GGML_LOG_LEVEL_INFO)*4)) {
case C.GGML_LOG_LEVEL_DEBUG: fmt.Fprint(os.Stderr, C.GoString(text))
slog.Debug(msg)
case C.GGML_LOG_LEVEL_INFO:
slog.Info(msg)
case C.GGML_LOG_LEVEL_WARN:
slog.Warn(msg)
case C.GGML_LOG_LEVEL_ERROR:
slog.Error(msg)
} }
} }

1
runner/llamarunner/runner.go
View File

@ -915,7 +915,6 @@ func Execute(args []string) error {
level := slog.LevelInfo level := slog.LevelInfo
if *verbose { if *verbose {
level = slog.LevelDebug level = slog.LevelDebug
llama.EnableDebug()
} }
handler := slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{ handler := slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{
Level: level, Level: level,