Merge pull request #311 from janhq/310-bug-cannot-unload-model-on-nitro-022

310 bug cannot unload model on nitro 022

Author: tikikun

CMakeLists.txt

@@ -57,7 +57,7 @@ add_executable(${PROJECT_NAME} main.cc)
 #
 # and comment out the following lines
 find_package(Drogon CONFIG REQUIRED)
-target_link_libraries(${PROJECT_NAME} PRIVATE Drogon::Drogon common llama llava
+target_link_libraries(${PROJECT_NAME} PRIVATE Drogon::Drogon common llava
                                               ${CMAKE_THREAD_LIBS_INIT})
 
 # ##############################################################################

controllers/llamaCPP.h

@@ -12,11 +12,10 @@
 #include <fstream>
 
 // External
+#include "clip.h"
 #include "common.h"
 #include "llama.h"
 
-#include "../../llama.cpp/examples/llava/clip.h"
-
 #include "stb_image.h"
 
 #ifndef NDEBUG
@@ -1538,8 +1537,9 @@ struct llama_server_context {
                 "cache\n");
         kv_cache_clear();
       }
-      std::unique_lock<std::mutex> lock(mutex_tasks);
-      condition_tasks.wait(lock, [&] { return !queue_tasks.empty(); });
+      // TODO: Need to implement queueing using CV for better performance
+      // std::unique_lock<std::mutex> lock(mutex_tasks);
+      // condition_tasks.wait(lock, [&] { return !queue_tasks.empty(); });
     }
 
     for (llama_client_slot &slot : slots) {