node-llama-cpp 3.17.1 → 3.18.1
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/dist/bindings/AddonTypes.d.ts +13 -0
- package/dist/bindings/Llama.js +20 -2
- package/dist/bindings/Llama.js.map +1 -1
- package/dist/bindings/getLlama.d.ts +1 -1
- package/dist/bindings/getLlama.js +19 -8
- package/dist/bindings/getLlama.js.map +1 -1
- package/dist/bindings/utils/compileLLamaCpp.d.ts +2 -1
- package/dist/bindings/utils/compileLLamaCpp.js +8 -0
- package/dist/bindings/utils/compileLLamaCpp.js.map +1 -1
- package/dist/bindings/utils/getGpuTypesToUseForOption.d.ts +1 -1
- package/dist/bindings/utils/getLlamaGpuTypes.js +2 -0
- package/dist/bindings/utils/getLlamaGpuTypes.js.map +1 -1
- package/dist/chatWrappers/QwenChatWrapper.d.ts +7 -0
- package/dist/chatWrappers/QwenChatWrapper.js +176 -56
- package/dist/chatWrappers/QwenChatWrapper.js.map +1 -1
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js +127 -88
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js.map +1 -1
- package/dist/chatWrappers/generic/utils/extractFunctionCallSettingsFromJinjaTemplate.d.ts +16 -10
- package/dist/chatWrappers/generic/utils/extractFunctionCallSettingsFromJinjaTemplate.js +115 -5
- package/dist/chatWrappers/generic/utils/extractFunctionCallSettingsFromJinjaTemplate.js.map +1 -1
- package/dist/chatWrappers/generic/utils/extractSegmentSettingsFromTokenizerAndChatTemplate.js +1 -0
- package/dist/chatWrappers/generic/utils/extractSegmentSettingsFromTokenizerAndChatTemplate.js.map +1 -1
- package/dist/cli/commands/ChatCommand.d.ts +3 -0
- package/dist/cli/commands/ChatCommand.js +34 -5
- package/dist/cli/commands/ChatCommand.js.map +1 -1
- package/dist/cli/commands/CompleteCommand.d.ts +3 -0
- package/dist/cli/commands/CompleteCommand.js +34 -4
- package/dist/cli/commands/CompleteCommand.js.map +1 -1
- package/dist/cli/commands/InfillCommand.d.ts +3 -0
- package/dist/cli/commands/InfillCommand.js +34 -4
- package/dist/cli/commands/InfillCommand.js.map +1 -1
- package/dist/cli/commands/OnPostInstallCommand.js +31 -4
- package/dist/cli/commands/OnPostInstallCommand.js.map +1 -1
- package/dist/cli/commands/inspect/commands/InspectEstimateCommand.d.ts +3 -0
- package/dist/cli/commands/inspect/commands/InspectEstimateCommand.js +28 -1
- package/dist/cli/commands/inspect/commands/InspectEstimateCommand.js.map +1 -1
- package/dist/cli/commands/inspect/commands/InspectGgufCommand.js +5 -0
- package/dist/cli/commands/inspect/commands/InspectGgufCommand.js.map +1 -1
- package/dist/cli/commands/inspect/commands/InspectGpuCommand.js +51 -4
- package/dist/cli/commands/inspect/commands/InspectGpuCommand.js.map +1 -1
- package/dist/cli/commands/inspect/commands/InspectMeasureCommand.d.ts +3 -0
- package/dist/cli/commands/inspect/commands/InspectMeasureCommand.js +46 -5
- package/dist/cli/commands/inspect/commands/InspectMeasureCommand.js.map +1 -1
- package/dist/cli/utils/interactivelyAskForModel.d.ts +4 -1
- package/dist/cli/utils/interactivelyAskForModel.js +21 -7
- package/dist/cli/utils/interactivelyAskForModel.js.map +1 -1
- package/dist/cli/utils/packageJsonConfig.d.ts +6 -0
- package/dist/cli/utils/packageJsonConfig.js +51 -0
- package/dist/cli/utils/packageJsonConfig.js.map +1 -0
- package/dist/cli/utils/packageManager.d.ts +1 -0
- package/dist/cli/utils/packageManager.js +15 -0
- package/dist/cli/utils/packageManager.js.map +1 -0
- package/dist/cli/utils/printCommonInfoLines.js +9 -0
- package/dist/cli/utils/printCommonInfoLines.js.map +1 -1
- package/dist/cli/utils/resolveCommandGgufPath.d.ts +4 -1
- package/dist/cli/utils/resolveCommandGgufPath.js +9 -2
- package/dist/cli/utils/resolveCommandGgufPath.js.map +1 -1
- package/dist/cli/utils/resolveNpmrcConfig.d.ts +18 -0
- package/dist/cli/utils/resolveNpmrcConfig.js +129 -0
- package/dist/cli/utils/resolveNpmrcConfig.js.map +1 -0
- package/dist/config.d.ts +6 -1
- package/dist/config.js +12 -2
- package/dist/config.js.map +1 -1
- package/dist/evaluator/LlamaChat/LlamaChat.d.ts +8 -2
- package/dist/evaluator/LlamaChat/LlamaChat.js +99 -6
- package/dist/evaluator/LlamaChat/LlamaChat.js.map +1 -1
- package/dist/evaluator/LlamaChat/utils/contextShiftStrategies/eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.js +8 -2
- package/dist/evaluator/LlamaChat/utils/contextShiftStrategies/eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.d.ts +8 -2
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.js.map +1 -1
- package/dist/evaluator/LlamaContext/LlamaContext.d.ts +91 -0
- package/dist/evaluator/LlamaContext/LlamaContext.js +215 -19
- package/dist/evaluator/LlamaContext/LlamaContext.js.map +1 -1
- package/dist/evaluator/LlamaContext/LlamaContextSequenceCheckpoints.d.ts +27 -0
- package/dist/evaluator/LlamaContext/LlamaContextSequenceCheckpoints.js +130 -0
- package/dist/evaluator/LlamaContext/LlamaContextSequenceCheckpoints.js.map +1 -0
- package/dist/evaluator/LlamaContext/types.d.ts +32 -1
- package/dist/evaluator/LlamaModel/LlamaModel.d.ts +33 -0
- package/dist/evaluator/LlamaModel/LlamaModel.js +24 -3
- package/dist/evaluator/LlamaModel/LlamaModel.js.map +1 -1
- package/dist/gguf/insights/GgufInsights.d.ts +12 -1
- package/dist/gguf/insights/GgufInsights.js +246 -49
- package/dist/gguf/insights/GgufInsights.js.map +1 -1
- package/dist/gguf/insights/GgufInsightsConfigurationResolver.d.ts +13 -4
- package/dist/gguf/insights/GgufInsightsConfigurationResolver.js +17 -5
- package/dist/gguf/insights/GgufInsightsConfigurationResolver.js.map +1 -1
- package/dist/gguf/insights/utils/resolveContextContextSizeOption.d.ts +4 -1
- package/dist/gguf/insights/utils/resolveContextContextSizeOption.js +7 -1
- package/dist/gguf/insights/utils/resolveContextContextSizeOption.js.map +1 -1
- package/dist/gguf/insights/utils/resolveModelGpuLayersOption.d.ts +4 -1
- package/dist/gguf/insights/utils/resolveModelGpuLayersOption.js +16 -4
- package/dist/gguf/insights/utils/resolveModelGpuLayersOption.js.map +1 -1
- package/dist/gguf/types/GgufMetadataTypes.d.ts +18 -2
- package/dist/gguf/types/GgufMetadataTypes.js +6 -0
- package/dist/gguf/types/GgufMetadataTypes.js.map +1 -1
- package/dist/gguf/types/GgufTensorInfoTypes.d.ts +4 -2
- package/dist/gguf/types/GgufTensorInfoTypes.js +11 -1
- package/dist/gguf/types/GgufTensorInfoTypes.js.map +1 -1
- package/dist/gguf/utils/getGgufFileTypeName.d.ts +1 -1
- package/dist/gguf/utils/ggufQuantNames.js +1 -0
- package/dist/gguf/utils/ggufQuantNames.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types.d.ts +1 -0
- package/dist/utils/getBuildDefaults.d.ts +1 -1
- package/dist/utils/getFirstWritableDir.d.ts +8 -0
- package/dist/utils/getFirstWritableDir.js +60 -0
- package/dist/utils/getFirstWritableDir.js.map +1 -0
- package/dist/utils/getTempDir.d.ts +10 -0
- package/dist/utils/getTempDir.js +121 -0
- package/dist/utils/getTempDir.js.map +1 -0
- package/dist/utils/prettyPrintObject.js +1 -1
- package/dist/utils/prettyPrintObject.js.map +1 -1
- package/dist/utils/resolveModelFile.js +19 -8
- package/dist/utils/resolveModelFile.js.map +1 -1
- package/llama/addon/AddonContext.cpp +182 -0
- package/llama/addon/AddonContext.h +27 -0
- package/llama/addon/addon.cpp +1 -0
- package/llama/binariesGithubRelease.json +1 -1
- package/llama/gitRelease.bundle +0 -0
- package/llama/llama.cpp.info.json +1 -1
- package/package.json +24 -24
|
@@ -1,22 +1,40 @@
|
|
|
1
|
+
import path from "path";
|
|
2
|
+
import { fileURLToPath } from "url";
|
|
1
3
|
import chalk from "chalk";
|
|
2
|
-
import { defaultSkipDownload, documentationPageUrls } from "../../config.js";
|
|
4
|
+
import { defaultSkipDownload, documentationPageUrls, defaultNodeLlamaCppPostinstall } from "../../config.js";
|
|
3
5
|
import { getLlamaForOptions } from "../../bindings/getLlama.js";
|
|
4
6
|
import { setForceShowConsoleLogPrefix } from "../../state.js";
|
|
5
7
|
import { isRunningUnderRosetta } from "../utils/isRunningUnderRosetta.js";
|
|
6
8
|
import { getConsoleLogPrefix } from "../../utils/getConsoleLogPrefix.js";
|
|
9
|
+
import { parsePackageJsonConfig, resolvePackageJsonConfig } from "../utils/packageJsonConfig.js";
|
|
10
|
+
import { detectCurrentPackageManager } from "../utils/packageManager.js";
|
|
11
|
+
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
|
7
12
|
export const OnPostInstallCommand = {
|
|
8
13
|
command: "postinstall",
|
|
9
14
|
describe: false,
|
|
10
15
|
async handler() {
|
|
11
16
|
if (defaultSkipDownload)
|
|
12
|
-
return;
|
|
17
|
+
return void process.exit(0);
|
|
18
|
+
const nlcConfig = parsePackageJsonConfig(await resolvePackageJsonConfig(__dirname));
|
|
19
|
+
const postinstallConfig = (defaultNodeLlamaCppPostinstall == null || defaultNodeLlamaCppPostinstall === "auto")
|
|
20
|
+
? nlcConfig.nodeLlamaCppPostinstall ?? defaultNodeLlamaCppPostinstall
|
|
21
|
+
: defaultNodeLlamaCppPostinstall;
|
|
22
|
+
// set via a `--node-llama-cpp-postinstall=skip` flag on an `npm install` command
|
|
23
|
+
// (prefer `--node-llama-cpp-postinstall=ignoreFailedBuild` if you really need it)
|
|
24
|
+
if (postinstallConfig === "skip") {
|
|
25
|
+
console.info(getConsoleLogPrefix(false, false), "Skipping node-llama-cpp postinstall due to a 'skip' configuration");
|
|
26
|
+
return void process.exit(0);
|
|
27
|
+
}
|
|
13
28
|
setForceShowConsoleLogPrefix(true);
|
|
14
29
|
if (await isRunningUnderRosetta()) {
|
|
15
30
|
console.error(getConsoleLogPrefix(false, false), chalk.red("llama.cpp is not supported under Rosetta on Apple Silicone Macs. " +
|
|
16
31
|
"Ensure that you're using a native arm64 node.js installation."));
|
|
17
32
|
console.error(getConsoleLogPrefix(false, false), "process.platform: " + process.platform + ", process.arch: " + process.arch);
|
|
18
33
|
console.error(getConsoleLogPrefix(false, false), "troubleshooting: " + documentationPageUrls.troubleshooting.RosettaIllegalHardwareInstruction);
|
|
19
|
-
|
|
34
|
+
if (postinstallConfig === "ignoreFailedBuild")
|
|
35
|
+
process.exit(0);
|
|
36
|
+
else
|
|
37
|
+
process.exit(1);
|
|
20
38
|
}
|
|
21
39
|
try {
|
|
22
40
|
await getLlamaForOptions({
|
|
@@ -28,7 +46,16 @@ export const OnPostInstallCommand = {
|
|
|
28
46
|
}
|
|
29
47
|
catch (err) {
|
|
30
48
|
console.error(err);
|
|
31
|
-
|
|
49
|
+
const packageManager = detectCurrentPackageManager();
|
|
50
|
+
if (postinstallConfig === "auto" && packageManager === "npm")
|
|
51
|
+
console.info(getConsoleLogPrefix(false, false), "To disable node-llama-cpp's postinstall for this 'npm install', use the '--node-llama-cpp-postinstall=skip' flag when running 'npm install' command");
|
|
52
|
+
if (postinstallConfig === "auto")
|
|
53
|
+
console.info(getConsoleLogPrefix(false, false), "To customize node-llama-cpp's postinstall behavior, see the troubleshooting guide: " +
|
|
54
|
+
documentationPageUrls.troubleshooting.PostinstallBehavior);
|
|
55
|
+
if (postinstallConfig === "ignoreFailedBuild")
|
|
56
|
+
process.exit(0);
|
|
57
|
+
else
|
|
58
|
+
process.exit(1);
|
|
32
59
|
}
|
|
33
60
|
}
|
|
34
61
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OnPostInstallCommand.js","sourceRoot":"","sources":["../../../src/cli/commands/OnPostInstallCommand.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"OnPostInstallCommand.js","sourceRoot":"","sources":["../../../src/cli/commands/OnPostInstallCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { CommandModule } from "yargs";
|
|
2
2
|
import { BuildGpu } from "../../../../bindings/types.js";
|
|
3
|
+
import { GgmlType } from "../../../../gguf/types/GgufTensorInfoTypes.js";
|
|
3
4
|
type InspectEstimateCommand = {
|
|
4
5
|
modelPath: string;
|
|
5
6
|
header?: string[];
|
|
@@ -8,6 +9,8 @@ type InspectEstimateCommand = {
|
|
|
8
9
|
contextSize?: number | "train";
|
|
9
10
|
embedding?: boolean;
|
|
10
11
|
noMmap?: boolean;
|
|
12
|
+
kvCacheKeyType?: "currentQuant" | keyof typeof GgmlType;
|
|
13
|
+
kvCacheValueType?: "currentQuant" | keyof typeof GgmlType;
|
|
11
14
|
swaFullCache?: boolean;
|
|
12
15
|
};
|
|
13
16
|
export declare const InspectEstimateCommand: CommandModule<object, InspectEstimateCommand>;
|
|
@@ -20,6 +20,7 @@ import { printModelDestination } from "../../../utils/printModelDestination.js";
|
|
|
20
20
|
import { toBytes } from "../../../utils/toBytes.js";
|
|
21
21
|
import { printDidYouMeanUri } from "../../../utils/resolveCommandGgufPath.js";
|
|
22
22
|
import { isModelUri } from "../../../../utils/parseModelUri.js";
|
|
23
|
+
import { GgmlType, resolveGgmlTypeOption } from "../../../../gguf/types/GgufTensorInfoTypes.js";
|
|
23
24
|
export const InspectEstimateCommand = {
|
|
24
25
|
command: "estimate [modelPath]",
|
|
25
26
|
describe: withCliCommandDescriptionDocsUrl("Estimate the compatibility of a model with the current hardware", documentationPageUrls.CLI.Inspect.Estimate),
|
|
@@ -93,6 +94,26 @@ export const InspectEstimateCommand = {
|
|
|
93
94
|
type: "boolean",
|
|
94
95
|
default: false,
|
|
95
96
|
description: "Disable mmap (memory-mapped file) usage"
|
|
97
|
+
})
|
|
98
|
+
.option("kvCacheKeyType", {
|
|
99
|
+
alias: "kvckt",
|
|
100
|
+
type: "string",
|
|
101
|
+
choices: [
|
|
102
|
+
"currentQuant",
|
|
103
|
+
...Object.keys(GgmlType).filter((key) => !/^\d+$/i.test(key))
|
|
104
|
+
],
|
|
105
|
+
default: "F16",
|
|
106
|
+
description: "Experimental. The type of the key for the context KV cache tensors. Use `currentQuant` to use the same type as the current quantization of the model weights tensors"
|
|
107
|
+
})
|
|
108
|
+
.option("kvCacheValueType", {
|
|
109
|
+
alias: "kvcvt",
|
|
110
|
+
type: "string",
|
|
111
|
+
choices: [
|
|
112
|
+
"currentQuant",
|
|
113
|
+
...Object.keys(GgmlType).filter((key) => !/^\d+$/i.test(key))
|
|
114
|
+
],
|
|
115
|
+
default: "F16",
|
|
116
|
+
description: "Experimental. The type of the value for the context KV cache tensors. Use `currentQuant` to use the same type as the current quantization of the model weights tensors"
|
|
96
117
|
})
|
|
97
118
|
.option("swaFullCache", {
|
|
98
119
|
alias: "noSwa",
|
|
@@ -101,7 +122,7 @@ export const InspectEstimateCommand = {
|
|
|
101
122
|
description: "Disable SWA (Sliding Window Attention) on supported models"
|
|
102
123
|
});
|
|
103
124
|
},
|
|
104
|
-
async handler({ modelPath: ggufPath, header: headerArg, gpu, gpuLayers, contextSize: contextSizeArg, embedding, noMmap, swaFullCache }) {
|
|
125
|
+
async handler({ modelPath: ggufPath, header: headerArg, gpu, gpuLayers, contextSize: contextSizeArg, embedding, noMmap, kvCacheKeyType, kvCacheValueType, swaFullCache }) {
|
|
105
126
|
if (gpuLayers === -1)
|
|
106
127
|
gpuLayers = undefined;
|
|
107
128
|
if (gpuLayers === -2)
|
|
@@ -159,6 +180,12 @@ export const InspectEstimateCommand = {
|
|
|
159
180
|
targetGpuLayers: gpuLayers,
|
|
160
181
|
embeddingContext: embedding,
|
|
161
182
|
useMmap,
|
|
183
|
+
kvCacheKeyType: kvCacheKeyType === "currentQuant"
|
|
184
|
+
? ggufInsights.dominantTensorType
|
|
185
|
+
: resolveGgmlTypeOption(kvCacheKeyType),
|
|
186
|
+
kvCacheValueType: kvCacheValueType === "currentQuant"
|
|
187
|
+
? ggufInsights.dominantTensorType
|
|
188
|
+
: resolveGgmlTypeOption(kvCacheValueType),
|
|
162
189
|
swaFullCache
|
|
163
190
|
});
|
|
164
191
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InspectEstimateCommand.js","sourceRoot":"","sources":["../../../../../src/cli/commands/inspect/commands/InspectEstimateCommand.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAC,gBAAgB,EAAC,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAC,iBAAiB,EAAC,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAC,gCAAgC,EAAC,MAAM,oDAAoD,CAAC;AACpG,OAAO,EAAC,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAC,aAAa,EAAC,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAC,4CAA4C,EAAC,MAAM,gEAAgE,CAAC;AAC5H,OAAO,EAAC,sBAAsB,EAAC,MAAM,6CAA6C,CAAC;AACnF,OAAO,EAAC,YAAY,EAAC,MAAM,2CAA2C,CAAC;AACvE,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAW,aAAa,EAAE,sBAAsB,EAAE,0BAA0B,EAAC,MAAM,+BAA+B,CAAC;AAC1H,OAAO,EACH,4CAA4C,EAC/C,MAAM,gEAAgE,CAAC;AAExE,OAAO,EAAC,mBAAmB,EAAC,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAC,qBAAqB,EAAC,MAAM,gCAAgC,CAAC;AACrE,OAAO,OAAO,MAAM,8BAA8B,CAAC;AACnD,OAAO,EAAC,8BAA8B,EAAC,MAAM,8CAA8C,CAAC;AAC5F,OAAO,EAAC,qBAAqB,EAAC,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAC,OAAO,EAAC,MAAM,2BAA2B,CAAC;AAClD,OAAO,EAAC,kBAAkB,EAAC,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAC,UAAU,EAAC,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"InspectEstimateCommand.js","sourceRoot":"","sources":["../../../../../src/cli/commands/inspect/commands/InspectEstimateCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,9 +13,11 @@ import withOra from "../../../../utils/withOra.js";
|
|
|
13
13
|
import { resolveModelArgToFilePathOrUrl } from "../../../../utils/resolveModelDestination.js";
|
|
14
14
|
import { printModelDestination } from "../../../utils/printModelDestination.js";
|
|
15
15
|
import { getGgufMetadataKeyValue } from "../../../../gguf/utils/getGgufMetadataKeyValue.js";
|
|
16
|
+
import { GgmlType } from "../../../../gguf/types/GgufTensorInfoTypes.js";
|
|
16
17
|
import { toBytes } from "../../../utils/toBytes.js";
|
|
17
18
|
import { printDidYouMeanUri } from "../../../utils/resolveCommandGgufPath.js";
|
|
18
19
|
import { isModelUri } from "../../../../utils/parseModelUri.js";
|
|
20
|
+
import { getDominantTensorType } from "../../../../gguf/insights/GgufInsights.js";
|
|
19
21
|
const chatTemplateKey = ".chatTemplate";
|
|
20
22
|
export const InspectGgufCommand = {
|
|
21
23
|
command: "gguf [modelPath]",
|
|
@@ -190,11 +192,14 @@ export const InspectGgufCommand = {
|
|
|
190
192
|
};
|
|
191
193
|
if (parsedMetadata.splicedParts > 1)
|
|
192
194
|
console.info(`${chalk.yellow("Spliced parts:")} ${parsedMetadata.splicedParts}`);
|
|
195
|
+
const dominantTensorType = getDominantTensorType(parsedMetadata.fullTensorInfo ?? []);
|
|
193
196
|
console.info(`${chalk.yellow("GGUF version:")} ${parsedMetadata.version}`);
|
|
194
197
|
console.info(`${chalk.yellow("Tensor count:")} ${parsedMetadata.totalTensorCount.toLocaleString("en-US", numberLocaleFormattingOptions)}`);
|
|
195
198
|
console.info(`${chalk.yellow("Metadata size:")} ${toBytes(parsedMetadata.totalMetadataSize)}`);
|
|
196
199
|
console.info(`${chalk.yellow("Tensor info size:")} ${toBytes(parsedMetadata.totalTensorInfoSize)}`);
|
|
197
200
|
console.info(`${chalk.yellow("File type:")} ${fileTypeName ?? ""} ${chalk.white(`(${parsedMetadata.metadata.general?.file_type})`)}`);
|
|
201
|
+
if (dominantTensorType != null)
|
|
202
|
+
console.info(`${chalk.yellow("Dominant tensor type:")} ${dominantTensorType} (${GgmlType[dominantTensorType]})`);
|
|
198
203
|
console.info(`${chalk.yellow("Metadata:")} ${prettyPrintObject(parsedMetadata.metadata, undefined, metadataPrettyPrintOptions)}`);
|
|
199
204
|
console.info(`${chalk.yellow("Tensor info:")} ${prettyPrintObject(parsedMetadata.fullTensorInfo, undefined, tensorInfoPrettyPrintOptions)}`);
|
|
200
205
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InspectGgufCommand.js","sourceRoot":"","sources":["../../../../../src/cli/commands/inspect/commands/InspectGgufCommand.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAC,gBAAgB,EAAC,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAC,iBAAiB,EAA2B,MAAM,wCAAwC,CAAC;AACnG,OAAO,EAAC,mBAAmB,EAAC,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAC,iBAAiB,EAAC,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAC,gCAAgC,EAAC,MAAM,oDAAoD,CAAC;AACpG,OAAO,EAAC,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AAC5D,OAAO,OAAO,MAAM,8BAA8B,CAAC;AACnD,OAAO,EAAC,8BAA8B,EAAC,MAAM,8CAA8C,CAAC;AAC5F,OAAO,EAAC,qBAAqB,EAAC,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAC,uBAAuB,EAAC,MAAM,mDAAmD,CAAC;
|
|
1
|
+
{"version":3,"file":"InspectGgufCommand.js","sourceRoot":"","sources":["../../../../../src/cli/commands/inspect/commands/InspectGgufCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,8 @@ import { isRunningUnderRosetta } from "../../../utils/isRunningUnderRosetta.js";
|
|
|
14
14
|
import { toBytes } from "../../../utils/toBytes.js";
|
|
15
15
|
import { getBinariesGithubRelease } from "../../../../bindings/utils/binariesGithubRelease.js";
|
|
16
16
|
import { getClonedLlamaCppRepoReleaseInfo } from "../../../../bindings/utils/cloneLlamaCppRepo.js";
|
|
17
|
+
import { checkWhetherPrebuiltBinariesModuleIsInstalled } from "../../../../bindings/utils/compileLLamaCpp.js";
|
|
18
|
+
import { getCurrentNpmrcConfig, getNpmrcRegistry } from "../../../utils/resolveNpmrcConfig.js";
|
|
17
19
|
export const InspectGpuCommand = {
|
|
18
20
|
command: "gpu",
|
|
19
21
|
describe: withCliCommandDescriptionDocsUrl("Show the detected GPU types and their VRAM usage", documentationPageUrls.CLI.Inspect.GPU),
|
|
@@ -24,6 +26,7 @@ export const InspectGpuCommand = {
|
|
|
24
26
|
const gpusToLogVramUsageOf = [];
|
|
25
27
|
const gpuToLlama = new Map();
|
|
26
28
|
let lastLlama;
|
|
29
|
+
let missingPrebuiltBinaryModules = false;
|
|
27
30
|
async function loadLlamaForGpu(gpu) {
|
|
28
31
|
if (!gpuToLlama.has(gpu)) {
|
|
29
32
|
const loadedLlama = await getLlamaForGpu(gpu);
|
|
@@ -85,7 +88,12 @@ export const InspectGpuCommand = {
|
|
|
85
88
|
if (platform === "mac" && arch === "arm64") {
|
|
86
89
|
const llama = await loadLlamaForGpu("metal");
|
|
87
90
|
if (llama == null) {
|
|
88
|
-
|
|
91
|
+
if (!(await checkWhetherPrebuiltBinariesModuleIsInstalled("metal"))) {
|
|
92
|
+
console.info(`${chalk.yellow("Metal:")} ${chalk.red("The Metal prebuilt binaries module is missing")}`);
|
|
93
|
+
missingPrebuiltBinaryModules = true;
|
|
94
|
+
}
|
|
95
|
+
else
|
|
96
|
+
console.info(`${chalk.yellow("Metal:")} ${chalk.red("Metal is detected, but using it failed")}`);
|
|
89
97
|
}
|
|
90
98
|
else {
|
|
91
99
|
console.info(`${chalk.yellow("Metal:")} ${chalk.green("available")}`);
|
|
@@ -102,7 +110,12 @@ export const InspectGpuCommand = {
|
|
|
102
110
|
console.info(`${chalk.yellow("Metal:")} ${chalk.red("not supported by llama.cpp on Intel Macs")}`);
|
|
103
111
|
const llama = await loadLlamaForGpu(false);
|
|
104
112
|
if (llama == null) {
|
|
105
|
-
|
|
113
|
+
if (!(await checkWhetherPrebuiltBinariesModuleIsInstalled(false))) {
|
|
114
|
+
console.info(`${chalk.yellow("CPU:")} ${chalk.red("The CPU-only prebuilt binaries module is missing")}`);
|
|
115
|
+
missingPrebuiltBinaryModules = true;
|
|
116
|
+
}
|
|
117
|
+
else
|
|
118
|
+
console.info(`${chalk.yellow("CPU:")} ${chalk.red("Loading a binding with only CPU support failed")}`);
|
|
106
119
|
}
|
|
107
120
|
}
|
|
108
121
|
if (availableComputeLayers.cuda.hasNvidiaDriver && !availableComputeLayers.cuda.hasCudaRuntime) {
|
|
@@ -116,7 +129,12 @@ export const InspectGpuCommand = {
|
|
|
116
129
|
else if (availableComputeLayers.cuda.hasCudaRuntime && availableComputeLayers.cuda.hasNvidiaDriver) {
|
|
117
130
|
const llama = await loadLlamaForGpu("cuda");
|
|
118
131
|
if (llama == null) {
|
|
119
|
-
|
|
132
|
+
if (!(await checkWhetherPrebuiltBinariesModuleIsInstalled("cuda"))) {
|
|
133
|
+
console.info(`${chalk.yellow("CUDA:")} ${chalk.red("The CUDA prebuilt binaries modules are missing")}`);
|
|
134
|
+
missingPrebuiltBinaryModules = true;
|
|
135
|
+
}
|
|
136
|
+
else
|
|
137
|
+
console.info(`${chalk.yellow("CUDA:")} ${chalk.red("CUDA is detected, but using it failed")}`);
|
|
120
138
|
console.info(chalk.yellow("To resolve errors related to CUDA, see the CUDA guide: ") + documentationPageUrls.CUDA);
|
|
121
139
|
}
|
|
122
140
|
else {
|
|
@@ -129,7 +147,12 @@ export const InspectGpuCommand = {
|
|
|
129
147
|
if (availableComputeLayers.vulkan) {
|
|
130
148
|
const llama = await loadLlamaForGpu("vulkan");
|
|
131
149
|
if (llama == null) {
|
|
132
|
-
|
|
150
|
+
if (!(await checkWhetherPrebuiltBinariesModuleIsInstalled("vulkan"))) {
|
|
151
|
+
console.info(`${chalk.yellow("Vulkan:")} ${chalk.red("The Vulkan prebuilt binaries module is missing")}`);
|
|
152
|
+
missingPrebuiltBinaryModules = true;
|
|
153
|
+
}
|
|
154
|
+
else
|
|
155
|
+
console.info(`${chalk.yellow("Vulkan:")} ${chalk.red("Vulkan is detected, but using it failed")}`);
|
|
133
156
|
console.info(chalk.yellow("To resolve errors related to Vulkan, see the Vulkan guide: ") + documentationPageUrls.Vulkan);
|
|
134
157
|
}
|
|
135
158
|
else {
|
|
@@ -154,6 +177,30 @@ export const InspectGpuCommand = {
|
|
|
154
177
|
await logSwapUsage(lastLlama);
|
|
155
178
|
console.info(`${chalk.yellow("mmap:")} ${lastLlama.supportsMmap ? "supported" : "unsupported"}`);
|
|
156
179
|
}
|
|
180
|
+
else {
|
|
181
|
+
if (!(await checkWhetherPrebuiltBinariesModuleIsInstalled(false))) {
|
|
182
|
+
console.info();
|
|
183
|
+
console.info(chalk.yellow("The CPU-only prebuilt binaries module is missing"));
|
|
184
|
+
missingPrebuiltBinaryModules = true;
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
if (missingPrebuiltBinaryModules) {
|
|
188
|
+
const npmrcConfig = await getCurrentNpmrcConfig();
|
|
189
|
+
const npmRegistry = getNpmrcRegistry(npmrcConfig);
|
|
190
|
+
if (!npmRegistry.isDefault) {
|
|
191
|
+
console.info();
|
|
192
|
+
console.info(chalk.yellow("npm registry: ") + npmRegistry.registryUrl);
|
|
193
|
+
console.info(chalk.yellow("It seems that you have a custom npm registry configured. " +
|
|
194
|
+
"The prebuilt binary modules may be missing in that registry. " + ("Consider switching to the default npm registry" +
|
|
195
|
+
(lastLlama != null
|
|
196
|
+
? ""
|
|
197
|
+
: " or building from source") +
|
|
198
|
+
" if you're having issues.")));
|
|
199
|
+
// only show a link to the building from source guide when a URL for the CUDA or Vulkan guides was not already provided
|
|
200
|
+
if (lastLlama == null)
|
|
201
|
+
console.info(chalk.yellow("To build from source, see the Building From Source guide: ") + documentationPageUrls.BuildingFromSource);
|
|
202
|
+
}
|
|
203
|
+
}
|
|
157
204
|
}
|
|
158
205
|
};
|
|
159
206
|
async function getLlamaForGpu(gpu) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InspectGpuCommand.js","sourceRoot":"","sources":["../../../../../src/cli/commands/inspect/commands/InspectGpuCommand.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"InspectGpuCommand.js","sourceRoot":"","sources":["../../../../../src/cli/commands/inspect/commands/InspectGpuCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { CommandModule } from "yargs";
|
|
2
2
|
import { BuildGpu } from "../../../../bindings/types.js";
|
|
3
|
+
import { GgmlType } from "../../../../gguf/types/GgufTensorInfoTypes.js";
|
|
3
4
|
type InspectMeasureCommand = {
|
|
4
5
|
modelPath?: string;
|
|
5
6
|
header?: string[];
|
|
@@ -9,6 +10,8 @@ type InspectMeasureCommand = {
|
|
|
9
10
|
minContextSize: number;
|
|
10
11
|
maxContextSize?: number;
|
|
11
12
|
flashAttention?: boolean;
|
|
13
|
+
kvCacheKeyType?: "currentQuant" | keyof typeof GgmlType;
|
|
14
|
+
kvCacheValueType?: "currentQuant" | keyof typeof GgmlType;
|
|
12
15
|
swaFullCache?: boolean;
|
|
13
16
|
batchSize?: number;
|
|
14
17
|
measures: number;
|
|
@@ -20,6 +20,7 @@ import { documentationPageUrls } from "../../../../config.js";
|
|
|
20
20
|
import { toBytes } from "../../../utils/toBytes.js";
|
|
21
21
|
import { padSafeContextSize } from "../../../../evaluator/LlamaContext/utils/padSafeContextSize.js";
|
|
22
22
|
import { getPlatform } from "../../../../bindings/utils/getPlatform.js";
|
|
23
|
+
import { GgmlType, resolveGgmlTypeOption } from "../../../../gguf/types/GgufTensorInfoTypes.js";
|
|
23
24
|
export const InspectMeasureCommand = {
|
|
24
25
|
command: "measure [modelPath]",
|
|
25
26
|
describe: withCliCommandDescriptionDocsUrl("Measure VRAM consumption of a GGUF model file with all possible combinations of gpu layers and context sizes", documentationPageUrls.CLI.Inspect.Measure),
|
|
@@ -79,6 +80,26 @@ export const InspectMeasureCommand = {
|
|
|
79
80
|
type: "boolean",
|
|
80
81
|
default: false,
|
|
81
82
|
description: "Enable flash attention for the context"
|
|
83
|
+
})
|
|
84
|
+
.option("kvCacheKeyType", {
|
|
85
|
+
alias: "kvckt",
|
|
86
|
+
type: "string",
|
|
87
|
+
choices: [
|
|
88
|
+
"currentQuant",
|
|
89
|
+
...Object.keys(GgmlType).filter((key) => !/^\d+$/i.test(key))
|
|
90
|
+
],
|
|
91
|
+
default: "F16",
|
|
92
|
+
description: "Experimental. The type of the key for the context KV cache tensors. Use `currentQuant` to use the same type as the current quantization of the model weights tensors"
|
|
93
|
+
})
|
|
94
|
+
.option("kvCacheValueType", {
|
|
95
|
+
alias: "kvcvt",
|
|
96
|
+
type: "string",
|
|
97
|
+
choices: [
|
|
98
|
+
"currentQuant",
|
|
99
|
+
...Object.keys(GgmlType).filter((key) => !/^\d+$/i.test(key))
|
|
100
|
+
],
|
|
101
|
+
default: "F16",
|
|
102
|
+
description: "Experimental. The type of the value for the context KV cache tensors. Use `currentQuant` to use the same type as the current quantization of the model weights tensors"
|
|
82
103
|
})
|
|
83
104
|
.option("swaFullCache", {
|
|
84
105
|
alias: "noSwa",
|
|
@@ -131,7 +152,7 @@ export const InspectMeasureCommand = {
|
|
|
131
152
|
description: "Number of times to repeat the evaluation text before sending it for evaluation, in order to make it longer"
|
|
132
153
|
});
|
|
133
154
|
},
|
|
134
|
-
async handler({ modelPath: ggufPath, header: headerArg, gpu, minLayers, maxLayers, minContextSize, maxContextSize, flashAttention, swaFullCache, batchSize, measures = 10, memory: measureMemoryType, noMmap, noDirectIo, printHeaderBeforeEachLayer = true, evaluateText, repeatEvaluateText }) {
|
|
155
|
+
async handler({ modelPath: ggufPath, header: headerArg, gpu, minLayers, maxLayers, minContextSize, maxContextSize, flashAttention, kvCacheKeyType, kvCacheValueType, swaFullCache, batchSize, measures = 10, memory: measureMemoryType, noMmap, noDirectIo, printHeaderBeforeEachLayer = true, evaluateText, repeatEvaluateText }) {
|
|
135
156
|
if (maxLayers === -1)
|
|
136
157
|
maxLayers = undefined;
|
|
137
158
|
if (maxContextSize === -1)
|
|
@@ -153,7 +174,7 @@ export const InspectMeasureCommand = {
|
|
|
153
174
|
const useMmap = !noMmap && llama.supportsMmap;
|
|
154
175
|
const useDirectIo = !noDirectIo;
|
|
155
176
|
const resolvedGgufPath = await resolveCommandGgufPath(ggufPath, llama, headers, {
|
|
156
|
-
flashAttention, swaFullCache, useMmap
|
|
177
|
+
flashAttention, swaFullCache, useMmap, kvCacheKeyType, kvCacheValueType
|
|
157
178
|
});
|
|
158
179
|
console.info(`${chalk.yellow("File:")} ${getReadablePath(resolvedGgufPath)}`);
|
|
159
180
|
console.info(`${chalk.yellow("GPU:")} ${getPrettyBuildGpuName(llama.gpu)}${gpu == null ? chalk.gray(" (last build)") : ""}`);
|
|
@@ -177,6 +198,14 @@ export const InspectMeasureCommand = {
|
|
|
177
198
|
const totalRam = os.totalmem();
|
|
178
199
|
let lastGpuLayers = maxLayers ?? ggufInsights.totalLayers;
|
|
179
200
|
let previousContextSizeCheck = undefined;
|
|
201
|
+
const resolvedKvCacheKeyType = kvCacheKeyType === "currentQuant"
|
|
202
|
+
? ggufInsights.dominantTensorType ?? GgmlType.F16
|
|
203
|
+
: resolveGgmlTypeOption(kvCacheKeyType) ?? GgmlType.F16;
|
|
204
|
+
const resolvedKvCacheValueType = kvCacheValueType === "currentQuant"
|
|
205
|
+
? ggufInsights.dominantTensorType ?? GgmlType.F16
|
|
206
|
+
: resolveGgmlTypeOption(kvCacheValueType) ?? GgmlType.F16;
|
|
207
|
+
if (resolvedKvCacheKeyType != GgmlType.F16 || resolvedKvCacheValueType != GgmlType.F16)
|
|
208
|
+
console.info(`${chalk.yellow("KV cache:")} ${GgmlType[resolvedKvCacheKeyType] + " " + GgmlType[resolvedKvCacheValueType]}`);
|
|
180
209
|
const measureTable = getMeasureTable(measureMemoryType);
|
|
181
210
|
measureTable.logHeader({ drawRowSeparator: !printHeaderBeforeEachLayer });
|
|
182
211
|
while (lastGpuLayers >= (minLayers ?? 0)) {
|
|
@@ -201,6 +230,8 @@ export const InspectMeasureCommand = {
|
|
|
201
230
|
maxContextSize,
|
|
202
231
|
minContextSize,
|
|
203
232
|
flashAttention,
|
|
233
|
+
kvCacheKeyType: resolvedKvCacheKeyType,
|
|
234
|
+
kvCacheValueType: resolvedKvCacheValueType,
|
|
204
235
|
swaFullCache,
|
|
205
236
|
batchSize,
|
|
206
237
|
tests: measures,
|
|
@@ -443,7 +474,7 @@ function renderDiffPercentageWithColors(percentage, { greenBright = 2, green = 6
|
|
|
443
474
|
const __filename = fileURLToPath(import.meta.url);
|
|
444
475
|
const detectedFileName = path.basename(__filename);
|
|
445
476
|
const expectedFileName = "InspectMeasureCommand";
|
|
446
|
-
async function measureModel({ modelPath, useMmap, useDirectIo, gpu, tests, initialMaxContextSize, maxContextSize, minContextSize, maxGpuLayers, minGpuLayers, flashAttention, swaFullCache, batchSize, evaluateText, exitAfterMeasurement = false, onInfo }) {
|
|
477
|
+
async function measureModel({ modelPath, useMmap, useDirectIo, gpu, tests, initialMaxContextSize, maxContextSize, minContextSize, maxGpuLayers, minGpuLayers, flashAttention, kvCacheKeyType, kvCacheValueType, swaFullCache, batchSize, evaluateText, exitAfterMeasurement = false, onInfo }) {
|
|
447
478
|
if (!detectedFileName.startsWith(expectedFileName)) {
|
|
448
479
|
console.warn(getConsoleLogPrefix() +
|
|
449
480
|
`"${expectedFileName}.js" file is not independent, so running sub-process tests cannot be done with it\n` +
|
|
@@ -515,6 +546,8 @@ async function measureModel({ modelPath, useMmap, useDirectIo, gpu, tests, initi
|
|
|
515
546
|
maxGpuLayers,
|
|
516
547
|
minGpuLayers,
|
|
517
548
|
flashAttention,
|
|
549
|
+
kvCacheKeyType,
|
|
550
|
+
kvCacheValueType,
|
|
518
551
|
swaFullCache,
|
|
519
552
|
batchSize,
|
|
520
553
|
evaluateText,
|
|
@@ -608,7 +641,7 @@ async function runTestWorkerLogic() {
|
|
|
608
641
|
process.exit(1);
|
|
609
642
|
process.send(info);
|
|
610
643
|
}
|
|
611
|
-
async function testContextSizes({ model, modelVramUsage, modelRamUsage, startContextSize, maxContextSize, minContextSize, tests, flashAttention, swaFullCache, batchSize, evaluateText, exitAfterMeasurement = false }) {
|
|
644
|
+
async function testContextSizes({ model, modelVramUsage, modelRamUsage, startContextSize, maxContextSize, minContextSize, tests, flashAttention, kvCacheKeyType, kvCacheValueType, swaFullCache, batchSize, evaluateText, exitAfterMeasurement = false }) {
|
|
612
645
|
let measurementsDone = 0;
|
|
613
646
|
const contextSizeCheckPlan = getContextSizesCheckPlan(maxContextSize != null
|
|
614
647
|
? Math.min(model.trainContextSize, maxContextSize)
|
|
@@ -628,6 +661,8 @@ async function runTestWorkerLogic() {
|
|
|
628
661
|
: undefined),
|
|
629
662
|
ignoreMemorySafetyChecks: currentContextSizeCheck != null,
|
|
630
663
|
flashAttention,
|
|
664
|
+
experimentalKvCacheKeyType: kvCacheKeyType,
|
|
665
|
+
experimentalKvCacheValueType: kvCacheValueType,
|
|
631
666
|
swaFullCache,
|
|
632
667
|
batchSize,
|
|
633
668
|
failedCreationRemedy: false
|
|
@@ -674,7 +709,7 @@ async function runTestWorkerLogic() {
|
|
|
674
709
|
}
|
|
675
710
|
return measurementsDone;
|
|
676
711
|
}
|
|
677
|
-
async function testWithGpuLayers({ modelPath, useMmap, useDirectIo, gpuLayers, tests, startContextSize, maxContextSize, minContextSize, flashAttention, swaFullCache, batchSize, evaluateText, exitAfterMeasurement = false }) {
|
|
712
|
+
async function testWithGpuLayers({ modelPath, useMmap, useDirectIo, gpuLayers, tests, startContextSize, maxContextSize, minContextSize, flashAttention, kvCacheKeyType, kvCacheValueType, swaFullCache, batchSize, evaluateText, exitAfterMeasurement = false }) {
|
|
678
713
|
try {
|
|
679
714
|
const preModelVramUsage = (await llama.getVramState()).used;
|
|
680
715
|
const preModelRamUsage = getMemoryUsage(llama);
|
|
@@ -684,6 +719,8 @@ async function runTestWorkerLogic() {
|
|
|
684
719
|
useDirectIo,
|
|
685
720
|
gpuLayers,
|
|
686
721
|
defaultContextFlashAttention: flashAttention,
|
|
722
|
+
experimentalDefaultContextKvCacheKeyType: kvCacheKeyType,
|
|
723
|
+
experimentalDefaultContextKvCacheValueType: kvCacheValueType,
|
|
687
724
|
defaultContextSwaFullCache: swaFullCache,
|
|
688
725
|
ignoreMemorySafetyChecks: true
|
|
689
726
|
});
|
|
@@ -705,6 +742,8 @@ async function runTestWorkerLogic() {
|
|
|
705
742
|
maxContextSize,
|
|
706
743
|
minContextSize,
|
|
707
744
|
flashAttention,
|
|
745
|
+
kvCacheKeyType,
|
|
746
|
+
kvCacheValueType,
|
|
708
747
|
swaFullCache,
|
|
709
748
|
batchSize,
|
|
710
749
|
tests,
|
|
@@ -747,6 +786,8 @@ async function runTestWorkerLogic() {
|
|
|
747
786
|
maxContextSize: message.maxContextSize,
|
|
748
787
|
minContextSize: message.minContextSize,
|
|
749
788
|
flashAttention: message.flashAttention,
|
|
789
|
+
kvCacheKeyType: message.kvCacheKeyType,
|
|
790
|
+
kvCacheValueType: message.kvCacheValueType,
|
|
750
791
|
swaFullCache: message.swaFullCache,
|
|
751
792
|
batchSize: message.batchSize,
|
|
752
793
|
evaluateText: message.evaluateText,
|