Merge branch 's/feat/spawn-llama-cpp' of https://github.com/menloresearch/cortex.cpp into s/feat/spawn-llama-cpp

Author: sangjanai

.github/patches/windows/msvcp140.dll

@@ -223,3 +223,12 @@ set_target_properties(${TARGET_NAME} PROPERTIES
                       RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}
                       RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
 )
+
+if(MSVC)
+  add_custom_command(
+    TARGET ${TARGET_NAME} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    ${CMAKE_CURRENT_SOURCE_DIR}/../.github/patches/windows
+    ${CMAKE_BINARY_DIR}/
+  )
+endif()

.github/patches/windows/vcruntime140.dll

@@ -171,7 +171,6 @@ int main(int argc, char* argv[]) {
       };
 
       auto res = get_latest_version();
-
       if (res.has_error()) {
         CTL_ERR("Failed to get latest llama.cpp version: " << res.error());
         return;

.github/patches/windows/vcruntime140_1.dll

@@ -548,7 +548,11 @@ void LocalEngine::LoadModel(std::shared_ptr<Json::Value> json_body,
   auto log_path =
       (file_manager_utils::GetCortexLogPath() / "logs" / "cortex.log").string();
   CTL_DBG("log: " << log_path);
-  auto result = cortex::process::SpawnProcess(v, log_path, log_path);
+  CTL_INF("exe path: "
+          << file_manager_utils::GetExecutableFolderContainerPath().string());
+  auto result = cortex::process::SpawnProcess(
+      v, log_path, log_path,
+      file_manager_utils::GetExecutableFolderContainerPath().string());
   if (result.has_error()) {
     CTL_ERR("Fail to spawn process. " << result.error());
     Json::Value error;

engine/CMakeLists.txt

@@ -26,7 +26,7 @@ cpp::result<void, std::string> DylibPathManager::RegisterPath(
       }
       return cpp::fail("Failed to add DLL directory: " + path.string());
     } else {
-      CTL_DBG("Added DLL directory: " << path.string());
+      CTL_INF("Added DLL directory: " << path.string());
     }
 
     dylib_paths.push_back({path, cookie});

engine/cli/main.cc

@@ -42,7 +42,7 @@ std::vector<char*> ConvertToArgv(const std::vector<std::string>& args) {
 
 cpp::result<ProcessInfo, std::string> SpawnProcess(
     const std::vector<std::string>& command, const std::string& stdout_file,
-    const std::string& stderr_file) {
+    const std::string& stderr_file, const std::string& current_directory) {
   std::stringstream ss;
   for (const auto& item : command) {
     ss << item << " ";
@@ -109,17 +109,21 @@ cpp::result<ProcessInfo, std::string> SpawnProcess(
 
     // create a suspended process. we will resume it later after adding it to
     // a job (see below)
-    if (!CreateProcessA(NULL,              // lpApplicationName
-                        command_buffer,    // lpCommandLine
-                        NULL,              // lpProcessAttributes
-                        NULL,              // lpThreadAttributes
-                        TRUE,              // bInheritHandles
-                        CREATE_SUSPENDED,  // dwCreationFlags
-                        NULL,              // lpEnvironment
-                        NULL,              // lpCurrentDirectory
-                        &si,               // lpStartupInfo
-                        &pi                // lpProcessInformation
-                        )) {
+    if (!CreateProcessA(
+            NULL,              // lpApplicationName
+            command_buffer,    // lpCommandLine
+            NULL,              // lpProcessAttributes
+            NULL,              // lpThreadAttributes
+            TRUE,              // bInheritHandles
+            CREATE_SUSPENDED,  // dwCreationFlags
+            NULL,              // lpEnvironment
+            current_directory.empty()
+                ? NULL
+                : const_cast<char*>(
+                      current_directory.c_str()),  // lpCurrentDirectory
+            &si,                                   // lpStartupInfo
+            &pi                                    // lpProcessInformation
+            )) {
       if (hStdOut != NULL)
         CloseHandle(hStdOut);
       if (hStdErr != NULL)

engine/extensions/local-engine/local_engine.cc

@@ -36,7 +36,8 @@ std::vector<char*> ConvertToArgv(const std::vector<std::string>& args);
 
 cpp::result<ProcessInfo, std::string> SpawnProcess(
     const std::vector<std::string>& command,
-    const std::string& stdout_file = "", const std::string& stderr_file = "");
+    const std::string& stdout_file = "", const std::string& stderr_file = "",
+    const std::string& current_directory = "");
 bool IsProcessAlive(ProcessInfo& proc_info);
 bool WaitProcess(ProcessInfo& proc_info);
 bool KillProcess(ProcessInfo& proc_info);