@fugood/llama.node 0.6.0 → 0.6.2

package/CMakeLists.txt

@@ -47,17 +47,30 @@ message(STATUS "Platform: ${PLATFORM}")
 message(STATUS "Architecture: ${ARCH}")
 message(STATUS "PLATFORM_BINARY_DIR: ${PLATFORM_BINARY_DIR}")
 
-# set strip flags
 if(CMAKE_BUILD_TYPE STREQUAL "Release")
-  if(UNIX OR MINGW)
+  if((UNIX OR MINGW) AND NOT CLANG)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s")
-  elseif(MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /s")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /s")
   endif()
 endif()
 
+# Improve speed
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+  if (MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /O2 /Ob2 /Oi /Ot /Oy /GL")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /O2 /Ob2 /Oi /Ot /Oy /GL")
+  else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -funroll-loops -flto")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -funroll-loops -flto")
+    set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -flto")
+  endif()
+endif()
+
+if (CLANG)
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libgcc -static-libstdc++")
+endif()
+
 # flags: -fPIC
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
@@ -108,6 +121,24 @@ file(
     "src/tts_utils.h"
 )
 
+if (CLANG AND CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  file(GLOB WIN_DYNAMIC_LOAD_SRC "src/win_dynamic_load.c")
+
+  add_library(win_dynamic_load ${WIN_DYNAMIC_LOAD_SRC})
+  if (NOT MSVC)
+    set_target_properties(win_dynamic_load PROPERTIES COMPILE_FLAGS "-Wno-implicit-function-declaration")
+  endif()
+  
+  unset(CMAKE_JS_SRC)
+  unset(CMAKE_JS_LIB)
+  unset(CMAKE_JS_NODELIB_DEF)
+  unset(CMAKE_JS_NODELIB_TARGET)
+  unset(CMAKE_JS_NODELIB_TARGET_NAME)
+  string(REGEX REPLACE "/DELAYLOAD:NODE.EXE" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+
+  set(CMAKE_JS_LIB win_dynamic_load)
+endif()
+
 add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${CMAKE_JS_SRC})
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
 target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB} llama ggml common mtmd ${CMAKE_THREAD_LIBS_INIT})

package/lib/binding.ts

