From 6c1c4b4688622d8ee026643a07fabf8e0b514c09 Mon Sep 17 00:00:00 2001 From: Achazwl <323163497@qq.com> Date: Wed, 1 May 2024 11:17:45 +0800 Subject: [PATCH] move stl return out of extern C --- examples/minicpmv/minicpmv.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/minicpmv/minicpmv.h b/examples/minicpmv/minicpmv.h index 068b8d44b..27c8362c6 100644 --- a/examples/minicpmv/minicpmv.h +++ b/examples/minicpmv/minicpmv.h @@ -36,9 +36,7 @@ LLAVA_API bool llava_image_embed_make_with_clip_img(struct clip_ctx * ctx_clip, /** build an image embed from image file bytes */ LLAVA_API struct llava_image_embed * llava_image_embed_make_with_bytes(struct clip_ctx * ctx_clip, int n_threads, const unsigned char * image_bytes, int image_bytes_length); /** build an image embed from a path to an image filename */ -LLAVA_API std::vector> llava_image_embed_make_with_bytes_slice(struct clip_ctx * ctx_clip, int n_threads, const unsigned char * image_bytes, int image_bytes_length); LLAVA_API struct llava_image_embed * llava_image_embed_make_with_filename(struct clip_ctx * ctx_clip, int n_threads, const char * image_path); -LLAVA_API std::pair>> llava_image_embed_make_with_filename_slice(struct clip_ctx * ctx_clip, int n_threads, const char * image_path); LLAVA_API void llava_image_embed_free(struct llava_image_embed * embed); /** free an embedding made with llava_image_embed_make_* */ @@ -49,4 +47,7 @@ LLAVA_API bool llava_eval_image_embed(struct llama_context * ctx_llama, const st } #endif +LLAVA_API std::vector> llava_image_embed_make_with_bytes_slice(struct clip_ctx * ctx_clip, int n_threads, const unsigned char * image_bytes, int image_bytes_length); +LLAVA_API std::pair>> llava_image_embed_make_with_filename_slice(struct clip_ctx * ctx_clip, int n_threads, const char * image_path); + #endif