node-llama-cpp 3.0.0-beta.11 → 3.0.0-beta.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -4
- package/dist/bindings/Llama.d.ts +1 -0
- package/dist/bindings/Llama.js +7 -1
- package/dist/bindings/Llama.js.map +1 -1
- package/dist/bindings/getLlama.d.ts +7 -1
- package/dist/bindings/getLlama.js +6 -3
- package/dist/bindings/getLlama.js.map +1 -1
- package/dist/bindings/types.d.ts +1 -0
- package/dist/bindings/types.js.map +1 -1
- package/dist/bindings/utils/compileLLamaCpp.js +2 -0
- package/dist/bindings/utils/compileLLamaCpp.js.map +1 -1
- package/dist/bindings/utils/getBuildFolderNameForBuildOptions.js +2 -0
- package/dist/bindings/utils/getBuildFolderNameForBuildOptions.js.map +1 -1
- package/dist/bindings/utils/resolveCustomCmakeOptions.js +2 -0
- package/dist/bindings/utils/resolveCustomCmakeOptions.js.map +1 -1
- package/dist/cli/commands/BuildCommand.d.ts +2 -1
- package/dist/cli/commands/BuildCommand.js +11 -9
- package/dist/cli/commands/BuildCommand.js.map +1 -1
- package/dist/cli/commands/DebugCommand.js +16 -13
- package/dist/cli/commands/DebugCommand.js.map +1 -1
- package/dist/cli/commands/DownloadCommand.d.ts +2 -1
- package/dist/cli/commands/DownloadCommand.js +11 -9
- package/dist/cli/commands/DownloadCommand.js.map +1 -1
- package/dist/cli/utils/logEnabledComputeLayers.d.ts +8 -0
- package/dist/cli/utils/logEnabledComputeLayers.js +11 -0
- package/dist/cli/utils/logEnabledComputeLayers.js.map +1 -0
- package/dist/config.d.ts +1 -0
- package/dist/config.js +5 -2
- package/dist/config.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfArray.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfBoolean.d.ts +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfBoolean.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfBooleanValue.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfGrammar.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfNull.d.ts +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfNull.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfNumber.d.ts +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfNumber.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfNumberValue.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfObjectMap.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfOr.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfString.d.ts +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfString.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfStringValue.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfVerbatimText.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfWhitespace.d.ts +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfWhitespace.js.map +1 -1
- package/dist/utils/getBuildDefaults.d.ts +1 -0
- package/dist/utils/getBuildDefaults.js +3 -2
- package/dist/utils/getBuildDefaults.js.map +1 -1
- package/llama/CMakeLists.txt +20 -0
- package/llama/addon.cpp +34 -3
- package/llama/binariesGithubRelease.json +1 -1
- package/llama/gitRelease.bundle +0 -0
- package/llama/gpuInfo/cuda-gpu-info.cu +5 -5
- package/llama/gpuInfo/cuda-gpu-info.h +2 -2
- package/llama/gpuInfo/vulkan-gpu-info.cpp +65 -0
- package/llama/gpuInfo/vulkan-gpu-info.h +7 -0
- package/llama/llama.cpp.info.json +1 -1
- package/llamaBins/linux-arm64/.buildMetadata.json +1 -1
- package/llamaBins/linux-arm64/llama-addon.node +0 -0
- package/llamaBins/linux-armv7l/.buildMetadata.json +1 -1
- package/llamaBins/linux-armv7l/llama-addon.node +0 -0
- package/llamaBins/linux-x64/.buildMetadata.json +1 -1
- package/llamaBins/linux-x64/llama-addon.node +0 -0
- package/llamaBins/linux-x64-cuda/.buildMetadata.json +1 -1
- package/llamaBins/linux-x64-cuda/llama-addon.node +0 -0
- package/llamaBins/linux-x64-vulkan/.buildMetadata.json +1 -0
- package/llamaBins/linux-x64-vulkan/llama-addon.node +0 -0
- package/llamaBins/mac-arm64-metal/.buildMetadata.json +1 -1
- package/llamaBins/mac-arm64-metal/ggml-metal.metal +540 -9
- package/llamaBins/mac-arm64-metal/llama-addon.node +0 -0
- package/llamaBins/mac-x64/.buildMetadata.json +1 -1
- package/llamaBins/mac-x64/llama-addon.node +0 -0
- package/llamaBins/win-x64/.buildMetadata.json +1 -1
- package/llamaBins/win-x64/llama-addon.exp +0 -0
- package/llamaBins/win-x64/llama-addon.lib +0 -0
- package/llamaBins/win-x64/llama-addon.node +0 -0
- package/llamaBins/win-x64-cuda/.buildMetadata.json +1 -1
- package/llamaBins/win-x64-cuda/llama-addon.exp +0 -0
- package/llamaBins/win-x64-cuda/llama-addon.lib +0 -0
- package/llamaBins/win-x64-cuda/llama-addon.node +0 -0
- package/llamaBins/win-x64-vulkan/.buildMetadata.json +1 -0
- package/llamaBins/win-x64-vulkan/llama-addon.exp +0 -0
- package/llamaBins/win-x64-vulkan/llama-addon.lib +0 -0
- package/llamaBins/win-x64-vulkan/llama-addon.node +0 -0
- package/package.json +2 -1
package/README.md
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<div align="center">
|
|
2
|
-
<img alt="node-llama-cpp Logo" src="https://
|
|
2
|
+
<img alt="node-llama-cpp Logo" src="https://raw.githubusercontent.com/withcatai/node-llama-cpp/master/assets/logo.roundEdges.png" width="360px" />
|
|
3
3
|
<h1>node-llama-cpp</h1>
|
|
4
4
|
<p>Run AI models locally on your machine</p>
|
|
5
5
|
<sub>Pre-built bindings are provided with a fallback to building from source with cmake</sub>
|
|
@@ -15,11 +15,11 @@
|
|
|
15
15
|
|
|
16
16
|
</div>
|
|
17
17
|
|
|
18
|
-
✨ New! [Try the beta of version `3.0.0`](https://github.com/withcatai/node-llama-cpp/pull/105) ✨ (included: function calling, automatic chat wrapper detection, and more)
|
|
18
|
+
✨ New! [Try the beta of version `3.0.0`](https://github.com/withcatai/node-llama-cpp/pull/105) ✨ (included: function calling, automatic chat wrapper detection, embedding support, and more)
|
|
19
19
|
|
|
20
20
|
## Features
|
|
21
21
|
* Run a text generation model locally on your machine
|
|
22
|
-
* Metal and
|
|
22
|
+
* Metal, CUDA and Vulkan support
|
|
23
23
|
* Pre-built binaries are provided, with a fallback to building from source without `node-gyp` or Python
|
|
24
24
|
* Chat with a model using a chat wrapper
|
|
25
25
|
* Use the CLI to chat with a model without writing any code
|
|
@@ -84,7 +84,7 @@ To contribute to `node-llama-cpp` read the [contribution guide](https://withcata
|
|
|
84
84
|
<br />
|
|
85
85
|
|
|
86
86
|
<div align="center" width="360">
|
|
87
|
-
<img alt="Star please" src="https://
|
|
87
|
+
<img alt="Star please" src="https://raw.githubusercontent.com/withcatai/node-llama-cpp/master/assets/star.please.roundEdges.png" width="360" margin="auto" />
|
|
88
88
|
<br/>
|
|
89
89
|
<p align="right">
|
|
90
90
|
<i>If you like this repo, star it ✨</i>
|
package/dist/bindings/Llama.d.ts
CHANGED
package/dist/bindings/Llama.js
CHANGED
|
@@ -15,6 +15,7 @@ export class Llama {
|
|
|
15
15
|
/** @internal */ _bindings;
|
|
16
16
|
/** @internal */ _metal;
|
|
17
17
|
/** @internal */ _cuda;
|
|
18
|
+
/** @internal */ _vulkan;
|
|
18
19
|
/** @internal */ _buildType;
|
|
19
20
|
/** @internal */ _cmakeOptions;
|
|
20
21
|
/** @internal */ _llamaCppRelease;
|
|
@@ -26,10 +27,11 @@ export class Llama {
|
|
|
26
27
|
/** @internal */ _previousLog = null;
|
|
27
28
|
/** @internal */ _previousLogLevel = null;
|
|
28
29
|
/** @internal */ _nextLogNeedNewLine = false;
|
|
29
|
-
constructor({ bindings, metal, cuda, logLevel, logger, buildType, cmakeOptions, llamaCppRelease }) {
|
|
30
|
+
constructor({ bindings, metal, cuda, vulkan, logLevel, logger, buildType, cmakeOptions, llamaCppRelease }) {
|
|
30
31
|
this._bindings = bindings;
|
|
31
32
|
this._metal = metal;
|
|
32
33
|
this._cuda = cuda;
|
|
34
|
+
this._vulkan = vulkan;
|
|
33
35
|
this._logLevel = logLevel ?? LlamaLogLevel.debug;
|
|
34
36
|
this._logger = logger;
|
|
35
37
|
this._buildType = buildType;
|
|
@@ -49,6 +51,9 @@ export class Llama {
|
|
|
49
51
|
get cuda() {
|
|
50
52
|
return this._cuda;
|
|
51
53
|
}
|
|
54
|
+
get vulkan() {
|
|
55
|
+
return this._vulkan;
|
|
56
|
+
}
|
|
52
57
|
get logLevel() {
|
|
53
58
|
return this._logLevel;
|
|
54
59
|
}
|
|
@@ -157,6 +162,7 @@ export class Llama {
|
|
|
157
162
|
buildType,
|
|
158
163
|
metal: buildMetadata.buildOptions.computeLayers.metal,
|
|
159
164
|
cuda: buildMetadata.buildOptions.computeLayers.cuda,
|
|
165
|
+
vulkan: buildMetadata.buildOptions.computeLayers.vulkan,
|
|
160
166
|
cmakeOptions: buildMetadata.buildOptions.customCmakeOptions,
|
|
161
167
|
llamaCppRelease: {
|
|
162
168
|
repo: buildMetadata.buildOptions.llamaCpp.repo,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Llama.js","sourceRoot":"","sources":["../../src/bindings/Llama.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,mBAAmB,EAAC,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAoB,aAAa,EAAC,MAAM,YAAY,CAAC;AAE5D,MAAM,4BAA4B,GAAuC,IAAI,GAAG,CAAC;IAC7E,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC3B,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC;IACxB,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC;IACxB,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;IACvB,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;IACvB,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC;CAC3B,CAAC,CAAC;AACH,MAAM,4BAA4B,GAAuC,IAAI,GAAG,CAC5E,CAAC,GAAG,4BAA4B,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAClF,CAAC;AACF,MAAM,eAAe,GAAG,CAAC,CAAC;AAE1B,MAAM,OAAO,KAAK;IACd,gBAAgB,CAAiB,SAAS,CAAgB;IAC1D,gBAAgB,CAAkB,MAAM,CAAU;IAClD,gBAAgB,CAAkB,KAAK,CAAU;IACjD,gBAAgB,CAAkB,UAAU,CAA4B;IACxE,gBAAgB,CAAkB,aAAa,CAAmC;IAClF,gBAAgB,CAAkB,gBAAgB,CAGhD;IACF,gBAAgB,CAAS,OAAO,CAAoD;IACpF,gBAAgB,CAAS,SAAS,CAAgB;IAClD,gBAAgB,CAAS,WAAW,GAAkB,IAAI,CAAC;IAC3D,gBAAgB,CAAS,gBAAgB,GAAyB,IAAI,CAAC;IACvE,gBAAgB,CAAS,4BAA4B,GAAW,CAAC,CAAC;IAClE,gBAAgB,CAAS,YAAY,GAAkB,IAAI,CAAC;IAC5D,gBAAgB,CAAS,iBAAiB,GAAyB,IAAI,CAAC;IACxE,gBAAgB,CAAS,mBAAmB,GAAY,KAAK,CAAC;IAE9D,YAAoB,EAChB,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"Llama.js","sourceRoot":"","sources":["../../src/bindings/Llama.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,12 @@ export type LlamaOptions = {
|
|
|
12
12
|
* Disabled by default.
|
|
13
13
|
*/
|
|
14
14
|
cuda?: boolean;
|
|
15
|
+
/**
|
|
16
|
+
* Toggle Vulkan support on llama.cpp.
|
|
17
|
+
* Currently, Vulkan support is experimental. Use with caution.
|
|
18
|
+
* Disabled by default.
|
|
19
|
+
*/
|
|
20
|
+
vulkan?: boolean;
|
|
15
21
|
/**
|
|
16
22
|
* Set the minimum log level for llama.cpp.
|
|
17
23
|
* Defaults to "debug".
|
|
@@ -98,6 +104,6 @@ export declare const getLlamaFunctionName = "getLlama";
|
|
|
98
104
|
export declare function getLlama(): Promise<Llama>;
|
|
99
105
|
export declare function getLlama(options: LlamaOptions, lastBuildOptions?: never): Promise<Llama>;
|
|
100
106
|
export declare function getLlama(type: "lastBuild", lastBuildOptions?: LastBuildOptions): Promise<Llama>;
|
|
101
|
-
export declare function getLlamaForOptions({ metal, cuda, logLevel, logger, build, cmakeOptions, existingPrebuiltBinaryMustMatchBuildOptions, usePrebuiltBinaries, progressLogs, skipDownload }: LlamaOptions, { updateLastBuildInfoOnCompile }?: {
|
|
107
|
+
export declare function getLlamaForOptions({ metal, cuda, vulkan, logLevel, logger, build, cmakeOptions, existingPrebuiltBinaryMustMatchBuildOptions, usePrebuiltBinaries, progressLogs, skipDownload }: LlamaOptions, { updateLastBuildInfoOnCompile }?: {
|
|
102
108
|
updateLastBuildInfoOnCompile?: boolean;
|
|
103
109
|
}): Promise<Llama>;
|
|
@@ -2,7 +2,7 @@ import process from "process";
|
|
|
2
2
|
import path from "path";
|
|
3
3
|
import console from "console";
|
|
4
4
|
import { createRequire } from "module";
|
|
5
|
-
import { builtinLlamaCppGitHubRepo, builtinLlamaCppRelease, defaultLlamaCppCudaSupport, defaultLlamaCppDebugLogs, defaultLlamaCppGitHubRepo, defaultLlamaCppMetalSupport, defaultLlamaCppRelease, defaultSkipDownload, llamaLocalBuildBinsDirectory } from "../config.js";
|
|
5
|
+
import { builtinLlamaCppGitHubRepo, builtinLlamaCppRelease, defaultLlamaCppCudaSupport, defaultLlamaCppDebugLogs, defaultLlamaCppGitHubRepo, defaultLlamaCppMetalSupport, defaultLlamaCppRelease, defaultLlamaCppVulkanSupport, defaultSkipDownload, llamaLocalBuildBinsDirectory } from "../config.js";
|
|
6
6
|
import { getConsoleLogPrefix } from "../utils/getConsoleLogPrefix.js";
|
|
7
7
|
import { waitForLockfileRelease } from "../utils/waitForLockfileRelease.js";
|
|
8
8
|
import { isGithubReleaseNeedsResolving, resolveGithubRelease } from "../utils/resolveGithubRelease.js";
|
|
@@ -53,7 +53,7 @@ export async function getLlama(options, lastBuildOptions) {
|
|
|
53
53
|
}
|
|
54
54
|
return getLlamaForOptions(options ?? {});
|
|
55
55
|
}
|
|
56
|
-
export async function getLlamaForOptions({ metal = defaultLlamaCppMetalSupport, cuda = defaultLlamaCppCudaSupport, logLevel = defaultLlamaCppDebugLogs, logger = Llama.defaultConsoleLogger, build = "auto", cmakeOptions = {}, existingPrebuiltBinaryMustMatchBuildOptions = false, usePrebuiltBinaries = true, progressLogs = true, skipDownload = defaultSkipDownload }, { updateLastBuildInfoOnCompile = false } = {}) {
|
|
56
|
+
export async function getLlamaForOptions({ metal = defaultLlamaCppMetalSupport, cuda = defaultLlamaCppCudaSupport, vulkan = defaultLlamaCppVulkanSupport, logLevel = defaultLlamaCppDebugLogs, logger = Llama.defaultConsoleLogger, build = "auto", cmakeOptions = {}, existingPrebuiltBinaryMustMatchBuildOptions = false, usePrebuiltBinaries = true, progressLogs = true, skipDownload = defaultSkipDownload }, { updateLastBuildInfoOnCompile = false } = {}) {
|
|
57
57
|
const platform = getPlatform();
|
|
58
58
|
const arch = process.arch;
|
|
59
59
|
if (platform !== "mac")
|
|
@@ -84,7 +84,8 @@ export async function getLlamaForOptions({ metal = defaultLlamaCppMetalSupport,
|
|
|
84
84
|
arch,
|
|
85
85
|
computeLayers: {
|
|
86
86
|
metal,
|
|
87
|
-
cuda
|
|
87
|
+
cuda,
|
|
88
|
+
vulkan
|
|
88
89
|
},
|
|
89
90
|
llamaCpp: {
|
|
90
91
|
repo: clonedLlamaCppRepoReleaseInfo?.llamaCppGithubRepo ?? builtinLlamaCppGitHubRepo,
|
|
@@ -193,6 +194,8 @@ function describeBinary(binaryOptions) {
|
|
|
193
194
|
additions.push("with Metal support");
|
|
194
195
|
if (binaryOptions.computeLayers.cuda)
|
|
195
196
|
additions.push("with CUDA support");
|
|
197
|
+
if (binaryOptions.computeLayers.vulkan)
|
|
198
|
+
additions.push("with Vulkan support");
|
|
196
199
|
if (binaryOptions.customCmakeOptions.size > 0)
|
|
197
200
|
additions.push("with custom build options");
|
|
198
201
|
res += additions
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLlama.js","sourceRoot":"","sources":["../../src/bindings/getLlama.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAC,aAAa,EAAC,MAAM,QAAQ,CAAC;AACrC,OAAO,EACH,yBAAyB,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,yBAAyB,EAClI,2BAA2B,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,4BAA4B,
|
|
1
|
+
{"version":3,"file":"getLlama.js","sourceRoot":"","sources":["../../src/bindings/getLlama.ts"],"names":[],"mappings":"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"}
|
package/dist/bindings/types.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/bindings/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/bindings/types.ts"],"names":[],"mappings":"AAuBA,MAAM,UAAU,qCAAqC,CAAC,gBAAkC;IACpF,OAAO;QACH,GAAG,gBAAgB;QACnB,kBAAkB,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;KACnF,CAAC;AACN,CAAC;AAED,MAAM,UAAU,qCAAqC,CAAC,YAA0B;IAC5E,OAAO;QACH,GAAG,YAAY;QACf,kBAAkB,EAAE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,kBAAkB,CAAC;KAC1E,CAAC;AACN,CAAC;AAMD,MAAM,CAAN,IAAY,aAOX;AAPD,WAAY,aAAa;IACrB,sCAAqB,CAAA;IACrB,gCAAe,CAAA;IACf,gCAAe,CAAA;IACf,8BAAa,CAAA;IACb,8BAAa,CAAA;IACb,gCAAe,CAAA;AACnB,CAAC,EAPW,aAAa,KAAb,aAAa,QAOxB;AACD,MAAM,CAAC,MAAM,mBAAmB,GAAG;IAC/B,aAAa,CAAC,QAAQ;IACtB,aAAa,CAAC,KAAK;IACnB,aAAa,CAAC,KAAK;IACnB,aAAa,CAAC,IAAI;IAClB,aAAa,CAAC,IAAI;IAClB,aAAa,CAAC,KAAK;CACb,CAAC"}
|
|
@@ -40,6 +40,8 @@ export async function compileLlamaCpp(buildOptions, { nodeTarget = process.versi
|
|
|
40
40
|
cmakeCustomOptions.set("LLAMA_METAL", "OFF");
|
|
41
41
|
if (buildOptions.computeLayers.cuda && !cmakeCustomOptions.has("LLAMA_CUBLAS"))
|
|
42
42
|
cmakeCustomOptions.set("LLAMA_CUBLAS", "1");
|
|
43
|
+
if (buildOptions.computeLayers.vulkan && !cmakeCustomOptions.has("LLAMA_VULKAN"))
|
|
44
|
+
cmakeCustomOptions.set("LLAMA_VULKAN", "1");
|
|
43
45
|
if (toolchainFile != null && !cmakeCustomOptions.has("CMAKE_TOOLCHAIN_FILE"))
|
|
44
46
|
cmakeCustomOptions.set("CMAKE_TOOLCHAIN_FILE", toolchainFile);
|
|
45
47
|
await fs.remove(outDirectory);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileLLamaCpp.js","sourceRoot":"","sources":["../../../src/bindings/utils/compileLLamaCpp.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"compileLLamaCpp.js","sourceRoot":"","sources":["../../../src/bindings/utils/compileLLamaCpp.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,8 @@ export async function getBuildFolderNameForBuildOptions(buildOptions) {
|
|
|
6
6
|
nameParts.push("metal");
|
|
7
7
|
else if (buildOptions.computeLayers.cuda)
|
|
8
8
|
nameParts.push("cuda");
|
|
9
|
+
if (buildOptions.computeLayers.vulkan)
|
|
10
|
+
nameParts.push("vulkan");
|
|
9
11
|
if (buildOptions.llamaCpp.repo !== builtinLlamaCppGitHubRepo || buildOptions.llamaCpp.release !== builtinLlamaCppRelease)
|
|
10
12
|
nameParts.push("release-" + await getFolderNamePartForRelease(buildOptions.llamaCpp.repo, buildOptions.llamaCpp.release));
|
|
11
13
|
if (buildOptions.customCmakeOptions.size === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBuildFolderNameForBuildOptions.js","sourceRoot":"","sources":["../../../src/bindings/utils/getBuildFolderNameForBuildOptions.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"getBuildFolderNameForBuildOptions.js","sourceRoot":"","sources":["../../../src/bindings/utils/getBuildFolderNameForBuildOptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,8 @@ export function resolveCustomCmakeOptions(customCmakeOptions) {
|
|
|
8
8
|
newCustomCmakeOptions.set("LLAMA_METAL", "1");
|
|
9
9
|
if (process.env.LLAMA_CUBLAS === "1")
|
|
10
10
|
newCustomCmakeOptions.set("LLAMA_CUBLAS", "1");
|
|
11
|
+
if (process.env.LLAMA_VULKAN === "1")
|
|
12
|
+
newCustomCmakeOptions.set("LLAMA_VULKAN", "1");
|
|
11
13
|
if (process.env.LLAMA_MPI === "1")
|
|
12
14
|
newCustomCmakeOptions.set("LLAMA_MPI", "1");
|
|
13
15
|
if (process.env.LLAMA_OPENBLAS === "1")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveCustomCmakeOptions.js","sourceRoot":"","sources":["../../../src/bindings/utils/resolveCustomCmakeOptions.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"resolveCustomCmakeOptions.js","sourceRoot":"","sources":["../../../src/bindings/utils/resolveCustomCmakeOptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,9 @@ type BuildCommand = {
|
|
|
4
4
|
nodeTarget?: string;
|
|
5
5
|
metal?: boolean;
|
|
6
6
|
cuda?: boolean;
|
|
7
|
+
vulkan?: boolean;
|
|
7
8
|
noUsageExample?: boolean;
|
|
8
9
|
};
|
|
9
10
|
export declare const BuildCommand: CommandModule<object, BuildCommand>;
|
|
10
|
-
export declare function BuildLlamaCppCommand({ arch, nodeTarget, metal, cuda, noUsageExample, noCustomCmakeBuildOptionsInBinaryFolderName }: BuildCommand): Promise<void>;
|
|
11
|
+
export declare function BuildLlamaCppCommand({ arch, nodeTarget, metal, cuda, vulkan, noUsageExample, noCustomCmakeBuildOptionsInBinaryFolderName }: BuildCommand): Promise<void>;
|
|
11
12
|
export {};
|
|
@@ -3,7 +3,7 @@ import chalk from "chalk";
|
|
|
3
3
|
import { compileLlamaCpp } from "../../bindings/utils/compileLLamaCpp.js";
|
|
4
4
|
import withOra from "../../utils/withOra.js";
|
|
5
5
|
import { clearTempFolder } from "../../utils/clearTempFolder.js";
|
|
6
|
-
import { builtinLlamaCppGitHubRepo, builtinLlamaCppRelease, defaultLlamaCppCudaSupport,
|
|
6
|
+
import { builtinLlamaCppGitHubRepo, builtinLlamaCppRelease, defaultLlamaCppMetalSupport, defaultLlamaCppCudaSupport, defaultLlamaCppVulkanSupport, isCI } from "../../config.js";
|
|
7
7
|
import { downloadCmakeIfNeeded } from "../../utils/cmake.js";
|
|
8
8
|
import withStatusLogs from "../../utils/withStatusLogs.js";
|
|
9
9
|
import { getIsInDocumentationMode } from "../../state.js";
|
|
@@ -11,6 +11,7 @@ import { logBinaryUsageExampleToConsole } from "../../bindings/utils/logBinaryUs
|
|
|
11
11
|
import { getPlatform } from "../../bindings/utils/getPlatform.js";
|
|
12
12
|
import { resolveCustomCmakeOptions } from "../../bindings/utils/resolveCustomCmakeOptions.js";
|
|
13
13
|
import { getClonedLlamaCppRepoReleaseInfo, isLlamaCppRepoCloned } from "../../bindings/utils/cloneLlamaCppRepo.js";
|
|
14
|
+
import { logEnabledComputeLayers } from "../utils/logEnabledComputeLayers.js";
|
|
14
15
|
export const BuildCommand = {
|
|
15
16
|
command: "build",
|
|
16
17
|
describe: "Compile the currently downloaded llama.cpp",
|
|
@@ -36,6 +37,11 @@ export const BuildCommand = {
|
|
|
36
37
|
type: "boolean",
|
|
37
38
|
default: defaultLlamaCppCudaSupport,
|
|
38
39
|
description: "Compile llama.cpp with CUDA support. Can also be set via the NODE_LLAMA_CPP_CUDA environment variable"
|
|
40
|
+
})
|
|
41
|
+
.option("vulkan", {
|
|
42
|
+
type: "boolean",
|
|
43
|
+
default: defaultLlamaCppVulkanSupport,
|
|
44
|
+
description: "Compile llama.cpp with Vulkan support. Can also be set via the NODE_LLAMA_CPP_VULKAN environment variable"
|
|
39
45
|
})
|
|
40
46
|
.option("noUsageExample", {
|
|
41
47
|
alias: "nu",
|
|
@@ -52,7 +58,7 @@ export const BuildCommand = {
|
|
|
52
58
|
},
|
|
53
59
|
handler: BuildLlamaCppCommand
|
|
54
60
|
};
|
|
55
|
-
export async function BuildLlamaCppCommand({ arch = undefined, nodeTarget = undefined, metal = defaultLlamaCppMetalSupport, cuda = defaultLlamaCppCudaSupport, noUsageExample = false, noCustomCmakeBuildOptionsInBinaryFolderName = false }) {
|
|
61
|
+
export async function BuildLlamaCppCommand({ arch = undefined, nodeTarget = undefined, metal = defaultLlamaCppMetalSupport, cuda = defaultLlamaCppCudaSupport, vulkan = defaultLlamaCppVulkanSupport, noUsageExample = false, noCustomCmakeBuildOptionsInBinaryFolderName = false }) {
|
|
56
62
|
if (!(await isLlamaCppRepoCloned())) {
|
|
57
63
|
console.log(chalk.red('llama.cpp is not downloaded. Please run "node-llama-cpp download" first'));
|
|
58
64
|
process.exit(1);
|
|
@@ -61,12 +67,7 @@ export async function BuildLlamaCppCommand({ arch = undefined, nodeTarget = unde
|
|
|
61
67
|
const clonedLlamaCppRepoReleaseInfo = await getClonedLlamaCppRepoReleaseInfo();
|
|
62
68
|
const platform = getPlatform();
|
|
63
69
|
const customCmakeOptions = resolveCustomCmakeOptions();
|
|
64
|
-
|
|
65
|
-
console.log(`${chalk.yellow("Metal:")} enabled`);
|
|
66
|
-
}
|
|
67
|
-
if (cuda) {
|
|
68
|
-
console.log(`${chalk.yellow("CUDA:")} enabled`);
|
|
69
|
-
}
|
|
70
|
+
logEnabledComputeLayers({ metal, cuda, vulkan }, { platform });
|
|
70
71
|
await downloadCmakeIfNeeded(true);
|
|
71
72
|
const buildOptions = {
|
|
72
73
|
customCmakeOptions,
|
|
@@ -77,7 +78,8 @@ export async function BuildLlamaCppCommand({ arch = undefined, nodeTarget = unde
|
|
|
77
78
|
: process.arch,
|
|
78
79
|
computeLayers: {
|
|
79
80
|
metal,
|
|
80
|
-
cuda
|
|
81
|
+
cuda,
|
|
82
|
+
vulkan
|
|
81
83
|
},
|
|
82
84
|
llamaCpp: {
|
|
83
85
|
repo: clonedLlamaCppRepoReleaseInfo?.llamaCppGithubRepo ?? builtinLlamaCppGitHubRepo,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuildCommand.js","sourceRoot":"","sources":["../../../src/cli/commands/BuildCommand.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,eAAe,EAAC,MAAM,yCAAyC,CAAC;AACxE,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,EAAC,eAAe,EAAC,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EACH,yBAAyB,EAAE,sBAAsB,EAAE,
|
|
1
|
+
{"version":3,"file":"BuildCommand.js","sourceRoot":"","sources":["../../../src/cli/commands/BuildCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import bytes from "bytes";
|
|
|
3
3
|
import chalk from "chalk";
|
|
4
4
|
import { getLlama } from "../../bindings/getLlama.js";
|
|
5
5
|
import { prettyPrintObject } from "../../utils/prettyPrintObject.js";
|
|
6
|
+
import { logEnabledComputeLayers } from "../utils/logEnabledComputeLayers.js";
|
|
6
7
|
const debugFunctions = ["vram", "cmakeOptions"];
|
|
7
8
|
export const DebugCommand = {
|
|
8
9
|
command: "debug [function]",
|
|
@@ -32,11 +33,16 @@ async function DebugVramFunction() {
|
|
|
32
33
|
const freeMemory = os.freemem();
|
|
33
34
|
const usedMemory = totalMemory - freeMemory;
|
|
34
35
|
logComputeLayers(llama);
|
|
35
|
-
|
|
36
|
-
|
|
36
|
+
const getPercentageString = (amount, total) => {
|
|
37
|
+
if (total === 0)
|
|
38
|
+
return "0";
|
|
39
|
+
return String(Math.floor((amount / total) * 100 * 100) / 100);
|
|
40
|
+
};
|
|
41
|
+
console.info(`${chalk.yellow("Used VRAM:")} ${getPercentageString(vramStatus.used, vramStatus.total)}% ${chalk.grey("(" + bytes(vramStatus.used) + "/" + bytes(vramStatus.total) + ")")}`);
|
|
42
|
+
console.info(`${chalk.yellow("Free VRAM:")} ${getPercentageString(vramStatus.free, vramStatus.total)}% ${chalk.grey("(" + bytes(vramStatus.free) + "/" + bytes(vramStatus.total) + ")")}`);
|
|
37
43
|
console.info();
|
|
38
|
-
console.info(`${chalk.yellow("Used RAM:")} ${
|
|
39
|
-
console.info(`${chalk.yellow("Free RAM:")} ${
|
|
44
|
+
console.info(`${chalk.yellow("Used RAM:")} ${getPercentageString(usedMemory, totalMemory)}% ${chalk.grey("(" + bytes(usedMemory) + "/" + bytes(totalMemory) + ")")}`);
|
|
45
|
+
console.info(`${chalk.yellow("Free RAM:")} ${getPercentageString(freeMemory, totalMemory)}% ${chalk.grey("(" + bytes(freeMemory) + "/" + bytes(totalMemory) + ")")}`);
|
|
40
46
|
}
|
|
41
47
|
async function DebugCmakeOptionsFunction() {
|
|
42
48
|
const llama = await getLlama("lastBuild");
|
|
@@ -44,15 +50,12 @@ async function DebugCmakeOptionsFunction() {
|
|
|
44
50
|
console.info(`${chalk.yellow("CMake options:")} ${prettyPrintObject(llama.cmakeOptions)}`);
|
|
45
51
|
}
|
|
46
52
|
function logComputeLayers(llama) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
console.info(`${chalk.yellow("Metal:")} enabled`);
|
|
54
|
-
hasEnabledLayers = true;
|
|
55
|
-
}
|
|
53
|
+
logEnabledComputeLayers({
|
|
54
|
+
metal: llama.metal,
|
|
55
|
+
cuda: llama.cuda,
|
|
56
|
+
vulkan: llama.vulkan
|
|
57
|
+
});
|
|
58
|
+
const hasEnabledLayers = llama.metal || llama.cuda || llama.vulkan;
|
|
56
59
|
if (hasEnabledLayers)
|
|
57
60
|
console.info();
|
|
58
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DebugCommand.js","sourceRoot":"","sources":["../../../src/cli/commands/DebugCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,QAAQ,EAAC,MAAM,4BAA4B,CAAC;AAEpD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"DebugCommand.js","sourceRoot":"","sources":["../../../src/cli/commands/DebugCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,11 @@ type DownloadCommandArgs = {
|
|
|
6
6
|
nodeTarget?: string;
|
|
7
7
|
metal?: boolean;
|
|
8
8
|
cuda?: boolean;
|
|
9
|
+
vulkan?: boolean;
|
|
9
10
|
skipBuild?: boolean;
|
|
10
11
|
noBundle?: boolean;
|
|
11
12
|
noUsageExample?: boolean;
|
|
12
13
|
};
|
|
13
14
|
export declare const DownloadCommand: CommandModule<object, DownloadCommandArgs>;
|
|
14
|
-
export declare function DownloadLlamaCppCommand({ repo, release, arch, nodeTarget, metal, cuda, skipBuild, noBundle, noUsageExample, updateBinariesReleaseMetadataAndSaveGitBundle }: DownloadCommandArgs): Promise<void>;
|
|
15
|
+
export declare function DownloadLlamaCppCommand({ repo, release, arch, nodeTarget, metal, cuda, vulkan, skipBuild, noBundle, noUsageExample, updateBinariesReleaseMetadataAndSaveGitBundle }: DownloadCommandArgs): Promise<void>;
|
|
15
16
|
export {};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import process from "process";
|
|
2
2
|
import fs from "fs-extra";
|
|
3
3
|
import chalk from "chalk";
|
|
4
|
-
import { defaultLlamaCppCudaSupport, defaultLlamaCppGitHubRepo, defaultLlamaCppMetalSupport, defaultLlamaCppRelease, isCI, llamaCppDirectory, llamaCppDirectoryInfoFilePath } from "../../config.js";
|
|
4
|
+
import { defaultLlamaCppCudaSupport, defaultLlamaCppVulkanSupport, defaultLlamaCppGitHubRepo, defaultLlamaCppMetalSupport, defaultLlamaCppRelease, isCI, llamaCppDirectory, llamaCppDirectoryInfoFilePath } from "../../config.js";
|
|
5
5
|
import { compileLlamaCpp } from "../../bindings/utils/compileLLamaCpp.js";
|
|
6
6
|
import withOra from "../../utils/withOra.js";
|
|
7
7
|
import { clearTempFolder } from "../../utils/clearTempFolder.js";
|
|
@@ -15,6 +15,7 @@ import { getPlatform } from "../../bindings/utils/getPlatform.js";
|
|
|
15
15
|
import { resolveCustomCmakeOptions } from "../../bindings/utils/resolveCustomCmakeOptions.js";
|
|
16
16
|
import { logBinaryUsageExampleToConsole } from "../../bindings/utils/logBinaryUsageExampleToConsole.js";
|
|
17
17
|
import { resolveGithubRelease } from "../../utils/resolveGithubRelease.js";
|
|
18
|
+
import { logEnabledComputeLayers } from "../utils/logEnabledComputeLayers.js";
|
|
18
19
|
export const DownloadCommand = {
|
|
19
20
|
command: "download",
|
|
20
21
|
describe: "Download a release of llama.cpp and compile it",
|
|
@@ -51,6 +52,11 @@ export const DownloadCommand = {
|
|
|
51
52
|
type: "boolean",
|
|
52
53
|
default: defaultLlamaCppCudaSupport,
|
|
53
54
|
description: "Compile llama.cpp with CUDA support. Can also be set via the NODE_LLAMA_CPP_CUDA environment variable"
|
|
55
|
+
})
|
|
56
|
+
.option("vulkan", {
|
|
57
|
+
type: "boolean",
|
|
58
|
+
default: defaultLlamaCppVulkanSupport,
|
|
59
|
+
description: "Compile llama.cpp with Vulkan support. Can also be set via the NODE_LLAMA_CPP_VULKAN environment variable"
|
|
54
60
|
})
|
|
55
61
|
.option("skipBuild", {
|
|
56
62
|
alias: "sb",
|
|
@@ -80,7 +86,7 @@ export const DownloadCommand = {
|
|
|
80
86
|
handler: DownloadLlamaCppCommand
|
|
81
87
|
};
|
|
82
88
|
// TODO: clear the builds folder
|
|
83
|
-
export async function DownloadLlamaCppCommand({ repo = defaultLlamaCppGitHubRepo, release = defaultLlamaCppRelease, arch = undefined, nodeTarget = undefined, metal = defaultLlamaCppMetalSupport, cuda = defaultLlamaCppCudaSupport, skipBuild = false, noBundle = false, noUsageExample = false, updateBinariesReleaseMetadataAndSaveGitBundle = false }) {
|
|
89
|
+
export async function DownloadLlamaCppCommand({ repo = defaultLlamaCppGitHubRepo, release = defaultLlamaCppRelease, arch = undefined, nodeTarget = undefined, metal = defaultLlamaCppMetalSupport, cuda = defaultLlamaCppCudaSupport, vulkan = defaultLlamaCppVulkanSupport, skipBuild = false, noBundle = false, noUsageExample = false, updateBinariesReleaseMetadataAndSaveGitBundle = false }) {
|
|
84
90
|
const useBundle = noBundle != true;
|
|
85
91
|
const platform = getPlatform();
|
|
86
92
|
const customCmakeOptions = resolveCustomCmakeOptions();
|
|
@@ -88,12 +94,7 @@ export async function DownloadLlamaCppCommand({ repo = defaultLlamaCppGitHubRepo
|
|
|
88
94
|
console.log(`${chalk.yellow("Repo:")} ${repo}`);
|
|
89
95
|
console.log(`${chalk.yellow("Release:")} ${release}`);
|
|
90
96
|
if (!skipBuild) {
|
|
91
|
-
|
|
92
|
-
console.log(`${chalk.yellow("Metal:")} enabled`);
|
|
93
|
-
}
|
|
94
|
-
if (cuda) {
|
|
95
|
-
console.log(`${chalk.yellow("CUDA:")} enabled`);
|
|
96
|
-
}
|
|
97
|
+
logEnabledComputeLayers({ metal, cuda, vulkan }, { platform });
|
|
97
98
|
}
|
|
98
99
|
console.log();
|
|
99
100
|
let githubReleaseTag = (useBundle && (await getGitBundlePathForRelease(githubOwner, githubRepo, release)) != null)
|
|
@@ -127,7 +128,8 @@ export async function DownloadLlamaCppCommand({ repo = defaultLlamaCppGitHubRepo
|
|
|
127
128
|
: process.arch,
|
|
128
129
|
computeLayers: {
|
|
129
130
|
metal,
|
|
130
|
-
cuda
|
|
131
|
+
cuda,
|
|
132
|
+
vulkan
|
|
131
133
|
},
|
|
132
134
|
llamaCpp: {
|
|
133
135
|
repo,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DownloadCommand.js","sourceRoot":"","sources":["../../../src/cli/commands/DownloadCommand.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACH,0BAA0B,EAAE,yBAAyB,EAAE,2BAA2B,
|
|
1
|
+
{"version":3,"file":"DownloadCommand.js","sourceRoot":"","sources":["../../../src/cli/commands/DownloadCommand.ts"],"names":[],"mappings":"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"}
|