aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgi Gerganov <ggerganov@gmail.com>2023-07-01 18:46:00 +0300
committerGeorgi Gerganov <ggerganov@gmail.com>2023-07-01 18:46:00 +0300
commit79f634a19d1c32a6cfb1befc21551ee684fced6b (patch)
treebe75c79f53ea2c357f39aeda132c9272baf669bd
parent04606a159947566b27810508433e6ca5dbc684ba (diff)
embd-input : fix returning ptr to temporary
-rw-r--r--examples/embd-input/embd-input-lib.cpp9
-rw-r--r--examples/embd-input/embd-input.h4
2 files changed, 7 insertions, 6 deletions
diff --git a/examples/embd-input/embd-input-lib.cpp b/examples/embd-input/embd-input-lib.cpp
index 37de52a..570e273 100644
--- a/examples/embd-input/embd-input-lib.cpp
+++ b/examples/embd-input/embd-input-lib.cpp
@@ -210,9 +210,12 @@ llama_token sampling_id(struct MyModel* mymodel) {
const char * sampling(struct MyModel * mymodel) {
llama_context * ctx = mymodel->ctx;
int id = sampling_id(mymodel);
- std::string ret;
- if (id == llama_token_eos()) ret = "</s>";
- else ret = llama_token_to_str(ctx, id);
+ static std::string ret;
+ if (id == llama_token_eos()) {
+ ret = "</s>";
+ } else {
+ ret = llama_token_to_str(ctx, id);
+ }
eval_id(mymodel, id);
return ret.c_str();
}
diff --git a/examples/embd-input/embd-input.h b/examples/embd-input/embd-input.h
index 4fefabd..efb5ba5 100644
--- a/examples/embd-input/embd-input.h
+++ b/examples/embd-input/embd-input.h
@@ -5,7 +5,6 @@
#include "llama.h"
#include "build-info.h"
-
extern "C" {
typedef struct MyModel {
@@ -14,14 +13,13 @@ typedef struct MyModel {
int n_past = 0;
} MyModel;
-
struct MyModel* create_mymodel(int argc, char ** argv);
bool eval_float(void* model, float* input, int N);
bool eval_tokens(void* model, std::vector<llama_token> tokens);
bool eval_id(struct MyModel* mymodel, int id);
bool eval_string(struct MyModel* mymodel, const char* str);
-const char* sampling(struct MyModel* mymodel);
+const char * sampling(struct MyModel* mymodel);
llama_token sampling_id(struct MyModel* mymodel);
void free_mymodel(struct MyModel* mymodel);