node-llama-cpp 3.0.0-beta.11 → 3.0.0-beta.13
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/ChatWrapper.d.ts +1 -0
- package/dist/ChatWrapper.js +2 -1
- package/dist/ChatWrapper.js.map +1 -1
- package/dist/TemplateChatWrapper.d.ts +67 -0
- package/dist/TemplateChatWrapper.js +239 -0
- package/dist/TemplateChatWrapper.js.map +1 -0
- package/dist/bindings/AddonTypes.d.ts +2 -0
- package/dist/bindings/Llama.d.ts +1 -2
- package/dist/bindings/Llama.js +10 -14
- package/dist/bindings/Llama.js.map +1 -1
- package/dist/bindings/consts.d.ts +2 -0
- package/dist/bindings/consts.js +11 -0
- package/dist/bindings/consts.js.map +1 -0
- package/dist/bindings/getLlama.d.ts +14 -12
- package/dist/bindings/getLlama.js +210 -75
- package/dist/bindings/getLlama.js.map +1 -1
- package/dist/bindings/types.d.ts +8 -4
- package/dist/bindings/types.js +18 -0
- package/dist/bindings/types.js.map +1 -1
- package/dist/bindings/utils/asyncEvery.d.ts +5 -0
- package/dist/bindings/utils/asyncEvery.js +15 -0
- package/dist/bindings/utils/asyncEvery.js.map +1 -0
- package/dist/bindings/utils/asyncSome.d.ts +5 -0
- package/dist/bindings/utils/asyncSome.js +27 -0
- package/dist/bindings/utils/asyncSome.js.map +1 -0
- package/dist/bindings/utils/cloneLlamaCppRepo.js +13 -3
- package/dist/bindings/utils/cloneLlamaCppRepo.js.map +1 -1
- package/dist/bindings/utils/compileLLamaCpp.js +31 -3
- package/dist/bindings/utils/compileLLamaCpp.js.map +1 -1
- package/dist/bindings/utils/detectAvailableComputeLayers.d.ts +11 -0
- package/dist/bindings/utils/detectAvailableComputeLayers.js +158 -0
- package/dist/bindings/utils/detectAvailableComputeLayers.js.map +1 -0
- package/dist/bindings/utils/detectGlibc.d.ts +4 -0
- package/dist/bindings/utils/detectGlibc.js +36 -0
- package/dist/bindings/utils/detectGlibc.js.map +1 -0
- package/dist/bindings/utils/getBestComputeLayersAvailable.d.ts +9 -0
- package/dist/bindings/utils/getBestComputeLayersAvailable.js +29 -0
- package/dist/bindings/utils/getBestComputeLayersAvailable.js.map +1 -0
- package/dist/bindings/utils/getBuildFolderNameForBuildOptions.js +12 -4
- package/dist/bindings/utils/getBuildFolderNameForBuildOptions.js.map +1 -1
- package/dist/bindings/utils/getGpuTypesToUseForOption.d.ts +11 -0
- package/dist/bindings/utils/getGpuTypesToUseForOption.js +30 -0
- package/dist/bindings/utils/getGpuTypesToUseForOption.js.map +1 -0
- package/dist/bindings/utils/getLinuxDistroInfo.d.ts +9 -0
- package/dist/bindings/utils/getLinuxDistroInfo.js +46 -0
- package/dist/bindings/utils/getLinuxDistroInfo.js.map +1 -0
- package/dist/bindings/utils/getPlatformInfo.d.ts +5 -0
- package/dist/bindings/utils/getPlatformInfo.js +28 -0
- package/dist/bindings/utils/getPlatformInfo.js.map +1 -0
- package/dist/bindings/utils/hasFileInPath.d.ts +2 -0
- package/dist/bindings/utils/hasFileInPath.js +34 -0
- package/dist/bindings/utils/hasFileInPath.js.map +1 -0
- package/dist/bindings/utils/logBinaryUsageExampleToConsole.d.ts +1 -1
- package/dist/bindings/utils/logBinaryUsageExampleToConsole.js +3 -9
- package/dist/bindings/utils/logBinaryUsageExampleToConsole.js.map +1 -1
- package/dist/bindings/utils/logDistroInstallInstruction.d.ts +13 -0
- package/dist/bindings/utils/logDistroInstallInstruction.js +38 -0
- package/dist/bindings/utils/logDistroInstallInstruction.js.map +1 -0
- package/dist/bindings/utils/resolveChatWrapperBasedOnWrapperTypeName.d.ts +9 -2
- package/dist/bindings/utils/resolveChatWrapperBasedOnWrapperTypeName.js +10 -4
- package/dist/bindings/utils/resolveChatWrapperBasedOnWrapperTypeName.js.map +1 -1
- package/dist/bindings/utils/resolveCustomCmakeOptions.js +2 -0
- package/dist/bindings/utils/resolveCustomCmakeOptions.js.map +1 -1
- package/dist/bindings/utils/testBindingBinary.d.ts +1 -0
- package/dist/bindings/utils/testBindingBinary.js +98 -0
- package/dist/bindings/utils/testBindingBinary.js.map +1 -0
- package/dist/chatWrappers/ChatMLChatWrapper.js +1 -1
- package/dist/chatWrappers/ChatMLChatWrapper.js.map +1 -1
- package/dist/chatWrappers/GemmaChatWrapper.d.ts +18 -0
- package/dist/chatWrappers/GemmaChatWrapper.js +86 -0
- package/dist/chatWrappers/GemmaChatWrapper.js.map +1 -0
- package/dist/chatWrappers/resolveChatWrapperBasedOnModel.js +3 -0
- package/dist/chatWrappers/resolveChatWrapperBasedOnModel.js.map +1 -1
- package/dist/cli/cli.js +2 -0
- package/dist/cli/cli.js.map +1 -1
- package/dist/cli/commands/BuildCommand.d.ts +5 -4
- package/dist/cli/commands/BuildCommand.js +78 -58
- package/dist/cli/commands/BuildCommand.js.map +1 -1
- package/dist/cli/commands/DebugCommand.js +12 -15
- package/dist/cli/commands/DebugCommand.js.map +1 -1
- package/dist/cli/commands/DownloadCommand.d.ts +5 -4
- package/dist/cli/commands/DownloadCommand.js +97 -54
- package/dist/cli/commands/DownloadCommand.js.map +1 -1
- package/dist/cli/commands/InspectCommand.d.ts +7 -0
- package/dist/cli/commands/InspectCommand.js +113 -0
- package/dist/cli/commands/InspectCommand.js.map +1 -0
- package/dist/cli/utils/logUsedGpuTypeOption.d.ts +2 -0
- package/dist/cli/utils/logUsedGpuTypeOption.js +9 -0
- package/dist/cli/utils/logUsedGpuTypeOption.js.map +1 -0
- package/dist/config.d.ts +3 -2
- package/dist/config.js +12 -10
- package/dist/config.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.d.ts +3 -0
- package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.js +3 -0
- package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.js.map +1 -1
- package/dist/gguf/GGUFInsights.d.ts +28 -0
- package/dist/gguf/GGUFInsights.js +58 -0
- package/dist/gguf/GGUFInsights.js.map +1 -0
- package/dist/gguf/GGUFMetadata.d.ts +19 -0
- package/dist/gguf/GGUFMetadata.js +38 -0
- package/dist/gguf/GGUFMetadata.js.map +1 -0
- package/dist/gguf/errors/InvalidGGUFMagicError.d.ts +3 -0
- package/dist/gguf/errors/InvalidGGUFMagicError.js +6 -0
- package/dist/gguf/errors/InvalidGGUFMagicError.js.map +1 -0
- package/dist/gguf/errors/MetadataNotParsedYetError.d.ts +3 -0
- package/dist/gguf/errors/MetadataNotParsedYetError.js +6 -0
- package/dist/gguf/errors/MetadataNotParsedYetError.js.map +1 -0
- package/dist/gguf/errors/MissingNodeLlamaError.d.ts +3 -0
- package/dist/gguf/errors/MissingNodeLlamaError.js +6 -0
- package/dist/gguf/errors/MissingNodeLlamaError.js.map +1 -0
- package/dist/gguf/errors/ModelScore/NotEnoughVRamError.d.ts +5 -0
- package/dist/gguf/errors/ModelScore/NotEnoughVRamError.js +12 -0
- package/dist/gguf/errors/ModelScore/NotEnoughVRamError.js.map +1 -0
- package/dist/gguf/errors/UnsupportedMetadataTypeError.d.ts +4 -0
- package/dist/gguf/errors/UnsupportedMetadataTypeError.js +8 -0
- package/dist/gguf/errors/UnsupportedMetadataTypeError.js.map +1 -0
- package/dist/gguf/ggufParser/GGUFParser.d.ts +18 -0
- package/dist/gguf/ggufParser/GGUFParser.js +123 -0
- package/dist/gguf/ggufParser/GGUFParser.js.map +1 -0
- package/dist/gguf/ggufParser/GGUFTypes.d.ts +257 -0
- package/dist/gguf/ggufParser/GGUFTypes.js +2 -0
- package/dist/gguf/ggufParser/GGUFTypes.js.map +1 -0
- package/dist/gguf/ggufParser/checkArchitecture.d.ts +14 -0
- package/dist/gguf/ggufParser/checkArchitecture.js +74 -0
- package/dist/gguf/ggufParser/checkArchitecture.js.map +1 -0
- package/dist/gguf/ggufParser/stream/GGUFBaseStream.d.ts +38 -0
- package/dist/gguf/ggufParser/stream/GGUFBaseStream.js +83 -0
- package/dist/gguf/ggufParser/stream/GGUFBaseStream.js.map +1 -0
- package/dist/gguf/ggufParser/stream/GGUFFetchStream.d.ts +14 -0
- package/dist/gguf/ggufParser/stream/GGUFFetchStream.js +35 -0
- package/dist/gguf/ggufParser/stream/GGUFFetchStream.js.map +1 -0
- package/dist/gguf/ggufParser/stream/GGUFReadStream.d.ts +15 -0
- package/dist/gguf/ggufParser/stream/GGUFReadStream.js +40 -0
- package/dist/gguf/ggufParser/stream/GGUFReadStream.js.map +1 -0
- package/dist/index.d.ts +3 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/utils/LlamaText.js +2 -2
- package/dist/utils/LlamaText.js.map +1 -1
- package/dist/utils/cmake.js +23 -10
- package/dist/utils/cmake.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 -2
- package/dist/utils/getBuildDefaults.js +2 -3
- package/dist/utils/getBuildDefaults.js.map +1 -1
- package/dist/utils/getConsoleLogPrefix.d.ts +1 -1
- package/dist/utils/getConsoleLogPrefix.js +2 -2
- package/dist/utils/getConsoleLogPrefix.js.map +1 -1
- package/dist/utils/mergeUnionTypes.d.ts +6 -0
- package/dist/utils/mergeUnionTypes.js +2 -0
- package/dist/utils/mergeUnionTypes.js.map +1 -0
- package/dist/utils/parseTextTemplate.d.ts +66 -0
- package/dist/utils/parseTextTemplate.js +116 -0
- package/dist/utils/parseTextTemplate.js.map +1 -0
- package/llama/CMakeLists.txt +30 -4
- package/llama/addon.cpp +62 -7
- 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 +1382 -142
- 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 +7 -4
|
@@ -3,23 +3,28 @@ 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,
|
|
6
|
+
import { builtinLlamaCppGitHubRepo, builtinLlamaCppRelease, isCI, defaultLlamaCppGpuSupport } from "../../config.js";
|
|
7
7
|
import { downloadCmakeIfNeeded } from "../../utils/cmake.js";
|
|
8
8
|
import withStatusLogs from "../../utils/withStatusLogs.js";
|
|
9
|
-
import { getIsInDocumentationMode } from "../../state.js";
|
|
10
9
|
import { logBinaryUsageExampleToConsole } from "../../bindings/utils/logBinaryUsageExampleToConsole.js";
|
|
11
10
|
import { getPlatform } from "../../bindings/utils/getPlatform.js";
|
|
12
11
|
import { resolveCustomCmakeOptions } from "../../bindings/utils/resolveCustomCmakeOptions.js";
|
|
13
12
|
import { getClonedLlamaCppRepoReleaseInfo, isLlamaCppRepoCloned } from "../../bindings/utils/cloneLlamaCppRepo.js";
|
|
13
|
+
import { nodeLlamaCppGpuOptions, parseNodeLlamaCppGpuOption } from "../../bindings/types.js";
|
|
14
|
+
import { logUsedGpuTypeOption } from "../utils/logUsedGpuTypeOption.js";
|
|
15
|
+
import { getGpuTypesToUseForOption } from "../../bindings/utils/getGpuTypesToUseForOption.js";
|
|
16
|
+
import { getConsoleLogPrefix } from "../../utils/getConsoleLogPrefix.js";
|
|
17
|
+
import { getPrettyBuildGpuName } from "../../bindings/consts.js";
|
|
18
|
+
import { getPlatformInfo } from "../../bindings/utils/getPlatformInfo.js";
|
|
14
19
|
export const BuildCommand = {
|
|
15
20
|
command: "build",
|
|
16
21
|
describe: "Compile the currently downloaded llama.cpp",
|
|
17
22
|
builder(yargs) {
|
|
18
|
-
const isInDocumentationMode = getIsInDocumentationMode();
|
|
19
23
|
return yargs
|
|
20
24
|
.option("arch", {
|
|
21
25
|
alias: "a",
|
|
22
26
|
type: "string",
|
|
27
|
+
coerce: (value) => value,
|
|
23
28
|
description: "The architecture to compile llama.cpp for"
|
|
24
29
|
})
|
|
25
30
|
.option("nodeTarget", {
|
|
@@ -27,15 +32,13 @@ export const BuildCommand = {
|
|
|
27
32
|
type: "string",
|
|
28
33
|
description: "The Node.js version to compile llama.cpp for. Example: v18.0.0"
|
|
29
34
|
})
|
|
30
|
-
.option("
|
|
31
|
-
type: "
|
|
32
|
-
default:
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
default: defaultLlamaCppCudaSupport,
|
|
38
|
-
description: "Compile llama.cpp with CUDA support. Can also be set via the NODE_LLAMA_CPP_CUDA environment variable"
|
|
35
|
+
.option("gpu", {
|
|
36
|
+
type: "string",
|
|
37
|
+
default: defaultLlamaCppGpuSupport,
|
|
38
|
+
// yargs types don't support passing `false` as a choice, although it is supported by yargs
|
|
39
|
+
choices: nodeLlamaCppGpuOptions,
|
|
40
|
+
coerce: parseNodeLlamaCppGpuOption,
|
|
41
|
+
description: "Compute layer implementation type to use for llama.cpp"
|
|
39
42
|
})
|
|
40
43
|
.option("noUsageExample", {
|
|
41
44
|
alias: "nu",
|
|
@@ -52,7 +55,7 @@ export const BuildCommand = {
|
|
|
52
55
|
},
|
|
53
56
|
handler: BuildLlamaCppCommand
|
|
54
57
|
};
|
|
55
|
-
export async function BuildLlamaCppCommand({ arch = undefined, nodeTarget = undefined,
|
|
58
|
+
export async function BuildLlamaCppCommand({ arch = undefined, nodeTarget = undefined, gpu = defaultLlamaCppGpuSupport, noUsageExample = false, noCustomCmakeBuildOptionsInBinaryFolderName = false }) {
|
|
56
59
|
if (!(await isLlamaCppRepoCloned())) {
|
|
57
60
|
console.log(chalk.red('llama.cpp is not downloaded. Please run "node-llama-cpp download" first'));
|
|
58
61
|
process.exit(1);
|
|
@@ -60,54 +63,71 @@ export async function BuildLlamaCppCommand({ arch = undefined, nodeTarget = unde
|
|
|
60
63
|
const includeBuildOptionsInBinaryFolderName = !noCustomCmakeBuildOptionsInBinaryFolderName || !isCI;
|
|
61
64
|
const clonedLlamaCppRepoReleaseInfo = await getClonedLlamaCppRepoReleaseInfo();
|
|
62
65
|
const platform = getPlatform();
|
|
66
|
+
const platformInfo = await getPlatformInfo();
|
|
63
67
|
const customCmakeOptions = resolveCustomCmakeOptions();
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
68
|
+
const buildGpusToTry = await getGpuTypesToUseForOption(gpu, { platform, arch });
|
|
69
|
+
let downloadedCmake = false;
|
|
70
|
+
for (let i = 0; i < buildGpusToTry.length; i++) {
|
|
71
|
+
const gpuToTry = buildGpusToTry[i];
|
|
72
|
+
const isLastItem = i === buildGpusToTry.length - 1;
|
|
73
|
+
logUsedGpuTypeOption(gpuToTry);
|
|
74
|
+
if (!downloadedCmake) {
|
|
75
|
+
await downloadCmakeIfNeeded(true);
|
|
76
|
+
downloadedCmake = true;
|
|
77
|
+
}
|
|
78
|
+
const buildOptions = {
|
|
79
|
+
customCmakeOptions,
|
|
80
|
+
progressLogs: true,
|
|
81
|
+
platform,
|
|
82
|
+
platformInfo,
|
|
83
|
+
arch: arch
|
|
84
|
+
? arch
|
|
85
|
+
: process.arch,
|
|
86
|
+
gpu: gpuToTry,
|
|
87
|
+
llamaCpp: {
|
|
88
|
+
repo: clonedLlamaCppRepoReleaseInfo?.llamaCppGithubRepo ?? builtinLlamaCppGitHubRepo,
|
|
89
|
+
release: clonedLlamaCppRepoReleaseInfo?.tag ?? builtinLlamaCppRelease
|
|
90
|
+
}
|
|
91
|
+
};
|
|
92
|
+
try {
|
|
93
|
+
await withStatusLogs({
|
|
94
|
+
loading: chalk.blue("Compiling llama.cpp"),
|
|
95
|
+
success: chalk.blue("Compiled llama.cpp"),
|
|
96
|
+
fail: chalk.blue("Failed to compile llama.cpp")
|
|
97
|
+
}, async () => {
|
|
98
|
+
await compileLlamaCpp(buildOptions, {
|
|
99
|
+
nodeTarget: nodeTarget ? nodeTarget : undefined,
|
|
100
|
+
updateLastBuildInfo: true,
|
|
101
|
+
downloadCmakeIfNeeded: false,
|
|
102
|
+
ensureLlamaCppRepoIsCloned: false,
|
|
103
|
+
includeBuildOptionsInBinaryFolderName
|
|
104
|
+
});
|
|
105
|
+
});
|
|
85
106
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
107
|
+
catch (err) {
|
|
108
|
+
console.error(getConsoleLogPrefix() +
|
|
109
|
+
`Failed to build llama.cpp with ${getPrettyBuildGpuName(gpuToTry)} support. ` +
|
|
110
|
+
(!isLastItem
|
|
111
|
+
? `falling back to building llama.cpp with ${getPrettyBuildGpuName(buildGpusToTry[i + 1])} support. `
|
|
112
|
+
: "") +
|
|
113
|
+
"Error:", err);
|
|
114
|
+
if (isLastItem)
|
|
115
|
+
throw err;
|
|
116
|
+
continue;
|
|
117
|
+
}
|
|
118
|
+
await withOra({
|
|
119
|
+
loading: chalk.blue("Removing temporary files"),
|
|
120
|
+
success: chalk.blue("Removed temporary files"),
|
|
121
|
+
fail: chalk.blue("Failed to remove temporary files")
|
|
122
|
+
}, async () => {
|
|
123
|
+
await clearTempFolder();
|
|
98
124
|
});
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
await clearTempFolder();
|
|
106
|
-
});
|
|
107
|
-
if (!noUsageExample) {
|
|
108
|
-
console.log();
|
|
109
|
-
logBinaryUsageExampleToConsole(buildOptions, true);
|
|
110
|
-
console.log();
|
|
125
|
+
if (!noUsageExample) {
|
|
126
|
+
console.log();
|
|
127
|
+
logBinaryUsageExampleToConsole(buildOptions, gpu !== "auto", true);
|
|
128
|
+
console.log();
|
|
129
|
+
}
|
|
130
|
+
break;
|
|
111
131
|
}
|
|
112
132
|
}
|
|
113
133
|
//# sourceMappingURL=BuildCommand.js.map
|
|
@@ -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,
|
|
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 { logUsedGpuTypeOption } from "../utils/logUsedGpuTypeOption.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,16 +50,7 @@ async function DebugCmakeOptionsFunction() {
|
|
|
44
50
|
console.info(`${chalk.yellow("CMake options:")} ${prettyPrintObject(llama.cmakeOptions)}`);
|
|
45
51
|
}
|
|
46
52
|
function logComputeLayers(llama) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
console.info(`${chalk.yellow("Metal:")} enabled`);
|
|
50
|
-
hasEnabledLayers = true;
|
|
51
|
-
}
|
|
52
|
-
if (llama.cuda) {
|
|
53
|
-
console.info(`${chalk.yellow("Metal:")} enabled`);
|
|
54
|
-
hasEnabledLayers = true;
|
|
55
|
-
}
|
|
56
|
-
if (hasEnabledLayers)
|
|
57
|
-
console.info();
|
|
53
|
+
logUsedGpuTypeOption(llama.gpu);
|
|
54
|
+
console.info();
|
|
58
55
|
}
|
|
59
56
|
//# sourceMappingURL=DebugCommand.js.map
|
|
@@ -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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"}
|
|
@@ -1,15 +1,16 @@
|
|
|
1
|
+
import process from "process";
|
|
1
2
|
import { CommandModule } from "yargs";
|
|
3
|
+
import { BuildGpu } from "../../bindings/types.js";
|
|
2
4
|
type DownloadCommandArgs = {
|
|
3
5
|
repo?: string;
|
|
4
6
|
release?: "latest" | string;
|
|
5
|
-
arch?:
|
|
7
|
+
arch?: typeof process.arch;
|
|
6
8
|
nodeTarget?: string;
|
|
7
|
-
|
|
8
|
-
cuda?: boolean;
|
|
9
|
+
gpu?: BuildGpu | "auto";
|
|
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,
|
|
15
|
+
export declare function DownloadLlamaCppCommand({ repo, release, arch, nodeTarget, gpu, 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 {
|
|
4
|
+
import { defaultLlamaCppGitHubRepo, defaultLlamaCppRelease, isCI, llamaCppDirectory, llamaCppDirectoryInfoFilePath, defaultLlamaCppGpuSupport } 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,12 @@ 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 { nodeLlamaCppGpuOptions, parseNodeLlamaCppGpuOption } from "../../bindings/types.js";
|
|
19
|
+
import { logUsedGpuTypeOption } from "../utils/logUsedGpuTypeOption.js";
|
|
20
|
+
import { getGpuTypesToUseForOption } from "../../bindings/utils/getGpuTypesToUseForOption.js";
|
|
21
|
+
import { getConsoleLogPrefix } from "../../utils/getConsoleLogPrefix.js";
|
|
22
|
+
import { getPrettyBuildGpuName } from "../../bindings/consts.js";
|
|
23
|
+
import { getPlatformInfo } from "../../bindings/utils/getPlatformInfo.js";
|
|
18
24
|
export const DownloadCommand = {
|
|
19
25
|
command: "download",
|
|
20
26
|
describe: "Download a release of llama.cpp and compile it",
|
|
@@ -34,6 +40,7 @@ export const DownloadCommand = {
|
|
|
34
40
|
.option("arch", {
|
|
35
41
|
alias: "a",
|
|
36
42
|
type: "string",
|
|
43
|
+
coerce: (value) => value,
|
|
37
44
|
description: "The architecture to compile llama.cpp for"
|
|
38
45
|
})
|
|
39
46
|
.option("nodeTarget", {
|
|
@@ -41,16 +48,13 @@ export const DownloadCommand = {
|
|
|
41
48
|
type: "string",
|
|
42
49
|
description: "The Node.js version to compile llama.cpp for. Example: v18.0.0"
|
|
43
50
|
})
|
|
44
|
-
.option("
|
|
45
|
-
type: "
|
|
46
|
-
default:
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
.
|
|
51
|
-
type: "boolean",
|
|
52
|
-
default: defaultLlamaCppCudaSupport,
|
|
53
|
-
description: "Compile llama.cpp with CUDA support. Can also be set via the NODE_LLAMA_CPP_CUDA environment variable"
|
|
51
|
+
.option("gpu", {
|
|
52
|
+
type: "string",
|
|
53
|
+
default: defaultLlamaCppGpuSupport,
|
|
54
|
+
// yargs types don't support passing `false` as a choice, although it is supported by yargs
|
|
55
|
+
choices: nodeLlamaCppGpuOptions,
|
|
56
|
+
coerce: parseNodeLlamaCppGpuOption,
|
|
57
|
+
description: "Compute layer implementation type to use for llama.cpp"
|
|
54
58
|
})
|
|
55
59
|
.option("skipBuild", {
|
|
56
60
|
alias: "sb",
|
|
@@ -79,21 +83,20 @@ export const DownloadCommand = {
|
|
|
79
83
|
},
|
|
80
84
|
handler: DownloadLlamaCppCommand
|
|
81
85
|
};
|
|
82
|
-
|
|
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 }) {
|
|
86
|
+
export async function DownloadLlamaCppCommand({ repo = defaultLlamaCppGitHubRepo, release = defaultLlamaCppRelease, arch = undefined, nodeTarget = undefined, gpu = defaultLlamaCppGpuSupport, skipBuild = false, noBundle = false, noUsageExample = false, updateBinariesReleaseMetadataAndSaveGitBundle = false }) {
|
|
84
87
|
const useBundle = noBundle != true;
|
|
85
88
|
const platform = getPlatform();
|
|
89
|
+
const platformInfo = await getPlatformInfo();
|
|
86
90
|
const customCmakeOptions = resolveCustomCmakeOptions();
|
|
91
|
+
const buildGpusToTry = skipBuild
|
|
92
|
+
? []
|
|
93
|
+
: await getGpuTypesToUseForOption(gpu, { platform, arch });
|
|
87
94
|
const [githubOwner, githubRepo] = repo.split("/");
|
|
95
|
+
let downloadedCmake = false;
|
|
88
96
|
console.log(`${chalk.yellow("Repo:")} ${repo}`);
|
|
89
97
|
console.log(`${chalk.yellow("Release:")} ${release}`);
|
|
90
98
|
if (!skipBuild) {
|
|
91
|
-
|
|
92
|
-
console.log(`${chalk.yellow("Metal:")} enabled`);
|
|
93
|
-
}
|
|
94
|
-
if (cuda) {
|
|
95
|
-
console.log(`${chalk.yellow("CUDA:")} enabled`);
|
|
96
|
-
}
|
|
99
|
+
logUsedGpuTypeOption(buildGpusToTry[0]);
|
|
97
100
|
}
|
|
98
101
|
console.log();
|
|
99
102
|
let githubReleaseTag = (useBundle && (await getGitBundlePathForRelease(githubOwner, githubRepo, release)) != null)
|
|
@@ -118,47 +121,87 @@ export async function DownloadLlamaCppCommand({ repo = defaultLlamaCppGitHubRepo
|
|
|
118
121
|
});
|
|
119
122
|
console.log(chalk.blue("Cloning llama.cpp"));
|
|
120
123
|
await cloneLlamaCppRepo(githubOwner, githubRepo, githubReleaseTag, useBundle);
|
|
121
|
-
const buildOptions = {
|
|
122
|
-
customCmakeOptions,
|
|
123
|
-
progressLogs: true,
|
|
124
|
-
platform,
|
|
125
|
-
arch: arch
|
|
126
|
-
? arch
|
|
127
|
-
: process.arch,
|
|
128
|
-
computeLayers: {
|
|
129
|
-
metal,
|
|
130
|
-
cuda
|
|
131
|
-
},
|
|
132
|
-
llamaCpp: {
|
|
133
|
-
repo,
|
|
134
|
-
release: githubReleaseTag
|
|
135
|
-
}
|
|
136
|
-
};
|
|
137
124
|
if (!skipBuild) {
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
125
|
+
for (let i = 0; i < buildGpusToTry.length; i++) {
|
|
126
|
+
const gpuToTry = buildGpusToTry[i];
|
|
127
|
+
const isLastItem = i === buildGpusToTry.length - 1;
|
|
128
|
+
if (i > 0) // we already logged the first gpu before
|
|
129
|
+
logUsedGpuTypeOption(gpuToTry);
|
|
130
|
+
if (!downloadedCmake) {
|
|
131
|
+
await downloadCmakeIfNeeded(true);
|
|
132
|
+
downloadedCmake = true;
|
|
133
|
+
}
|
|
134
|
+
const buildOptions = {
|
|
135
|
+
customCmakeOptions,
|
|
136
|
+
progressLogs: true,
|
|
137
|
+
platform,
|
|
138
|
+
platformInfo,
|
|
139
|
+
arch: arch
|
|
140
|
+
? arch
|
|
141
|
+
: process.arch,
|
|
142
|
+
gpu: gpuToTry,
|
|
143
|
+
llamaCpp: {
|
|
144
|
+
repo,
|
|
145
|
+
release: githubReleaseTag
|
|
146
|
+
}
|
|
147
|
+
};
|
|
148
|
+
try {
|
|
149
|
+
await withStatusLogs({
|
|
150
|
+
loading: chalk.blue("Compiling llama.cpp"),
|
|
151
|
+
success: chalk.blue("Compiled llama.cpp"),
|
|
152
|
+
fail: chalk.blue("Failed to compile llama.cpp")
|
|
153
|
+
}, async () => {
|
|
154
|
+
await compileLlamaCpp(buildOptions, {
|
|
155
|
+
nodeTarget: nodeTarget ? nodeTarget : undefined,
|
|
156
|
+
updateLastBuildInfo: true,
|
|
157
|
+
downloadCmakeIfNeeded: false,
|
|
158
|
+
ensureLlamaCppRepoIsCloned: false,
|
|
159
|
+
includeBuildOptionsInBinaryFolderName: true
|
|
160
|
+
});
|
|
161
|
+
});
|
|
162
|
+
}
|
|
163
|
+
catch (err) {
|
|
164
|
+
console.error(getConsoleLogPrefix() +
|
|
165
|
+
`Failed to build llama.cpp with ${getPrettyBuildGpuName(gpuToTry)} support. ` +
|
|
166
|
+
(!isLastItem
|
|
167
|
+
? `falling back to building llama.cpp with ${getPrettyBuildGpuName(buildGpusToTry[i + 1])} support. `
|
|
168
|
+
: "") +
|
|
169
|
+
"Error:", err);
|
|
170
|
+
if (isLastItem)
|
|
171
|
+
throw err;
|
|
172
|
+
continue;
|
|
173
|
+
}
|
|
174
|
+
if (!noUsageExample) {
|
|
175
|
+
console.log();
|
|
176
|
+
console.log();
|
|
177
|
+
logBinaryUsageExampleToConsole(buildOptions, gpu !== "auto", true);
|
|
178
|
+
}
|
|
179
|
+
break;
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
else if (!noUsageExample) {
|
|
183
|
+
const buildOptions = {
|
|
184
|
+
customCmakeOptions,
|
|
185
|
+
progressLogs: true,
|
|
186
|
+
platform,
|
|
187
|
+
platformInfo,
|
|
188
|
+
arch: arch
|
|
189
|
+
? arch
|
|
190
|
+
: process.arch,
|
|
191
|
+
gpu: buildGpusToTry[0],
|
|
192
|
+
llamaCpp: {
|
|
193
|
+
repo,
|
|
194
|
+
release: githubReleaseTag
|
|
195
|
+
}
|
|
196
|
+
};
|
|
197
|
+
console.log();
|
|
198
|
+
console.log();
|
|
199
|
+
logBinaryUsageExampleToConsole(buildOptions, gpu !== "auto", true);
|
|
152
200
|
}
|
|
153
201
|
if (isCI && updateBinariesReleaseMetadataAndSaveGitBundle) {
|
|
154
202
|
await setBinariesGithubRelease(githubReleaseTag);
|
|
155
203
|
await unshallowAndSquashCurrentRepoAndSaveItAsReleaseBundle();
|
|
156
204
|
}
|
|
157
|
-
if (!noUsageExample) {
|
|
158
|
-
console.log();
|
|
159
|
-
console.log();
|
|
160
|
-
logBinaryUsageExampleToConsole(buildOptions, true);
|
|
161
|
-
}
|
|
162
205
|
console.log();
|
|
163
206
|
console.log();
|
|
164
207
|
console.log(`${chalk.yellow("Repo:")} ${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,
|
|
1
|
+
{"version":3,"file":"DownloadCommand.js","sourceRoot":"","sources":["../../../src/cli/commands/DownloadCommand.ts"],"names":[],"mappings":"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"}
|