From 56dcc0ef83b544009fdd03f39351ef560ee67a05 Mon Sep 17 00:00:00 2001 From: Cam Ng Date: Sat, 6 Apr 2024 15:18:54 +0700 Subject: [PATCH 1/2] Draft commit --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b39f6297f..cf8d4d919 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -project(nitro CXX) +project(nitro C CXX) include(CheckIncludeFileCXX) @@ -17,7 +17,8 @@ else() endif() # llama cpp server need llava example to work, this is for llama cpp server -set(LLAMA_BUILD_EXAMPLES ON) +# set(LLAMA_BUILD_EXAMPLES ON) +add_subdirectory(llama.cpp/examples/llava) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) From e48bd59813dbfa3816ccfaf2988173b958f270b9 Mon Sep 17 00:00:00 2001 From: Cam Ng Date: Tue, 9 Apr 2024 08:43:17 +0700 Subject: [PATCH 2/2] Update add_subdirectory(llava) position --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf8d4d919..181cf35a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,10 +16,6 @@ else() set(CMAKE_CXX_STANDARD 14) endif() -# llama cpp server need llava example to work, this is for llama cpp server -# set(LLAMA_BUILD_EXAMPLES ON) -add_subdirectory(llama.cpp/examples/llava) - set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(OPENSSL_USE_STATIC_LIBS TRUE) @@ -48,6 +44,7 @@ endif() add_compile_definitions(NITRO_VERSION="${NITRO_VERSION}") +add_subdirectory(llama.cpp/examples/llava) add_subdirectory(llama.cpp) add_subdirectory(whisper.cpp)