fix: windows

vansangpfiev · vansangpfiev · commit 60169d5c18fc · 2025-04-02T09:37:19.000+07:00
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
@@ -44,21 +44,22 @@ if(NOT CORTEX_CQA)
         add_link_options($<$<CONFIG:Release>:-flto>)
     elseif(MSVC)
         # Add optimization flags for MSVC
-        add_compile_options($<$<CONFIG:Release>:/O2>)
+        # add_compile_options($<$<CONFIG:Release>:/O2>)
         # Optional: Link-time optimization
-        add_compile_options($<$<CONFIG:Release>:/GL>)
-        add_link_options($<$<CONFIG:Release>:/LTCG>)
+        # add_compile_options($<$<CONFIG:Release>:/GL>)
+        # add_link_options($<$<CONFIG:Release>:/LTCG>)
     endif()
 endif()
 
 if(MSVC)
-  add_compile_options(
-      $<$<CONFIG:>:/MT> #---------|
-      $<$<CONFIG:Debug>:/MTd> #---|-- Statically link the runtime libraries
-      $<$<CONFIG:Release>:/MT> #--|
-      $<$<CONFIG:Release>:/O2> #--|-- Optimize for speed in Release mode
-      $<$<CONFIG:Release>:/Ob2> #-|-- Inline any suitable function
-  )
+# set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+  # add_compile_options(
+  #     $<$<CONFIG:>:/MT> #---------|
+  #     $<$<CONFIG:Debug>:/MTd> #---|-- Statically link the runtime libraries
+  #     $<$<CONFIG:Release>:/MT> #--|
+  #     $<$<CONFIG:Release>:/O2> #--|-- Optimize for speed in Release mode
+  #     $<$<CONFIG:Release>:/Ob2> #-|-- Inline any suitable function
+  # )
 
   add_compile_options(/utf-8)
   add_definitions(-DUNICODE -D_UNICODE)
@@ -95,10 +96,10 @@ add_compile_definitions(CORTEX_CONFIG_FILE_PATH="${CORTEX_CONFIG_FILE_PATH}")
 option(CMAKE_BUILD_TEST "Enable testing" ON)
 option(CMAKE_BUILD_INJA_TEST "Enable inja example" OFF)
 # if(CMAKE_BUILD_TEST)
-  add_subdirectory(test)
+  # add_subdirectory(test)
 # endif()
 
-add_subdirectory(cli)
+# add_subdirectory(cli)
 
 if(CMAKE_BUILD_INJA_TEST)
   add_subdirectory(examples/inja)
@@ -183,6 +184,7 @@ file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/cortex_openapi.h"
     "}\n"
 )
 ## End of generating openapi json
