vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from master

Browse source
This commit is contained in:
Te993 2024-12-02 14:38:20 +08:00
commit a2c53052bd
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
common/common-nexa.cpp
View file

@ -152,6 +152,7 @@ bool load_hparams_and_tensors_from_gguf(const std::string &fname, NexaBaseModel
ggml_free(meta); ggml_free(meta);
gguf_free(ctx_gguf); gguf_free(ctx_gguf);
gguf_free(ctx_gguf);
return true; return true;
} }

4
examples/omni-vlm/CMakeLists.txt
View file

@ -39,7 +39,11 @@ target_compile_features(${TARGET} PRIVATE cxx_std_11)
#=== for omni-vlm-wrapper #=== for omni-vlm-wrapper
add_library(omni_vlm_wrapper_shared SHARED omni-vlm-wrapper.cpp $<TARGET_OBJECTS:omni_vlm>) add_library(omni_vlm_wrapper_shared SHARED omni-vlm-wrapper.cpp $<TARGET_OBJECTS:omni_vlm>)
<<<<<<< HEAD
target_link_libraries(omni_vlm_wrapper_shared PRIVATE common ggml llama ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(omni_vlm_wrapper_shared PRIVATE common ggml llama ${CMAKE_THREAD_LIBS_INIT})
=======
target_link_libraries(omni_vlm_wrapper_shared PRIVATE common ggml_llama llama ${CMAKE_THREAD_LIBS_INIT})
>>>>>>> master
# For Nexa SDK library installation # For Nexa SDK library installation
set_target_properties(omni_vlm_wrapper_shared PROPERTIES set_target_properties(omni_vlm_wrapper_shared PROPERTIES
PUBLIC_HEADER "omni-vlm-wrapper.h" PUBLIC_HEADER "omni-vlm-wrapper.h"