mirror of
https://github.com/ggerganov/llama.cpp.git
synced 2024-12-27 11:54:35 +00:00
3071c0a5f2
* init * rename * add run android for termux in readme * add android readme * add instructions in readme * change name in readme * Update README.md * fixed line * add result in readme * random pos_embed * add positions index * change for ollama * change for ollama * better pos_embed in clip * support ollama * updata cmakelist * updata cmakelist * rename wrapper * clear code * replace and organize code * add link * sync master * fix warnings * fix warnings * fix bug in bicubic resize when need resize iamge smaller * receive review comments and modify * receive review comments and modify * put all code into llava dir * fix quality problem in pr code * change n_layer * add space in "-1" * imitate reshape bug of python code * fix bug in clip * fix issues for merging * fix llama-minicpmv-cli in cmake file * change pr readme * fix code review * remove in line 33 directory in the /cmakelists.txt (not in example, in the main dir * fix cmakefile * add warn * fix KEY_HAS_MINICPMV_PROJ * remove load_image_size into clip_ctx * remove the extern "C", MINICPMV_API * fix uhd code for review comment * delete minicpmv-wrapper in pr * remove uhd_image_embed * Modify 2 notes * clip : style changes * del common.h in clip * fix Type-Check error * fix Type-Check error * fix Type-Check error * fix Type-Check error * fix makefile error * fix ubuntu-make error * try fix clip * try fix 1 --------- Co-authored-by: Hongji Zhu <fireyoucan@gmail.com> Co-authored-by: harvestingmoon <leewenyeong@gmail.com> Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
46 lines
1.6 KiB
CMake
46 lines
1.6 KiB
CMake
add_library(llava OBJECT
|
|
llava.cpp
|
|
llava.h
|
|
clip.cpp
|
|
clip.h
|
|
)
|
|
|
|
target_link_libraries(llava PRIVATE ggml llama ${CMAKE_THREAD_LIBS_INIT})
|
|
|
|
target_include_directories(llava PUBLIC .)
|
|
target_include_directories(llava PUBLIC ../..)
|
|
target_include_directories(llava PUBLIC ../../common)
|
|
|
|
target_compile_features(llava PRIVATE cxx_std_11)
|
|
|
|
add_library(llava_static STATIC $<TARGET_OBJECTS:llava>)
|
|
if (BUILD_SHARED_LIBS)
|
|
set_target_properties(llava PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
|
target_compile_definitions(llava PRIVATE LLAMA_SHARED LLAMA_BUILD)
|
|
add_library(llava_shared SHARED $<TARGET_OBJECTS:llava>)
|
|
target_link_libraries(llava_shared PRIVATE ggml llama ${CMAKE_THREAD_LIBS_INIT})
|
|
install(TARGETS llava_shared LIBRARY)
|
|
endif()
|
|
|
|
if (NOT MSVC)
|
|
target_compile_options(llava PRIVATE -Wno-cast-qual) # stb_image.h
|
|
endif()
|
|
|
|
if(TARGET BUILD_INFO)
|
|
add_dependencies(llava BUILD_INFO)
|
|
endif()
|
|
|
|
set(TARGET llama-llava-cli)
|
|
add_executable(${TARGET} llava-cli.cpp)
|
|
set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME llama-llava-cli)
|
|
install(TARGETS ${TARGET} RUNTIME)
|
|
target_link_libraries(${TARGET} PRIVATE common llava ${CMAKE_THREAD_LIBS_INIT})
|
|
target_compile_features(${TARGET} PRIVATE cxx_std_11)
|
|
|
|
set(TARGET llama-minicpmv-cli)
|
|
add_executable(${TARGET} minicpmv-cli.cpp)
|
|
set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME llama-minicpmv-cli)
|
|
install(TARGETS ${TARGET} RUNTIME)
|
|
target_link_libraries(${TARGET} PRIVATE common llava ${CMAKE_THREAD_LIBS_INIT})
|
|
target_compile_features(${TARGET} PRIVATE cxx_std_11)
|