fix: Windows build

Author: giladgd

llama/CMakeLists.txt

@@ -48,61 +48,57 @@ else()
     set(CMAKE_BUILD_RPATH_USE_ORIGIN ON)
 endif()
 
-if (NOT DEFINED NLC_SINGLE_LLAMA_CPP_TARGET)
-    execute_process(COMMAND node -p "require('node-addon-api').include.slice(1,-1)"
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        OUTPUT_VARIABLE NODE_ADDON_API_DIR
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-    include_directories(${NODE_ADDON_API_DIR} ${CMAKE_JS_INC})
-endif()
+execute_process(COMMAND node -p "require('node-addon-api').include.slice(1,-1)"
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    OUTPUT_VARIABLE NODE_ADDON_API_DIR
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+include_directories(${NODE_ADDON_API_DIR} ${CMAKE_JS_INC})
 
 add_subdirectory("llama.cpp")
 include_directories("llama.cpp")
 include_directories("./llama.cpp/common")
 
-if (NOT DEFINED NLC_SINGLE_LLAMA_CPP_TARGET)
-    unset(GPU_INFO_HEADERS)
-    unset(GPU_INFO_SOURCES)
-    unset(GPU_INFO_EXTRA_LIBS)
-
-    if (GGML_VULKAN OR GGML_KOMPUTE)
-        find_package(Vulkan)
-        if (Vulkan_FOUND)
-            if (GGML_VULKAN)
-                message(STATUS "Using Vulkan for GPU info")
-            elseif (GGML_KOMPUTE)
-                message(STATUS "Using Vulkan for GPU info because Kompute is enabled")
-            endif()
+unset(GPU_INFO_HEADERS)
+unset(GPU_INFO_SOURCES)
+unset(GPU_INFO_EXTRA_LIBS)
+
+if (GGML_VULKAN OR GGML_KOMPUTE)
+    find_package(Vulkan)
+    if (Vulkan_FOUND)
+        if (GGML_VULKAN)
+            message(STATUS "Using Vulkan for GPU info")
+        elseif (GGML_KOMPUTE)
+            message(STATUS "Using Vulkan for GPU info because Kompute is enabled")
+        endif()
 
-            list(APPEND GPU_INFO_HEADERS gpuInfo/vulkan-gpu-info.h)
-            list(APPEND GPU_INFO_SOURCES gpuInfo/vulkan-gpu-info.cpp)
+        list(APPEND GPU_INFO_HEADERS gpuInfo/vulkan-gpu-info.h)
+        list(APPEND GPU_INFO_SOURCES gpuInfo/vulkan-gpu-info.cpp)
 
-            add_compile_definitions(GPU_INFO_USE_VULKAN)
+        add_compile_definitions(GPU_INFO_USE_VULKAN)
 
-            list(APPEND GPU_INFO_EXTRA_LIBS Vulkan::Vulkan)
-        else()
-            message(FATAL_ERROR "Vulkan was not found")
-        endif()
+        list(APPEND GPU_INFO_EXTRA_LIBS Vulkan::Vulkan)
+    else()
+        message(FATAL_ERROR "Vulkan was not found")
     endif()
+endif()
 
-    list(REMOVE_DUPLICATES GPU_INFO_HEADERS)
-    list(REMOVE_DUPLICATES GPU_INFO_SOURCES)
-    list(REMOVE_DUPLICATES GPU_INFO_EXTRA_LIBS)
+list(REMOVE_DUPLICATES GPU_INFO_HEADERS)
+list(REMOVE_DUPLICATES GPU_INFO_SOURCES)
+list(REMOVE_DUPLICATES GPU_INFO_EXTRA_LIBS)
 
-    file(GLOB SOURCE_FILES "addon/*.cpp" "addon/**/*.cpp" ${GPU_INFO_SOURCES})
+file(GLOB SOURCE_FILES "addon/*.cpp" "addon/**/*.cpp" ${GPU_INFO_SOURCES})
 
-    add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${CMAKE_JS_SRC} ${GPU_INFO_HEADERS})
-    set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
-    target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB})
-    target_link_libraries(${PROJECT_NAME} "llama")
-    target_link_libraries(${PROJECT_NAME} "common")
+add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${CMAKE_JS_SRC} ${GPU_INFO_HEADERS})
+set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
+target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB})
+target_link_libraries(${PROJECT_NAME} "llama")
+target_link_libraries(${PROJECT_NAME} "common")
 
-    if (DEFINED GPU_INFO_EXTRA_LIBS)
-        target_link_libraries(${PROJECT_NAME} ${GPU_INFO_EXTRA_LIBS})
-    endif()
+if (DEFINED GPU_INFO_EXTRA_LIBS)
+    target_link_libraries(${PROJECT_NAME} ${GPU_INFO_EXTRA_LIBS})
+endif()
 
-    if(MSVC AND CMAKE_JS_NODELIB_DEF AND CMAKE_JS_NODELIB_TARGET)
+if(MSVC AND CMAKE_JS_NODELIB_DEF AND CMAKE_JS_NODELIB_TARGET)
     # Generate node.lib
     execute_process(COMMAND ${CMAKE_AR} /def:${CMAKE_JS_NODELIB_DEF} /out:${CMAKE_JS_NODELIB_TARGET} ${CMAKE_STATIC_LINKER_FLAGS})
-    endif()
 endif()

src/bindings/utils/compileLLamaCpp.ts

@@ -216,16 +216,15 @@ export async function compileLlamaCpp(buildOptions: BuildOptions, compileOptions
                                 ...(
                                     [
                                         ...cmakeCustomOptions,
-                                        [targetFlag, targetValue],
-                                        ["NLC_SINGLE_LLAMA_CPP_TARGET", "1"]
+                                        [targetFlag, targetValue]
                                     ].map(([key, value]) => "--CD" + key + "=" + value)
                                 )
                             ],
                             __dirname,
                             envVars,
                             buildOptions.progressLogs
                         );
-                        const targetCompileResultDir = await moveBuildFilesToResultDir(targetOutDir);
+                        const targetCompileResultDir = await moveBuildFilesToResultDir(targetOutDir, true);
                         await mergeDirWithoutOverrides(targetCompileResultDir, compiledResultDirPath);
                     }
                 }
@@ -444,13 +443,16 @@ export async function getPrebuiltBinaryBuildMetadata(folderPath: string, folderN
     return buildMetadata;
 }
 
-async function moveBuildFilesToResultDir(outDirectory: string) {
+async function moveBuildFilesToResultDir(outDirectory: string, canCreateReleaseDir: boolean = false) {
     const binFilesDirPaths = [
         path.join(outDirectory, "bin"),
         path.join(outDirectory, "llama.cpp", "bin")
     ];
     const compiledResultDirPath = path.join(outDirectory, buildConfigType);
 
+    if (canCreateReleaseDir)
+        await fs.ensureDir(compiledResultDirPath);
+
     if (!await fs.pathExists(compiledResultDirPath))
         throw new Error(`Could not find ${buildConfigType} directory`);