+MESSAGE("SOURCE_DIR"${CMAKE_CURRENT_SOURCE_DIR})
 add_executable(${TARGET_NAME} main.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/utils/cpuid/cpu_info.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/utils/file_logger.cc
@@ -205,6 +207,7 @@ target_include_directories(${TARGET_NAME} PRIVATE  ${CMAKE_CURRENT_BINARY_DIR}/.
 
 target_link_libraries(${TARGET_NAME} PRIVATE minizip)
 target_link_libraries(${TARGET_NAME} PRIVATE archive)
+target_link_libraries(${TARGET_NAME} PRIVATE trantor)
 target_link_libraries(${TARGET_NAME} PRIVATE drogon)
 target_link_libraries(${TARGET_NAME} PRIVATE SQLiteCpp)
 target_link_libraries(${TARGET_NAME} PRIVATE ${JSONCPP})
diff --git a/engine/cli/main.cc b/engine/cli/main.cc
@@ -90,7 +90,7 @@ int main(int argc, char* argv[]) {
     return 1;
   }
 
-  SSL_library_init();
+  // SSL_library_init();
   curl_global_init(CURL_GLOBAL_DEFAULT);
 
   bool should_install_server = false;
diff --git a/engine/cmake/drogon.cmake b/engine/cmake/drogon.cmake
@@ -35,17 +35,21 @@ set(USE_OSSP_UUID TRUE)
 # set(OPENSSL_CRYPTO_LIBRARY Crypto)
 set(OPENSSL_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl)
 set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include)
-set(OPENSSL_ROOT_DIR ${OPENSSL_INSTALL_DIR}/lib64)
+set(OPENSSL_ROOT_DIR ${OPENSSL_INSTALL_DIR}/lib)
 # set(OPENSSL_INCLUDE_DIR "${openssl_BINARY_DIR}/include" "${openssl_BINARY_DIR}")
 
+set(ZLIB_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/zlib/install)
+set(ZLIB_INCLUDE_DIR ${ZLIB_INSTALL_DIR}/include)
+set(ZLIB_LIBRARY ${ZLIB_INSTALL_DIR}/lib/zlib.lib)
+
 
 set(JSONCPP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/jsoncpp-lib)
-set(JSONCPP_LIBRARIES ${JSONCPP_INSTALL_DIR}/lib/libjsoncpp.so)
+set(JSONCPP_LIBRARIES ${JSONCPP_INSTALL_DIR}/lib/jsoncpp.lib)
 set(JSONCPP_INCLUDE_DIRS ${JSONCPP_INSTALL_DIR}/include)
 message("JSONCPP_INCLUDE_DIRS="${JSONCPP_INCLUDE_DIRS})
 
 set(C-ARES_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/c-ares-lib)
-set(C-ARES_LIBRARIES ${C-ARES_INSTALL_DIR}/lib/libcares.so)
+set(C-ARES_LIBRARIES ${C-ARES_INSTALL_DIR}/lib/cares.lib)
 set(C-ARES_INCLUDE_DIRS ${C-ARES_INSTALL_DIR}/include)
 # message("C-ARES_INCLUDE_DIRS="${C-ARES_INCLUDE_DIRS})
 # FetchContent_GetProperties(openssl)
diff --git a/engine/cmake/jsoncpp.cmake b/engine/cmake/jsoncpp.cmake
@@ -23,7 +23,7 @@ include(ExternalProject)
 set(jsoncpp_install_prefix ${CMAKE_CURRENT_BINARY_DIR}/jsoncpp-lib)
 ExternalProject_Add(jsoncpp-project
   GIT_REPOSITORY https://github.com/open-source-parsers/jsoncpp.git
-  GIT_TAG 1.9.5
+  GIT_TAG 1.9.6
   SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/jsoncpp-src
   BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/jsoncpp-build
   INSTALL_DIR ${jsoncpp_install_prefix}
diff --git a/engine/cmake/minizip.cmake b/engine/cmake/minizip.cmake
@@ -2,14 +2,14 @@ include(FetchContent)
 
 include(cmake/utils.cmake)
 # set(ENABLE_TEST OFF)
-
+# set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 MESSAGE("Start minizip")
 FetchContent_Declare(minizip
     GIT_REPOSITORY https://github.com/zlib-ng/minizip-ng.git
     GIT_TAG 4.0.8
 )
 
-FetchContent_MakeAvailable(minizip)
+# FetchContent_MakeAvailable(minizip)
 MESSAGE("End minizip")
 
-# FetchContent_MakeAvailableWithArgs(minizip MZ_BUILD_TESTS=OFF)
+FetchContent_MakeAvailableWithArgs(minizip MZ_BUILD_TESTS=OFF BUILD_SHARED_LIBS=OFF)
diff --git a/engine/cmake/openssl.cmake b/engine/cmake/openssl.cmake
@@ -14,6 +14,26 @@
 
 include(ExternalProject)
 
+# Define directories for dependencies
+set(DEPS_DIR ${CMAKE_BINARY_DIR}/)
+MESSAGE("DEPS_DIR="${DEPS_DIR})
+set(ZLIB_INSTALL_DIR ${DEPS_DIR}/zlib/install)
+
+# Add zlib as an external project
+# set(ZLIB_USE_STATIC_LIBS ON)
+ExternalProject_Add(
+        zlib
+	GIT_REPOSITORY https://github.com/madler/zlib.git
+	GIT_TAG v1.2.11
+	CMAKE_ARGS
+	    -DBUILD_SHARED_LIBS=ON
+	    -DCMAKE_INSTALL_PREFIX=${ZLIB_INSTALL_DIR}
+    )
+
+# Set variables for zlib include and library directories
+set(ZLIB_INCLUDE_DIR ${ZLIB_INSTALL_DIR}/include)
+set(ZLIB_LIBRARY_DIR ${ZLIB_INSTALL_DIR}/lib)
+
 set(OPENSSL_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/openssl-src) # default path by CMake
 set(OPENSSL_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/openssl)
 set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include)
@@ -25,13 +45,10 @@ ExternalProject_Add(
   GIT_REPOSITORY https://github.com/openssl/openssl.git
   GIT_TAG openssl-3.4.1
   USES_TERMINAL_DOWNLOAD TRUE
-  CONFIGURE_COMMAND
-    ${OPENSSL_CONFIGURE_COMMAND}
-    --prefix=${OPENSSL_INSTALL_DIR}
-    --openssldir=${OPENSSL_INSTALL_DIR}
-  BUILD_COMMAND make
-  TEST_COMMAND ""
-  INSTALL_COMMAND make install
+  CONFIGURE_COMMAND perl Configure VC-WIN64A no-idea no-mdc2 no-rc5 --prefix=<INSTALL_DIR> --openssldir=<INSTALL_DIR>/ssl
+  BUILD_IN_SOURCE 1
+  BUILD_COMMAND nmake
+  INSTALL_COMMAND nmake install
   INSTALL_DIR ${OPENSSL_INSTALL_DIR}
 )
 
diff --git a/engine/cmake/yaml-cpp.cmake b/engine/cmake/yaml-cpp.cmake
@@ -2,7 +2,7 @@ include(FetchContent)
 
 FetchContent_Declare(yaml-cpp
     GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git
-    GIT_TAG yaml-cpp-0.7.0
+    GIT_TAG 0.8.0
 )
 
 FetchContent_MakeAvailable(yaml-cpp)
diff --git a/engine/cmake/zlib.cmake b/engine/cmake/zlib.cmake
@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 3.25...3.31)
+
+project(zlib_build LANGUAGES C)
+
+include(ExternalProject)
+
+ExternalProject_Add(
+    zlib1
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
+    PREFIX ${CMAKE_CURRENT_BINARY_DIR}
+    #--Download step--------------
+    GIT_REPOSITORY https://github.com/ClausKlein/zlib.git
+    GIT_TAG release/v1.2.5
+    #--Update/Patch step----------
+    #--Configure step-------------
+    USES_TERMINAL_CONFIGURE TRUE
+    CONFIGURE_COMMAND cmake -G "${CMAKE_GENERATOR}" -S ../zlib1 -B . -D CMAKE_BUILD_TYPE=$<CONFIG>
+    #--Build step-----------------
+    USES_TERMINAL_BUILD TRUE
+    # BUILD_IN_SOURCE 1
+    BUILD_COMMAND cmake --build . -j 8
+    #--Install step---------------
+    USES_TERMINAL_INSTALL TRUE
+    INSTALL_COMMAND cmake --install <BINARY_DIR> --prefix=${CMAKE_INSTALL_PREFIX}
+    #--Logging -------------------
+    LOG_BUILD ON
+)
diff --git a/engine/config/gguf_parser.h b/engine/config/gguf_parser.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <string>
+#include <unordered_map>
 #include "yaml_config.h"
 
 namespace config {
diff --git a/engine/database/engines.h b/engine/database/engines.h
@@ -2,6 +2,7 @@
 
 #include <SQLiteCpp/Database.h>
 #include <json/json.h>
+#include <json/value.h>
 #include <trantor/utils/Logger.h>
 #include <optional>
 #include <string>
@@ -45,7 +46,7 @@ struct EngineEntry {
       if (success) {
         root["metadata"] = metadataJson;
       } else {
-        root["metadata"] = Json::Value::null;
+        root["metadata"] = Json::Value(Json::nullValue);
       }
     } else {
       root["metadata"] = Json::Value(Json::objectValue);  // empty object
diff --git a/engine/main.cc b/engine/main.cc
@@ -397,7 +397,7 @@ int main(int argc, char* argv[]) {
     return 1;
   }
 
-  SSL_library_init();
+  // SSL_library_init();
   curl_global_init(CURL_GLOBAL_DEFAULT);
 
   // avoid printing logs to terminal
diff --git a/engine/services/inference_service.cc b/engine/services/inference_service.cc
@@ -13,7 +13,7 @@ cpp::result<void, InferResult> InferenceService::HandleChatCompletion(
     engine_type = (*(json_body)).get("engine", kLlamaRepo).asString();
   }
   function_calling_utils::PreprocessRequest(json_body);
-  auto tool_choice = json_body->get("tool_choice", Json::Value::null);
+  auto tool_choice = json_body->get("tool_choice", Json::Value(Json::nullValue));
   auto model_id = json_body->get("model", "").asString();
   if (saved_models_.find(model_id) != saved_models_.end()) {
     // check if model is started, if not start it first
diff --git a/engine/test/components/test_download_task_queue.cc b/engine/test/components/test_download_task_queue.cc
@@ -107,15 +107,15 @@ TEST_F(DownloadTaskQueueTest, ConcurrentPushAndPop) {
   std::atomic<int> poppedTasks{0};
 
   for (int i = 0; i < 4; ++i) {
-    pushThreads.emplace_back([this, i, &pushedTasks]() {
+    pushThreads.emplace_back([this, i, numTasks, &pushedTasks]() {
       for (int j = 0; j < numTasks; ++j) {
         queue.push(CreateDownloadTask("task_" + std::to_string(i) + "_" +
                                       std::to_string(j)));
         pushedTasks++;
       }
     });
 
-    popThreads.emplace_back([this, &poppedTasks, &pushedTasks]() {
+    popThreads.emplace_back([this, numTasks, &poppedTasks, &pushedTasks]() {
       while (poppedTasks.load() < pushedTasks.load() ||
              pushedTasks.load() < numTasks * 4) {
         if (auto task = queue.pop()) {
diff --git a/engine/utils/config_yaml_utils.h b/engine/utils/config_yaml_utils.h
@@ -2,10 +2,10 @@
 
 #include <mutex>
 #include <string>
+#include <vector>
 #include "utils/engine_constants.h"
 #include "utils/logging_utils.h"
-
-#include <vector>
+#include "yaml-cpp/yaml.h"
 
 #include "utils/engine_constants.h"
 
diff --git a/engine/utils/file_logger.h b/engine/utils/file_logger.h
@@ -7,6 +7,8 @@
 #include <cstdint>
 #include <deque>
 #include <mutex>
+#include <string>
+#include <optional>
 
 #ifdef _WIN32
 #include <windows.h>
@@ -16,7 +18,7 @@
 
 namespace trantor {
 
-class TRANTOR_EXPORT FileLogger : public AsyncFileLogger {
+class FileLogger : public AsyncFileLogger {
  public:
   FileLogger();
   ~FileLogger();

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ int main(int argc, char* argv[]) {`
`90`	`90`	`return 1;`
`91`	`91`	`}`
`92`	`92`
`93`		`- SSL_library_init();`
	`93`	`+ // SSL_library_init();`
`94`	`94`	`curl_global_init(CURL_GLOBAL_DEFAULT);`
`95`	`95`
`96`	`96`	`bool should_install_server = false;`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ include(FetchContent)`
`2`	`2`
`3`	`3`	`FetchContent_Declare(yaml-cpp`
`4`	`4`	`GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git`
`5`		`- GIT_TAG yaml-cpp-0.7.0`
	`5`	`+ GIT_TAG 0.8.0`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`FetchContent_MakeAvailable(yaml-cpp)`