node-llama-cpp 3.15.1 → 3.16.0

package/dist/types.d.ts

@@ -72,6 +72,11 @@ export type ChatWrapperSettings = {
         readonly parallelism?: {
             readonly call: {
                 readonly sectionPrefix: string | LlamaText;
+                /**
+                 * Alternate section prefixes that can be used to detect a function call section,
+                 * but won't be used to construct the context when building it from scratch.
+                 */
+                readonly sectionPrefixAlternateMatches?: Array<string | LlamaText>;
                 readonly betweenCalls?: string | LlamaText;
                 readonly sectionSuffix?: string | LlamaText;
             };
@@ -354,3 +359,49 @@ export type LLamaContextualRepeatPenalty = {
      */
     presencePenalty?: number;
 };
+export type LLamaContextualDryRepeatPenalty = {
+    /**
+     * A number between `0` and `1` representing the strength of the DRY (Don't Repeat Yourself) effect.
+     *
+     * Setting this to `0` will disable the DRY penalty completely.
+     *
+     * The recommended value is `0.8`.
+     */
+    strength: number;
+    /**
+     * The base value for the exponential penality calculation.
+     *
+     * A higher value will lead to more aggressive penalization of repetitions.
+     *
+     * Defaults to `1.75`.
+     */
+    base?: number;
+    /**
+     * The maximum sequence length (in tokens) that will be allowed to be repeated without being penalized.
+     *
+     * Repetitions shorter than or equal to this length will not be penalized,
+     * allowing for natural repetitions of short phrases and common words.
+     *
+     * Defaults to `2`.
+     */
+    allowedLength?: number;
+    /**
+     * Number of recent tokens generated by the model to consider for sequence repetition matching.
+     *
+     * When set to `null`, the entire context sequence history will be considered for repetition matching.
+     * Setting to `0` will disable DRY (Don't Repeat Yourself) penalty.
+     *
+     * Defaults to `null`.
+     */
+    lastTokens?: number | null;
+    /**
+     * Text sequences that will be considered as breakers for the repeated sequences.
+     * These will never be penalized for being repeated, and are used to mark the boundaries of the repeated sequences.
+     *
+     * For example, setting this to `["\n", "*"]` will allow the model to make as many lists as it wants,
+     * without being penalized for repeating the list item marker (like `*`).
+     *
+     * Defaults to `["\n", ":", '"', "*"]`.
+     */
+    sequenceBreakers?: string[];
+};

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAoVA,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,SAAS,EAAE,SAAS,CAAoD,CAAC;AACzG,KAAM,IAAsF,CAAC;AA8B7F,MAAM,UAAU,+BAA+B,CAAC,IAAuD;IACnG,IAAI,IAAI,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QACxC,OAAO,KAAK,CAAC;IAEjB,OAAO,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,IAAuD;IAC9F,IAAI,IAAI,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QACxC,OAAO,KAAK,CAAC;IAEjB,OAAO,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;AACnC,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AA2VA,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,SAAS,EAAE,SAAS,CAAoD,CAAC;AACzG,KAAM,IAAsF,CAAC;AA8B7F,MAAM,UAAU,+BAA+B,CAAC,IAAuD;IACnG,IAAI,IAAI,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QACxC,OAAO,KAAK,CAAC;IAEjB,OAAO,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,IAAuD;IAC9F,IAAI,IAAI,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QACxC,OAAO,KAAK,CAAC;IAEjB,OAAO,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;AACnC,CAAC"}

package/dist/utils/cmake.js

@@ -35,9 +35,12 @@ export async function getCmakePath() {
     }
     catch (err) { }
     try {
-        let resolvedPath = await which("cmake", {
-            path: path.join(llamaDirectory, "xpack", "xpacks", ".bin")
-        });
+        let resolvedPath = (await which("cmake", {
+            path: path.join(llamaDirectory, "xpack", "xpacks", ".bin"),
+            nothrow: true
+        })) || (await which("cmake", {
+            path: path.join(llamaDirectory, "xpack", "xpacks", "@xpack-dev-tools", "cmake", ".content", "bin")
+        }));
         if (resolvedPath.toLowerCase().endsWith(".cmd"))
             resolvedPath = (await getBinFromWindowCmd(resolvedPath, "cmake.exe")) ?? "";
         else if (resolvedPath.toLowerCase().endsWith(".ps1")) {

package/dist/utils/cmake.js.map

@@ -1 +1 @@
-{"version":3,"file":"cmake.js","sourceRoot":"","sources":["../../src/utils/cmake.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cmake.js","sourceRoot":"","sources":["../../src/utils/cmake.ts"],"names":[],"mappings":"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"}

package/llama/addon/AddonContext.cpp

@@ -942,11 +942,25 @@ Napi::Value AddonContext::EnsureDraftContextIsCompatibleForSpeculative(const Nap
     return info.Env().Undefined();
 }
 
-Napi::Value AddonContext::SetLora(const Napi::CallbackInfo& info) {
-    AddonModelLora* lora = Napi::ObjectWrap<AddonModelLora>::Unwrap(info[0].As<Napi::Object>());
-    float scale = info[1].As<Napi::Number>().FloatValue();
+Napi::Value AddonContext::SetLoras(const Napi::CallbackInfo& info) {
+    Napi::Array loraArray = info[0].As<Napi::Array>();
+    Napi::Array scaleArray = info[1].As<Napi::Array>();
 
-    llama_set_adapter_lora(ctx, lora->lora_adapter, scale);
+    std::vector<llama_adapter_lora *> loras;
+    std::vector<float> scales;
+
+    loras.reserve(loraArray.Length());
+    scales.reserve(scaleArray.Length());
+
+    for (size_t i = 0; i < loraArray.Length() && i < scaleArray.Length(); i++) {
+        AddonModelLora* lora = Napi::ObjectWrap<AddonModelLora>::Unwrap(loraArray.Get(i).As<Napi::Object>());
+        float scale = scaleArray.Get(i).As<Napi::Number>().FloatValue();
+
+        loras.push_back(lora->lora_adapter);
+        scales.push_back(scale);
+    }
+
+    llama_set_adapters_lora(ctx, loras.data(), loras.size(), scales.data());
 
     return info.Env().Undefined();
 }
@@ -977,7 +991,7 @@ void AddonContext::init(Napi::Object exports) {
                 InstanceMethod("ensureDraftContextIsCompatibleForSpeculative", &AddonContext::EnsureDraftContextIsCompatibleForSpeculative),
                 InstanceMethod("saveSequenceStateToFile", &AddonContext::SaveSequenceStateToFile),
                 InstanceMethod("loadSequenceStateFromFile", &AddonContext::LoadSequenceStateFromFile),
-                InstanceMethod("setLora", &AddonContext::SetLora),
+                InstanceMethod("setLoras", &AddonContext::SetLoras),
                 InstanceMethod("dispose", &AddonContext::Dispose),
             }
         )

package/llama/addon/AddonContext.h

@@ -52,7 +52,7 @@ class AddonContext : public Napi::ObjectWrap<AddonContext> {
         Napi::Value PrintTimings(const Napi::CallbackInfo& info);
         Napi::Value EnsureDraftContextIsCompatibleForSpeculative(const Napi::CallbackInfo& info);
 
-        Napi::Value SetLora(const Napi::CallbackInfo& info);
+        Napi::Value SetLoras(const Napi::CallbackInfo& info);
 
         static void init(Napi::Object exports);
 };

package/llama/addon/AddonSampler.cpp

@@ -28,6 +28,11 @@ void AddonSampler::dispose() {
     model->Unref();
     freeChain();
 
+    if (xtcSampler != nullptr) {
+        llama_sampler_free(xtcSampler);
+        xtcSampler = nullptr;
+    }
+
     if (temperatureSampler != nullptr) {
         llama_sampler_free(temperatureSampler);
         temperatureSampler = nullptr;
@@ -63,6 +68,11 @@ void AddonSampler::dispose() {
         repeatPenaltySampler = nullptr;
     }
 
+    if (dryRepeatPenaltySampler != nullptr) {
+        llama_sampler_free(dryRepeatPenaltySampler);
+        dryRepeatPenaltySampler = nullptr;
+    }
+
     if (tokenBiasSampler != nullptr) {
         llama_sampler_free(tokenBiasSampler);
         tokenBiasSampler = nullptr;
@@ -108,11 +118,19 @@ void AddonSampler::rebuildChainIfNeeded() {
         llama_sampler_chain_add(chain, repeatPenaltySampler);
     }
 
+    if (dryRepeatPenaltySampler != nullptr) {
+        llama_sampler_chain_add(chain, dryRepeatPenaltySampler);
+    }
+
     if (grammarEvaluationState != nullptr) {
         llama_sampler_chain_add(chain, grammarEvaluationState->sampler);
     }
 
     if (greedySampler != nullptr) {
+        if (xtcSampler != nullptr) {
+            llama_sampler_chain_add(chain, xtcSampler);
+        }
+
         llama_sampler_chain_add(chain, greedySampler);
     } else {
         if (topKSampler != nullptr) {
@@ -127,6 +145,10 @@ void AddonSampler::rebuildChainIfNeeded() {
             llama_sampler_chain_add(chain, minPSampler);
         }
 
+        if (xtcSampler != nullptr) {
+            llama_sampler_chain_add(chain, xtcSampler);
+        }
+
         if (temperatureSampler != nullptr) {
             llama_sampler_chain_add(chain, temperatureSampler);
         }
@@ -143,6 +165,10 @@ void AddonSampler::acceptToken(llama_token token) {
         repeatPenalty_lastTokens.push_back(token);
     }
 
+    if (dryRepeatPenaltySampler != nullptr) {
+        llama_sampler_accept(dryRepeatPenaltySampler, token);
+    }
+
     if (grammarEvaluationState != nullptr && grammarEvaluationState->sampler != nullptr && !llama_vocab_is_eog(model->vocab, token)) {
         llama_sampler_accept(grammarEvaluationState->sampler, token);
     }
@@ -282,6 +308,33 @@ Napi::Value AddonSampler::ApplyConfig(const Napi::CallbackInfo& info) {
         seedSampler = llama_sampler_init_dist(time(NULL));
     }
 
+    if (config.Has("xtcProbability") && config.Has("xtcThreshold")) {
+        auto xtcProbability = config.Get("xtcProbability").As<Napi::Number>().FloatValue();
+        auto xtcThreshold = config.Get("xtcThreshold").As<Napi::Number>().FloatValue();
+
+        if (xtcProbability != xtcSampler_probability || xtcThreshold != xtcSampler_threshold || xtcSampler == nullptr) {
+            xtcSampler_probability = xtcProbability;
+            xtcSampler_threshold = xtcThreshold;
+            freeChain();
+
+            if (xtcSampler != nullptr) {
+                llama_sampler_free(xtcSampler);
+                xtcSampler = nullptr;
+            }
+
+            xtcSampler = llama_sampler_init_xtc(
+                xtcSampler_probability,
+                xtcSampler_threshold,
+                0,
+                seedSampler == nullptr ? LLAMA_DEFAULT_SEED : seedSampler_seed
+            );
+        }
+    } else if (xtcSampler != nullptr) {
+        freeChain();
+        llama_sampler_free(xtcSampler);
+        xtcSampler = nullptr;
+    }
+
     if (config.Has("repeatPenaltyTokens")) {
         Napi::Uint32Array repeat_penalty_tokens_uint32_array = config.Get("repeatPenaltyTokens").As<Napi::Uint32Array>();
         auto repeatPenalty = config.Has("repeatPenalty")
@@ -374,6 +427,111 @@ Napi::Value AddonSampler::ApplyConfig(const Napi::CallbackInfo& info) {
         repeatPenaltySampler = nullptr;
     }
 
+    if (config.Has("dryRepeatPenaltyStrength")) {
+        float strength = config.Get("dryRepeatPenaltyStrength").As<Napi::Number>().FloatValue();
+        float base = config.Has("dryRepeatPenaltyBase")
+            ? config.Get("dryRepeatPenaltyBase").As<Napi::Number>().FloatValue()
+            : 0;
+        int32_t allowedLength = config.Has("dryRepeatPenaltyAllowedLength")
+            ? config.Get("dryRepeatPenaltyAllowedLength").As<Napi::Number>().Int32Value()
+            : 2;
+        int32_t lastTokens = config.Has("dryRepeatPenaltyLastTokens")
+            ? config.Get("dryRepeatPenaltyLastTokens").As<Napi::Number>().Int32Value()
+            : -1;
+
+        bool sequenceBreaksIsTheSame = (
+            config.Has("dryRepeatPenaltySequenceBreakers") &&
+            config.Get("dryRepeatPenaltySequenceBreakers").IsBoolean() &&
+            config.Get("dryRepeatPenaltySequenceBreakers").As<Napi::Boolean>().Value() == false
+        ) ? true : false;
+
+        std::vector<std::string> sequenceBreakers;
+        if (config.Has("dryRepeatPenaltySequenceBreakers") && config.Get("dryRepeatPenaltySequenceBreakers").IsArray()) {
+            Napi::Array sequenceBreakersArray = config.Get("dryRepeatPenaltySequenceBreakers").As<Napi::Array>();
+            sequenceBreaksIsTheSame = dryRepeatPenalty_sequenceBreakers.size() == sequenceBreakersArray.Length();
+
+            sequenceBreakers.reserve(sequenceBreakersArray.Length());
+            for (size_t i = 0; i < sequenceBreakersArray.Length(); i++) {
+                std::string breaker = sequenceBreakersArray.Get(i).As<Napi::String>().Utf8Value();
+                
+                if (sequenceBreaksIsTheSame && dryRepeatPenalty_sequenceBreakers[i] != breaker) {
+                    sequenceBreaksIsTheSame = false;
+                }
+
+                sequenceBreakers.push_back(std::move(breaker));
+            }
+        }
+
+        auto enabled = base != 0 && lastTokens != 0;
+        bool shouldCreateSampler = false;
+
+        if (!enabled) {
+            if (dryRepeatPenaltySampler != nullptr) {
+                freeChain();
+                llama_sampler_free(dryRepeatPenaltySampler);
+                dryRepeatPenaltySampler = nullptr;
+            }
+        } else if (dryRepeatPenaltySampler == nullptr) {
+            freeChain();
+            shouldCreateSampler = true;
+        } else {
+            bool existingSamplerMatchesConfig = true;
+            existingSamplerMatchesConfig &= dryRepeatPenalty_strength == strength;
+            existingSamplerMatchesConfig &= dryRepeatPenalty_base == base;
+            existingSamplerMatchesConfig &= dryRepeatPenalty_allowedLength == allowedLength;
+            existingSamplerMatchesConfig &= dryRepeatPenalty_lastTokens == lastTokens;
+            existingSamplerMatchesConfig &= sequenceBreaksIsTheSame;
+
+            if (!existingSamplerMatchesConfig) {
+                freeChain();
+                llama_sampler_free(dryRepeatPenaltySampler);
+                dryRepeatPenaltySampler = nullptr;
+
+                shouldCreateSampler = true;
+            }
+        }
+
+        if (shouldCreateSampler) {
+            std::vector<const char *> cSequenceBreakers;
+
+            if (sequenceBreaksIsTheSame) {
+                cSequenceBreakers.reserve(dryRepeatPenalty_sequenceBreakers.size());
+                for (const auto & str : dryRepeatPenalty_sequenceBreakers) {
+                    cSequenceBreakers.push_back(str.c_str());
+                }
+            } else {
+                cSequenceBreakers.reserve(sequenceBreakers.size());
+                for (const auto & str : sequenceBreakers) {
+                    cSequenceBreakers.push_back(str.c_str());
+                }
+            }
+
+            dryRepeatPenaltySampler = llama_sampler_init_dry(
+                model->vocab,
+                llama_model_n_ctx_train(model->model),
+                strength,
+                base,
+                allowedLength,
+                lastTokens,
+                cSequenceBreakers.data(),
+                cSequenceBreakers.size()
+            );
+
+            dryRepeatPenalty_strength = strength;
+            dryRepeatPenalty_base = base;
+            dryRepeatPenalty_allowedLength = allowedLength;
+            dryRepeatPenalty_lastTokens = lastTokens;
+
+            if (!sequenceBreaksIsTheSame) {
+                dryRepeatPenalty_sequenceBreakers.swap(sequenceBreakers);
+            }
+        }
+    } else if (dryRepeatPenaltySampler != nullptr) {
+        freeChain();
+        llama_sampler_free(dryRepeatPenaltySampler);
+        dryRepeatPenaltySampler = nullptr;
+    }
+
     if (config.Has("tokenBiasKeys") && config.Has("tokenBiasValues")) {
         Napi::Uint32Array tokenBiasKeys = config.Get("tokenBiasKeys").As<Napi::Uint32Array>();
         Napi::Float32Array tokenBiasValues = config.Get("tokenBiasValues").As<Napi::Float32Array>();

package/llama/addon/AddonSampler.h

@@ -25,7 +25,11 @@ class AddonSampler : public Napi::ObjectWrap<AddonSampler> {
 
         llama_sampler * topPSampler = nullptr;
         float topPSampler_topP = 0.0f; // Top p sampling >=1.0 = disabled
-        
+
+        llama_sampler * xtcSampler = nullptr;
+        float xtcSampler_probability = 0;
+        float xtcSampler_threshold = 0;
+
         llama_sampler * seedSampler = nullptr;
         uint32_t seedSampler_seed = 0;
 
@@ -36,6 +40,14 @@ class AddonSampler : public Napi::ObjectWrap<AddonSampler> {
         float repeatPenalty_presencePenalty = 0.00f;  // 0.0 = disabled
         float repeatPenalty_frequencyPenalty = 0.00f;  // 0.0 = disabled
 
+        llama_sampler * dryRepeatPenaltySampler = nullptr;
+        float dryRepeatPenalty_strength = 0.00f; // 0.00f = disabled
+        float dryRepeatPenalty_base = 0.00f;
+        int32_t dryRepeatPenalty_allowedLength = 1;
+        int32_t dryRepeatPenalty_lastTokens = 1;
+        bool dryRepeatPenalty_lastTokensAll = true;
+        std::vector<std::string> dryRepeatPenalty_sequenceBreakers;
+
         llama_sampler * tokenBiasSampler = nullptr;
         std::vector<llama_logit_bias> tokenBiasSampler_biases;
 

package/llama/addon/globals/getGpuInfo.cpp

@@ -99,7 +99,7 @@ std::pair<ggml_backend_dev_t, std::string> getGpuDevice() {
         ggml_backend_dev_t device = ggml_backend_dev_get(i);
         const auto deviceName = std::string(ggml_backend_dev_name(device));
 
-        if (deviceName == "Metal") {
+        if (std::string(deviceName).find("MTL") == 0 || deviceName == "Metal") {
             return std::pair<ggml_backend_dev_t, std::string>(device, "metal");
         } else if (std::string(deviceName).find("Vulkan") == 0) {
             return std::pair<ggml_backend_dev_t, std::string>(device, "vulkan");

package/llama/binariesGithubRelease.json

@@ -1,3 +1,3 @@
 {
-    "release": "b7836"
+    "release": "b8095"
 }

package/llama/gpuInfo/vulkan-gpu-info.cpp

@@ -1,4 +1,5 @@
 #include <stddef.h>
+#include <cstdint>
 #include <map>
 #include <vector>
 
@@ -8,6 +9,7 @@ constexpr std::uint32_t VK_VENDOR_ID_AMD = 0x1002;
 constexpr std::uint32_t VK_VENDOR_ID_APPLE = 0x106b;
 constexpr std::uint32_t VK_VENDOR_ID_INTEL = 0x8086;
 constexpr std::uint32_t VK_VENDOR_ID_NVIDIA = 0x10de;
+constexpr std::uint32_t VK_VENDOR_ID_QUALCOMM = 0x5143;
 
 typedef void (*gpuInfoVulkanWarningLogCallback_t)(const char* message);
 
@@ -35,7 +37,7 @@ static std::vector<vk::PhysicalDevice> dedupedDevices() {
         auto oldDevice = std::find_if(
             dedupedDevices.begin(),
             dedupedDevices.end(),
-            [&newId](const vk::PhysicalDevice& oldDevice) {
+            [&newId, &newDriver](const vk::PhysicalDevice& oldDevice) {
                 vk::PhysicalDeviceProperties2 oldProps;
                 vk::PhysicalDeviceDriverProperties oldDriver;
                 vk::PhysicalDeviceIDProperties oldId;
@@ -43,13 +45,14 @@ static std::vector<vk::PhysicalDevice> dedupedDevices() {
                 oldDriver.pNext = &oldId;
                 oldDevice.getProperties2(&oldProps);
 
-                bool equals = std::equal(std::begin(oldId.deviceUUID), std::end(oldId.deviceUUID), std::begin(newId.deviceUUID));
-                equals = equals || (
+                bool sameUuid = std::equal(std::begin(oldId.deviceUUID), std::end(oldId.deviceUUID), std::begin(newId.deviceUUID));
+                sameUuid = sameUuid || (
                     oldId.deviceLUIDValid && newId.deviceLUIDValid &&
                     std::equal(std::begin(oldId.deviceLUID), std::end(oldId.deviceLUID), std::begin(newId.deviceLUID))
                 );
+                bool bothMoltenVk = (newDriver.driverID == vk::DriverId::eMoltenvk && oldDriver.driverID == vk::DriverId::eMoltenvk);
 
-                return equals;
+                return sameUuid && !bothMoltenVk;
             }
         );
 
@@ -83,8 +86,12 @@ static std::vector<vk::PhysicalDevice> dedupedDevices() {
                 driverPriorities[vk::DriverId::eMesaNvk] = 2;
 #endif
                 break;
+            case VK_VENDOR_ID_QUALCOMM:
+                driverPriorities[vk::DriverId::eQualcommProprietary] = 1;
+                driverPriorities[vk::DriverId::eMesaTurnip] = 2;
+                break;
         }
-        driverPriorities[vk::DriverId::eMesaDozen] = 4;
+        driverPriorities[vk::DriverId::eMesaDozen] = 100;
 
         if (driverPriorities.count(oldDriver.driverID)) {
             oldPriority = driverPriorities[oldDriver.driverID];

package/llama/llama.cpp.info.json

@@ -1,4 +1,4 @@
 {
-    "tag": "b7836",
+    "tag": "b8095",
     "llamaCppGithubRepo": "ggml-org/llama.cpp"
 }