From 0edeb5cfd017d05ff28604451afdfe8bd65e9281 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Tue, 7 May 2024 07:32:25 +0800 Subject: [PATCH] runtime: Float, Time --- _demo/llama2-c/run.go | 4 ++-- c/c.go | 4 ++++ x/llama2/llama2.go | 7 ++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/_demo/llama2-c/run.go b/_demo/llama2-c/run.go index 3ad02c8f..b7101a55 100644 --- a/_demo/llama2-c/run.go +++ b/_demo/llama2-c/run.go @@ -25,9 +25,9 @@ func main() { var prompt *c.Char = c.Str("Once upon a time") var checkpointPath *c.Char = c.Str("stories15M.bin") var tokenizerPath *c.Char = c.Str("tokenizer.bin") - var temperature, topp llama2.Float = 1.0, 0.9 + var temperature, topp c.Float = 1.0, 0.9 var steps c.Int = 256 - var rngSeed uint64 = uint64(llama2.Time(nil)) + var rngSeed uint64 = uint64(c.Time(nil)) // build the Transformer via the model .bin file var transformer llama2.Transformer diff --git a/c/c.go b/c/c.go index c672b0eb..6e4b6831 100644 --- a/c/c.go +++ b/c/c.go @@ -28,6 +28,7 @@ type ( Char = int8 Int = C.int Uint = C.uint + Float = float32 Pointer = unsafe.Pointer FilePtr = unsafe.Pointer ) @@ -76,3 +77,6 @@ func Fprintf(fp FilePtr, format *Char, __llgo_va_list ...any) Int //go:linkname Qsort C.qsort func Qsort(base Pointer, count, elem uintptr, compar func(a, b Pointer) Int) + +//go:linkname Time C.time +func Time(*int32) int32 diff --git a/x/llama2/llama2.go b/x/llama2/llama2.go index 60af7dd4..b7a3a3dd 100644 --- a/x/llama2/llama2.go +++ b/x/llama2/llama2.go @@ -27,15 +27,12 @@ const ( ) type ( - Char = int8 + Char = c.Char Int = c.Int Uint = c.Uint - Float = float32 + Float = c.Float ) -//go:linkname Time C.time -func Time(*int32) int32 - // ----------------------------------------------------------------------------- /*