Expose Llava as a shared library for downstream projects

.gitignore

@@ -44,7 +44,7 @@ models-mnt
 /infill
 /libllama.so
 /llama-bench
-/llava
+/llava-cli
 /main
 /metal
 /perplexity

CMakeLists.txt

@@ -698,6 +698,7 @@ target_include_directories(llama PUBLIC .)
 target_compile_features(llama PUBLIC cxx_std_11) # don't bump
 target_link_libraries(llama PRIVATE
     ggml
+    llava
     ${LLAMA_EXTRA_LIBS}
     )
 
@@ -707,6 +708,22 @@ if (BUILD_SHARED_LIBS)
     if (LLAMA_METAL)
         set_target_properties(llama PROPERTIES RESOURCE "${CMAKE_CURRENT_SOURCE_DIR}/ggml-metal.metal")
     endif()
+
+    # By default, symbols provided by the sublibs that are not used by mainlib (which is all of them in this case)
+    # are not used. This changes that.
+    if (WIN32) 
+        set_target_properties(llama PROPERTIES
+        LINK_FLAGS "/WHOLEARCHIVE"
+    )
+    elseif (APPLE)
+        set_target_properties(llama PROPERTIES
+        LINK_FLAGS "-Wl,-all_load"
+    )
+    else ()
+        set_target_properties(llama PROPERTIES
+        LINK_FLAGS "-Wl,--whole-archive"
+    )
+    endif ()
 endif()
 
 
@@ -793,6 +810,7 @@ endif()
 #
 
 add_subdirectory(common)
+add_subdirectory(llava)
 
 if (LLAMA_BUILD_TESTS AND NOT CMAKE_JS_VERSION)
     include(CTest)

common/CMakeLists.txt

@@ -3,6 +3,7 @@
 set(TARGET common)
 
 add_library(${TARGET} OBJECT
+    base64.hpp
     common.h
     common.cpp
     sampling.h