@@ -218,7 +218,7 @@ export interface LlamaContext {
    * @param path Path to the vocoder model
    * @returns Promise resolving to true if loading was successful
    */
-  initVocoder(path: string): Promise<boolean>
+  initVocoder(options: { path: string }): Promise<boolean>
 
   /**
    * Unload the vocoder model

package/lib/index.js

@@ -204,8 +204,8 @@ class LlamaContextWrapper {
     getMultimodalSupport() {
         return this.ctx.getMultimodalSupport();
     }
-    initVocoder(path) {
-        return this.ctx.initVocoder(path);
+    initVocoder(options) {
+        return this.ctx.initVocoder(options);
     }
     releaseVocoder() {
         return this.ctx.releaseVocoder();

package/lib/index.ts

@@ -270,8 +270,8 @@ class LlamaContextWrapper {
     return this.ctx.getMultimodalSupport()
   }
 
-  initVocoder(path: string): Promise<boolean> {
-    return this.ctx.initVocoder(path)
+  initVocoder(options: { path: string }): Promise<boolean> {
+    return this.ctx.initVocoder(options)
   }
 
   releaseVocoder(): Promise<void> {

package/package.json

@@ -1,14 +1,16 @@
 {
   "name": "@fugood/llama.node",
   "access": "public",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "An another Node binding of llama.cpp",
   "main": "lib/index.js",
   "scripts": {
+    "postinstall": "patch-package",
     "pretest": "node scripts/download-test-models.js",
     "test": "jest",
     "build": "tsc",
     "prepack": "yarn build",
+    "prebuild-native": "node scripts/generate_win_dynamic_load.js 6",
     "build-native": "cmake-js compile",
     "clean": "rimraf build",
     "prepare": "husky",
@@ -59,6 +61,7 @@
     "cmake-js": "^7.3.0",
     "husky": "^9.0.11",
     "jest": "^29.7.0",
+    "patch-package": "^8.0.0",
     "release-it": "^17.7.0",
     "rimraf": "^6.0.1",
     "typescript": "^5.4.5",

package/patches/node-api-headers+1.1.0.patch

@@ -0,0 +1,26 @@
+diff --git a/node_modules/node-api-headers/include/js_native_api.h b/node_modules/node-api-headers/include/js_native_api.h
+index e06bdc8..c35398a 100644
+--- a/node_modules/node-api-headers/include/js_native_api.h
++++ b/node_modules/node-api-headers/include/js_native_api.h
+@@ -22,7 +22,7 @@
+ // If you need __declspec(dllimport), either include <node_api.h> instead, or
+ // define NAPI_EXTERN as __declspec(dllimport) on the compiler's command line.
+ #ifndef NAPI_EXTERN
+-#ifdef _WIN32
++#if defined(_WIN32) && _MSC_VER
+ #define NAPI_EXTERN __declspec(dllexport)
+ #elif defined(__wasm32__)
+ #define NAPI_EXTERN                                                            \
+diff --git a/node_modules/node-api-headers/include/node_api.h b/node_modules/node-api-headers/include/node_api.h
+index 0345468..359c496 100644
+--- a/node_modules/node-api-headers/include/node_api.h
++++ b/node_modules/node-api-headers/include/node_api.h
+@@ -2,7 +2,7 @@
+ #define SRC_NODE_API_H_
+ 
+ #ifdef BUILDING_NODE_EXTENSION
+-#ifdef _WIN32
++#if defined(_WIN32) && _MSC_VER
+ // Building native addon against node
+ #define NAPI_EXTERN __declspec(dllimport)
+ #elif defined(__wasm32__)

package/src/LlamaContext.cpp

@@ -444,9 +444,9 @@ Napi::Value LlamaContext::GetModelInfo(const Napi::CallbackInfo &info) {
   details.Set("size", llama_model_size(model));
 
   Napi::Object chatTemplates = Napi::Object::New(info.Env());
-  chatTemplates.Set("llamaChat", validateModelChatTemplate(model, false, ""));
+  chatTemplates.Set("llamaChat", validateModelChatTemplate(model, false, nullptr));
   Napi::Object minja = Napi::Object::New(info.Env());
-  minja.Set("default", validateModelChatTemplate(model, true, ""));
+  minja.Set("default", validateModelChatTemplate(model, true, nullptr));
   Napi::Object defaultCaps = Napi::Object::New(info.Env());
   defaultCaps.Set(
       "tools",
@@ -498,7 +498,7 @@ Napi::Value LlamaContext::GetModelInfo(const Napi::CallbackInfo &info) {
 
   // Deprecated: use chatTemplates.llamaChat instead
   details.Set("isChatTemplateSupported",
-              validateModelChatTemplate(_sess->model(), false, ""));
+              validateModelChatTemplate(_sess->model(), false, nullptr));
   return details;
 }
 
@@ -601,6 +601,8 @@ Napi::Value LlamaContext::GetFormattedChat(const Napi::CallbackInfo &info) {
         _sess, _templates, messages, chat_template, json_schema_str, tools_str,
         parallel_tool_calls, tool_choice);
 
+    console_log(env, std::string("format: ") + std::to_string(chatParams.format));
+
     Napi::Object result = Napi::Object::New(env);
     result.Set("prompt", chatParams.prompt);
     // chat_format: int
@@ -1244,11 +1246,11 @@ tts_type LlamaContext::getTTSType(Napi::Env env, nlohmann::json speaker) {
 // initVocoder(path: string): boolean
 Napi::Value LlamaContext::InitVocoder(const Napi::CallbackInfo &info) {
   Napi::Env env = info.Env();
-  if (info.Length() < 1 || !info[0].IsString()) {
-    Napi::TypeError::New(env, "String expected for vocoder path")
+  if (info.Length() < 1 || !info[0].IsObject()) {
+    Napi::TypeError::New(env, "Object is expected for vocoder path")
         .ThrowAsJavaScriptException();
   }
-  auto vocoder_path = info[0].ToString().Utf8Value();
+  auto vocoder_path = info[0].As<Napi::Object>().Get("path").ToString().Utf8Value();
   if (vocoder_path.empty()) {
     Napi::TypeError::New(env, "vocoder path is required")
         .ThrowAsJavaScriptException();

package/src/tts_utils.cpp

@@ -188,6 +188,10 @@ std::string process_text(const std::string &text,
   return processed_text;
 }
 
+#ifdef _WIN32
+#define M_PI 3.14159265358979323846
+#endif
+
 void fill_hann_window(int length, bool periodic, float *output) {
   int offset = -1;
   if (periodic) {