bdx0
diff --git a/‎CHANGELOG.md
Lines changed: 15 additions & 0 deletions b/‎CHANGELOG.md
Lines changed: 15 additions & 0 deletions
diff --git a/‎CMakeLists.txt
Lines changed: 26 additions & 23 deletions b/‎CMakeLists.txt
Lines changed: 26 additions & 23 deletions
@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.21]
+
+- Update llama.cpp to ggerganov/llama.cpp@64e64aa2557d97490b2fe1262b313e2f4a1607e3
+- Make building llava optional by setting `CMAKE_ARGS="-DLLAVA_BUILD=OFF"` and using `LLAVA_CPP_LIB` to specify alternative path to shared library by @abetlen in e3941d9c674dbd9891dc3ceda390daeb21f05fd1
+
+## [0.2.20]
+
+- Update llama.cpp to ggerganov/llama.cpp@b38a16dfcff88d547f78f52d1bea31b84a05aff7
+- Add `zephyr` chat format by @fakerybakery in #938
+- Add `baichuan` chat format by @caiyesd in #938
+- Add `baichuan-2` chat format by @caiyesd in #936
+- Improve documentation for server chat formats by @jooray in #934
+- Fix typo in README by @antonvice in 940
+- Fix typo in the Open Orca chat format by @gardner in #947
+
 ## [0.2.19]
 
 - Update llama.cpp to ggerganov/llama.cpp@0b871f1a04ef60e114bbe43004fd9c21114e802d
 
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.21)
 project(llama_cpp)
 
 option(LLAMA_BUILD "Build llama.cpp shared library and install alongside python package" ON)
+option(LLAVA_BUILD "Build llava shared library and install alongside python package" ON)
 
 if (LLAMA_BUILD)
     set(BUILD_SHARED_LIBS "On")
@@ -44,28 +45,30 @@ if (LLAMA_BUILD)
         DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
     )
 
-    # Building llava
-    add_subdirectory(vendor/llama.cpp/examples/llava)
-    set_target_properties(llava_shared PROPERTIES OUTPUT_NAME "llava")
-    # Set CUDA_ARCHITECTURES to OFF on windows
-    if (WIN32)
-        set_target_properties(llava_shared PROPERTIES CUDA_ARCHITECTURES OFF)
+    if (LLAVA_BUILD)
+        # Building llava
+        add_subdirectory(vendor/llama.cpp/examples/llava)
+        set_target_properties(llava_shared PROPERTIES OUTPUT_NAME "llava")
+        # Set CUDA_ARCHITECTURES to OFF on windows
+        if (WIN32)
+            set_target_properties(llava_shared PROPERTIES CUDA_ARCHITECTURES OFF)
+        endif()
+        install(
+            TARGETS llava_shared
+            LIBRARY DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
+            RUNTIME DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
+            ARCHIVE DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
+            FRAMEWORK DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
+            RESOURCE DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
+        )
+        # Temporary fix for https://github.com/scikit-build/scikit-build-core/issues/374
+        install(
+            TARGETS llava_shared
+            LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
+            RUNTIME DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
+            ARCHIVE DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
+            FRAMEWORK DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
+            RESOURCE DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
+        )
     endif()
-    install(
-        TARGETS llava_shared
-        LIBRARY DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
-        RUNTIME DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
-        ARCHIVE DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
-        FRAMEWORK DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
-        RESOURCE DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
-    )
-    # Temporary fix for https://github.com/scikit-build/scikit-build-core/issues/374
-    install(
-        TARGETS llava_shared
-        LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
-        RUNTIME DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
-        ARCHIVE DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
-        FRAMEWORK DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
-        RESOURCE DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
-    )
 endif()