node-llama-cpp 3.0.0-beta.13 → 3.0.0-beta.15

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.
Files changed (351) hide show
  1. package/README.md +1 -1
  2. package/dist/ChatWrapper.js +4 -0
  3. package/dist/ChatWrapper.js.map +1 -1
  4. package/dist/bindings/AddonTypes.d.ts +35 -6
  5. package/dist/bindings/Llama.d.ts +12 -0
  6. package/dist/bindings/Llama.js +100 -7
  7. package/dist/bindings/Llama.js.map +1 -1
  8. package/dist/bindings/getLlama.d.ts +19 -1
  9. package/dist/bindings/getLlama.js +16 -6
  10. package/dist/bindings/getLlama.js.map +1 -1
  11. package/dist/bindings/types.d.ts +18 -0
  12. package/dist/bindings/types.js +31 -2
  13. package/dist/bindings/types.js.map +1 -1
  14. package/dist/bindings/utils/MemoryOrchestrator.d.ts +21 -0
  15. package/dist/bindings/utils/MemoryOrchestrator.js +49 -0
  16. package/dist/bindings/utils/MemoryOrchestrator.js.map +1 -0
  17. package/dist/bindings/utils/cloneLlamaCppRepo.d.ts +1 -1
  18. package/dist/bindings/utils/cloneLlamaCppRepo.js +4 -3
  19. package/dist/bindings/utils/cloneLlamaCppRepo.js.map +1 -1
  20. package/dist/bindings/utils/compileLLamaCpp.d.ts +4 -1
  21. package/dist/bindings/utils/compileLLamaCpp.js +133 -97
  22. package/dist/bindings/utils/compileLLamaCpp.js.map +1 -1
  23. package/dist/bindings/utils/detectAvailableComputeLayers.d.ts +3 -0
  24. package/dist/bindings/utils/detectAvailableComputeLayers.js +155 -13
  25. package/dist/bindings/utils/detectAvailableComputeLayers.js.map +1 -1
  26. package/dist/bindings/utils/getLlamaWithoutBackend.d.ts +5 -0
  27. package/dist/bindings/utils/getLlamaWithoutBackend.js +27 -0
  28. package/dist/bindings/utils/getLlamaWithoutBackend.js.map +1 -0
  29. package/dist/bindings/utils/logDistroInstallInstruction.d.ts +1 -0
  30. package/dist/bindings/utils/logDistroInstallInstruction.js +16 -6
  31. package/dist/bindings/utils/logDistroInstallInstruction.js.map +1 -1
  32. package/dist/bindings/utils/resolveCustomCmakeOptions.js +2 -2
  33. package/dist/bindings/utils/resolveCustomCmakeOptions.js.map +1 -1
  34. package/dist/bindings/utils/testBindingBinary.js +2 -2
  35. package/dist/bindings/utils/testBindingBinary.js.map +1 -1
  36. package/dist/bindings/utils/testCmakeBinary.d.ts +5 -0
  37. package/dist/bindings/utils/testCmakeBinary.js +32 -0
  38. package/dist/bindings/utils/testCmakeBinary.js.map +1 -0
  39. package/dist/chatWrappers/AlpacaChatWrapper.d.ts +2 -1
  40. package/dist/chatWrappers/AlpacaChatWrapper.js +9 -2
  41. package/dist/chatWrappers/AlpacaChatWrapper.js.map +1 -1
  42. package/dist/chatWrappers/ChatMLChatWrapper.js +12 -10
  43. package/dist/chatWrappers/ChatMLChatWrapper.js.map +1 -1
  44. package/dist/chatWrappers/FalconChatWrapper.d.ts +2 -1
  45. package/dist/chatWrappers/FalconChatWrapper.js +28 -11
  46. package/dist/chatWrappers/FalconChatWrapper.js.map +1 -1
  47. package/dist/chatWrappers/FunctionaryChatWrapper.js +59 -45
  48. package/dist/chatWrappers/FunctionaryChatWrapper.js.map +1 -1
  49. package/dist/chatWrappers/GemmaChatWrapper.js +9 -7
  50. package/dist/chatWrappers/GemmaChatWrapper.js.map +1 -1
  51. package/dist/chatWrappers/GeneralChatWrapper.d.ts +2 -1
  52. package/dist/chatWrappers/GeneralChatWrapper.js +35 -12
  53. package/dist/chatWrappers/GeneralChatWrapper.js.map +1 -1
  54. package/dist/chatWrappers/LlamaChatWrapper.d.ts +7 -0
  55. package/dist/chatWrappers/LlamaChatWrapper.js +26 -8
  56. package/dist/chatWrappers/LlamaChatWrapper.js.map +1 -1
  57. package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.d.ts +73 -0
  58. package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js +355 -0
  59. package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js.map +1 -0
  60. package/dist/{TemplateChatWrapper.d.ts → chatWrappers/generic/TemplateChatWrapper.d.ts} +16 -18
  61. package/dist/{TemplateChatWrapper.js → chatWrappers/generic/TemplateChatWrapper.js} +31 -69
  62. package/dist/chatWrappers/generic/TemplateChatWrapper.js.map +1 -0
  63. package/dist/chatWrappers/generic/utils/chatHistoryFunctionCallMessageTemplate.d.ts +33 -0
  64. package/dist/chatWrappers/generic/utils/chatHistoryFunctionCallMessageTemplate.js +45 -0
  65. package/dist/chatWrappers/generic/utils/chatHistoryFunctionCallMessageTemplate.js.map +1 -0
  66. package/dist/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.d.ts +4 -0
  67. package/dist/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.js +206 -0
  68. package/dist/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.js.map +1 -0
  69. package/dist/chatWrappers/utils/resolveChatWrapper.d.ts +67 -0
  70. package/dist/chatWrappers/utils/resolveChatWrapper.js +206 -0
  71. package/dist/chatWrappers/utils/resolveChatWrapper.js.map +1 -0
  72. package/dist/cli/cli.js +1 -1
  73. package/dist/cli/cli.js.map +1 -1
  74. package/dist/cli/commands/ChatCommand.d.ts +7 -4
  75. package/dist/cli/commands/ChatCommand.js +177 -70
  76. package/dist/cli/commands/ChatCommand.js.map +1 -1
  77. package/dist/cli/commands/ClearCommand.d.ts +1 -1
  78. package/dist/cli/commands/ClearCommand.js +5 -5
  79. package/dist/cli/commands/ClearCommand.js.map +1 -1
  80. package/dist/cli/commands/CompleteCommand.d.ts +3 -2
  81. package/dist/cli/commands/CompleteCommand.js +115 -51
  82. package/dist/cli/commands/CompleteCommand.js.map +1 -1
  83. package/dist/cli/commands/InfillCommand.d.ts +3 -2
  84. package/dist/cli/commands/InfillCommand.js +115 -51
  85. package/dist/cli/commands/InfillCommand.js.map +1 -1
  86. package/dist/cli/commands/OnPostInstallCommand.js +2 -0
  87. package/dist/cli/commands/OnPostInstallCommand.js.map +1 -1
  88. package/dist/cli/commands/{InspectCommand.d.ts → inspect/InspectCommand.d.ts} +1 -4
  89. package/dist/cli/commands/inspect/InspectCommand.js +17 -0
  90. package/dist/cli/commands/inspect/InspectCommand.js.map +1 -0
  91. package/dist/cli/commands/inspect/commands/InspectGgufCommand.d.ts +10 -0
  92. package/dist/cli/commands/inspect/commands/InspectGgufCommand.js +108 -0
  93. package/dist/cli/commands/inspect/commands/InspectGgufCommand.js.map +1 -0
  94. package/dist/cli/commands/inspect/commands/InspectGpuCommand.d.ts +4 -0
  95. package/dist/cli/commands/inspect/commands/InspectGpuCommand.js +98 -0
  96. package/dist/cli/commands/inspect/commands/InspectGpuCommand.js.map +1 -0
  97. package/dist/cli/commands/inspect/commands/InspectMeasureCommand.d.ts +14 -0
  98. package/dist/cli/commands/inspect/commands/InspectMeasureCommand.js +577 -0
  99. package/dist/cli/commands/inspect/commands/InspectMeasureCommand.js.map +1 -0
  100. package/dist/cli/utils/ConsoleTable.d.ts +23 -0
  101. package/dist/cli/utils/ConsoleTable.js +86 -0
  102. package/dist/cli/utils/ConsoleTable.js.map +1 -0
  103. package/dist/cli/utils/printCommonInfoLines.d.ts +9 -0
  104. package/dist/cli/utils/printCommonInfoLines.js +70 -0
  105. package/dist/cli/utils/printCommonInfoLines.js.map +1 -0
  106. package/dist/cli/utils/printInfoLine.d.ts +10 -0
  107. package/dist/cli/utils/printInfoLine.js +45 -0
  108. package/dist/cli/utils/printInfoLine.js.map +1 -0
  109. package/dist/cli/utils/resolveCommandGgufPath.d.ts +1 -0
  110. package/dist/cli/utils/resolveCommandGgufPath.js +6 -0
  111. package/dist/cli/utils/resolveCommandGgufPath.js.map +1 -0
  112. package/dist/config.d.ts +3 -1
  113. package/dist/config.js +7 -1
  114. package/dist/config.js.map +1 -1
  115. package/dist/evaluator/LlamaChat/LlamaChat.js +13 -5
  116. package/dist/evaluator/LlamaChat/LlamaChat.js.map +1 -1
  117. package/dist/evaluator/LlamaCompletion.js +5 -3
  118. package/dist/evaluator/LlamaCompletion.js.map +1 -1
  119. package/dist/evaluator/LlamaContext/LlamaContext.d.ts +43 -9
  120. package/dist/evaluator/LlamaContext/LlamaContext.js +251 -60
  121. package/dist/evaluator/LlamaContext/LlamaContext.js.map +1 -1
  122. package/dist/evaluator/LlamaContext/types.d.ts +68 -10
  123. package/dist/evaluator/LlamaContext/utils/batchItemsPrioritizationStrategies/firstInFirstOutStrategy.js.map +1 -0
  124. package/dist/evaluator/LlamaContext/utils/batchItemsPrioritizationStrategies/maximumParallelismStrategy.js.map +1 -0
  125. package/dist/evaluator/LlamaContext/utils/resolveBatchItemsPrioritizationStrategy.d.ts +2 -0
  126. package/dist/evaluator/LlamaContext/utils/{resolveBatchItemsPrioritizingStrategy.js → resolveBatchItemsPrioritizationStrategy.js} +4 -4
  127. package/dist/evaluator/LlamaContext/utils/resolveBatchItemsPrioritizationStrategy.js.map +1 -0
  128. package/dist/evaluator/LlamaEmbeddingContext.d.ts +29 -7
  129. package/dist/evaluator/LlamaEmbeddingContext.js +31 -22
  130. package/dist/evaluator/LlamaEmbeddingContext.js.map +1 -1
  131. package/dist/evaluator/LlamaGrammar.js +1 -0
  132. package/dist/evaluator/LlamaGrammar.js.map +1 -1
  133. package/dist/evaluator/LlamaModel.d.ts +78 -20
  134. package/dist/evaluator/LlamaModel.js +385 -21
  135. package/dist/evaluator/LlamaModel.js.map +1 -1
  136. package/dist/evaluator/TokenMeter.d.ts +54 -0
  137. package/dist/evaluator/TokenMeter.js +86 -0
  138. package/dist/evaluator/TokenMeter.js.map +1 -0
  139. package/dist/gguf/GgufInsights.d.ts +40 -0
  140. package/dist/gguf/GgufInsights.js +350 -0
  141. package/dist/gguf/GgufInsights.js.map +1 -0
  142. package/dist/gguf/consts.d.ts +3 -0
  143. package/dist/gguf/consts.js +8 -0
  144. package/dist/gguf/consts.js.map +1 -0
  145. package/dist/gguf/errors/InvalidGgufMagicError.d.ts +3 -0
  146. package/dist/gguf/errors/InvalidGgufMagicError.js +6 -0
  147. package/dist/gguf/errors/InvalidGgufMagicError.js.map +1 -0
  148. package/dist/gguf/errors/UnsupportedGgufValueTypeError.d.ts +4 -0
  149. package/dist/gguf/errors/UnsupportedGgufValueTypeError.js +9 -0
  150. package/dist/gguf/errors/UnsupportedGgufValueTypeError.js.map +1 -0
  151. package/dist/gguf/fileReaders/GgufFileReader.d.ts +33 -0
  152. package/dist/gguf/fileReaders/GgufFileReader.js +76 -0
  153. package/dist/gguf/fileReaders/GgufFileReader.js.map +1 -0
  154. package/dist/gguf/fileReaders/GgufFsFileReader.d.ts +17 -0
  155. package/dist/gguf/fileReaders/GgufFsFileReader.js +45 -0
  156. package/dist/gguf/fileReaders/GgufFsFileReader.js.map +1 -0
  157. package/dist/gguf/fileReaders/GgufNetworkFetchFileReader.d.ts +22 -0
  158. package/dist/gguf/fileReaders/GgufNetworkFetchFileReader.js +63 -0
  159. package/dist/gguf/fileReaders/GgufNetworkFetchFileReader.js.map +1 -0
  160. package/dist/gguf/parser/GgufV2Parser.d.ts +19 -0
  161. package/dist/gguf/parser/GgufV2Parser.js +115 -0
  162. package/dist/gguf/parser/GgufV2Parser.js.map +1 -0
  163. package/dist/gguf/parser/GgufV3Parser.d.ts +3 -0
  164. package/dist/gguf/parser/GgufV3Parser.js +4 -0
  165. package/dist/gguf/parser/GgufV3Parser.js.map +1 -0
  166. package/dist/gguf/parser/parseGguf.d.ts +8 -0
  167. package/dist/gguf/parser/parseGguf.js +58 -0
  168. package/dist/gguf/parser/parseGguf.js.map +1 -0
  169. package/dist/gguf/readGgufFileInfo.d.ts +30 -0
  170. package/dist/gguf/readGgufFileInfo.js +37 -0
  171. package/dist/gguf/readGgufFileInfo.js.map +1 -0
  172. package/dist/gguf/types/GgufFileInfoTypes.d.ts +52 -0
  173. package/dist/gguf/types/GgufFileInfoTypes.js +18 -0
  174. package/dist/gguf/types/GgufFileInfoTypes.js.map +1 -0
  175. package/dist/gguf/types/GgufMetadataTypes.d.ts +330 -0
  176. package/dist/gguf/types/GgufMetadataTypes.js +86 -0
  177. package/dist/gguf/types/GgufMetadataTypes.js.map +1 -0
  178. package/dist/gguf/types/GgufTensorInfoTypes.d.ts +37 -0
  179. package/dist/gguf/types/GgufTensorInfoTypes.js +33 -0
  180. package/dist/gguf/types/GgufTensorInfoTypes.js.map +1 -0
  181. package/dist/gguf/utils/GgufReadOffset.d.ts +6 -0
  182. package/dist/gguf/utils/GgufReadOffset.js +18 -0
  183. package/dist/gguf/utils/GgufReadOffset.js.map +1 -0
  184. package/dist/gguf/utils/convertMetadataKeyValueRecordToNestedObject.d.ts +5 -0
  185. package/dist/gguf/utils/convertMetadataKeyValueRecordToNestedObject.js +38 -0
  186. package/dist/gguf/utils/convertMetadataKeyValueRecordToNestedObject.js.map +1 -0
  187. package/dist/gguf/utils/getGgufFileTypeName.d.ts +4 -0
  188. package/dist/gguf/utils/getGgufFileTypeName.js +13 -0
  189. package/dist/gguf/utils/getGgufFileTypeName.js.map +1 -0
  190. package/dist/gguf/utils/getGgufMetadataArchitectureData.d.ts +3 -0
  191. package/dist/gguf/utils/getGgufMetadataArchitectureData.js +4 -0
  192. package/dist/gguf/utils/getGgufMetadataArchitectureData.js.map +1 -0
  193. package/dist/gguf/utils/normalizeGgufDownloadUrl.d.ts +1 -0
  194. package/dist/gguf/utils/normalizeGgufDownloadUrl.js +16 -0
  195. package/dist/gguf/utils/normalizeGgufDownloadUrl.js.map +1 -0
  196. package/dist/index.d.ts +13 -7
  197. package/dist/index.js +11 -6
  198. package/dist/index.js.map +1 -1
  199. package/dist/state.d.ts +2 -0
  200. package/dist/state.js +7 -0
  201. package/dist/state.js.map +1 -1
  202. package/dist/types.d.ts +1 -1
  203. package/dist/utils/DisposeGuard.d.ts +13 -0
  204. package/dist/utils/DisposeGuard.js +120 -0
  205. package/dist/utils/DisposeGuard.js.map +1 -0
  206. package/dist/utils/InsufficientMemoryError.d.ts +3 -0
  207. package/dist/utils/InsufficientMemoryError.js +6 -0
  208. package/dist/utils/InsufficientMemoryError.js.map +1 -0
  209. package/dist/utils/LlamaText.d.ts +25 -10
  210. package/dist/utils/LlamaText.js +205 -23
  211. package/dist/utils/LlamaText.js.map +1 -1
  212. package/dist/utils/StopGenerationDetector.js +3 -1
  213. package/dist/utils/StopGenerationDetector.js.map +1 -1
  214. package/dist/utils/cmake.js +1 -1
  215. package/dist/utils/cmake.js.map +1 -1
  216. package/dist/utils/findBestOption.d.ts +4 -0
  217. package/dist/utils/findBestOption.js +15 -0
  218. package/dist/utils/findBestOption.js.map +1 -0
  219. package/dist/utils/getConsoleLogPrefix.js +3 -2
  220. package/dist/utils/getConsoleLogPrefix.js.map +1 -1
  221. package/dist/utils/getQueuedTokensBeforeStopTrigger.js +3 -3
  222. package/dist/utils/getQueuedTokensBeforeStopTrigger.js.map +1 -1
  223. package/dist/utils/gitReleaseBundles.js +68 -1
  224. package/dist/utils/gitReleaseBundles.js.map +1 -1
  225. package/dist/utils/mergeUnionTypes.d.ts +4 -0
  226. package/dist/utils/parseModelFileName.d.ts +1 -0
  227. package/dist/utils/parseModelFileName.js +6 -1
  228. package/dist/utils/parseModelFileName.js.map +1 -1
  229. package/dist/utils/prettyPrintObject.d.ts +10 -1
  230. package/dist/utils/prettyPrintObject.js +57 -13
  231. package/dist/utils/prettyPrintObject.js.map +1 -1
  232. package/dist/utils/removeNullFields.d.ts +2 -2
  233. package/dist/utils/removeNullFields.js.map +1 -1
  234. package/dist/utils/spawnCommand.d.ts +11 -1
  235. package/dist/utils/spawnCommand.js +55 -7
  236. package/dist/utils/spawnCommand.js.map +1 -1
  237. package/dist/utils/tokenizeInput.d.ts +1 -1
  238. package/dist/utils/tokenizeInput.js +3 -3
  239. package/dist/utils/tokenizeInput.js.map +1 -1
  240. package/dist/utils/withOra.d.ts +1 -0
  241. package/dist/utils/withOra.js +2 -2
  242. package/dist/utils/withOra.js.map +1 -1
  243. package/llama/CMakeLists.txt +5 -5
  244. package/llama/addon.cpp +793 -88
  245. package/llama/binariesGithubRelease.json +1 -1
  246. package/llama/gitRelease.bundle +0 -0
  247. package/llama/gpuInfo/cuda-gpu-info.cu +21 -0
  248. package/llama/gpuInfo/cuda-gpu-info.h +3 -0
  249. package/llama/gpuInfo/metal-gpu-info.h +4 -1
  250. package/llama/gpuInfo/metal-gpu-info.mm +14 -1
  251. package/llama/gpuInfo/vulkan-gpu-info.cpp +20 -2
  252. package/llama/gpuInfo/vulkan-gpu-info.h +2 -0
  253. package/llama/grammars/json.gbnf +1 -1
  254. package/llama/grammars/json_arr.gbnf +1 -1
  255. package/llama/llama.cpp.info.json +1 -1
  256. package/llama/toolchains/win32.host-x64.target-arm64.cmake +41 -0
  257. package/llamaBins/linux-arm64/{.buildMetadata.json → _nlcBuildMetadata.json} +1 -1
  258. package/llamaBins/linux-arm64/llama-addon.node +0 -0
  259. package/llamaBins/linux-armv7l/{.buildMetadata.json → _nlcBuildMetadata.json} +1 -1
  260. package/llamaBins/linux-armv7l/llama-addon.node +0 -0
  261. package/llamaBins/linux-x64/{.buildMetadata.json → _nlcBuildMetadata.json} +1 -1
  262. package/llamaBins/linux-x64/llama-addon.node +0 -0
  263. package/llamaBins/linux-x64-cuda/{.buildMetadata.json → _nlcBuildMetadata.json} +1 -1
  264. package/llamaBins/linux-x64-cuda/llama-addon.node +0 -0
  265. package/llamaBins/linux-x64-vulkan/{.buildMetadata.json → _nlcBuildMetadata.json} +1 -1
  266. package/llamaBins/linux-x64-vulkan/llama-addon.node +0 -0
  267. package/llamaBins/mac-arm64-metal/{.buildMetadata.json → _nlcBuildMetadata.json} +1 -1
  268. package/llamaBins/mac-arm64-metal/default.metallib +0 -0
  269. package/llamaBins/mac-arm64-metal/llama-addon.node +0 -0
  270. package/llamaBins/mac-x64/{.buildMetadata.json → _nlcBuildMetadata.json} +1 -1
  271. package/llamaBins/mac-x64/llama-addon.node +0 -0
  272. package/llamaBins/win-arm64/_nlcBuildMetadata.json +1 -0
  273. package/llamaBins/win-arm64/llama-addon.exp +0 -0
  274. package/llamaBins/win-arm64/llama-addon.lib +0 -0
  275. package/llamaBins/win-arm64/llama-addon.node +0 -0
  276. package/llamaBins/win-x64/{.buildMetadata.json → _nlcBuildMetadata.json} +1 -1
  277. package/llamaBins/win-x64/llama-addon.exp +0 -0
  278. package/llamaBins/win-x64/llama-addon.lib +0 -0
  279. package/llamaBins/win-x64/llama-addon.node +0 -0
  280. package/llamaBins/win-x64-cuda/{.buildMetadata.json → _nlcBuildMetadata.json} +1 -1
  281. package/llamaBins/win-x64-cuda/llama-addon.exp +0 -0
  282. package/llamaBins/win-x64-cuda/llama-addon.lib +0 -0
  283. package/llamaBins/win-x64-cuda/llama-addon.node +0 -0
  284. package/llamaBins/win-x64-vulkan/{.buildMetadata.json → _nlcBuildMetadata.json} +1 -1
  285. package/llamaBins/win-x64-vulkan/llama-addon.exp +0 -0
  286. package/llamaBins/win-x64-vulkan/llama-addon.lib +0 -0
  287. package/llamaBins/win-x64-vulkan/llama-addon.node +0 -0
  288. package/package.json +16 -11
  289. package/dist/TemplateChatWrapper.js.map +0 -1
  290. package/dist/bindings/utils/resolveChatWrapperBasedOnWrapperTypeName.d.ts +0 -33
  291. package/dist/bindings/utils/resolveChatWrapperBasedOnWrapperTypeName.js +0 -49
  292. package/dist/bindings/utils/resolveChatWrapperBasedOnWrapperTypeName.js.map +0 -1
  293. package/dist/chatWrappers/resolveChatWrapperBasedOnModel.d.ts +0 -13
  294. package/dist/chatWrappers/resolveChatWrapperBasedOnModel.js +0 -63
  295. package/dist/chatWrappers/resolveChatWrapperBasedOnModel.js.map +0 -1
  296. package/dist/cli/commands/InspectCommand.js +0 -113
  297. package/dist/cli/commands/InspectCommand.js.map +0 -1
  298. package/dist/evaluator/LlamaContext/utils/batchItemsPrioritizingStrategies/firstInFirstOutStrategy.js.map +0 -1
  299. package/dist/evaluator/LlamaContext/utils/batchItemsPrioritizingStrategies/maximumParallelismStrategy.js.map +0 -1
  300. package/dist/evaluator/LlamaContext/utils/resolveBatchItemsPrioritizingStrategy.d.ts +0 -2
  301. package/dist/evaluator/LlamaContext/utils/resolveBatchItemsPrioritizingStrategy.js.map +0 -1
  302. package/dist/gguf/GGUFInsights.d.ts +0 -28
  303. package/dist/gguf/GGUFInsights.js +0 -58
  304. package/dist/gguf/GGUFInsights.js.map +0 -1
  305. package/dist/gguf/GGUFMetadata.d.ts +0 -19
  306. package/dist/gguf/GGUFMetadata.js +0 -38
  307. package/dist/gguf/GGUFMetadata.js.map +0 -1
  308. package/dist/gguf/errors/InvalidGGUFMagicError.d.ts +0 -3
  309. package/dist/gguf/errors/InvalidGGUFMagicError.js +0 -6
  310. package/dist/gguf/errors/InvalidGGUFMagicError.js.map +0 -1
  311. package/dist/gguf/errors/MetadataNotParsedYetError.d.ts +0 -3
  312. package/dist/gguf/errors/MetadataNotParsedYetError.js +0 -6
  313. package/dist/gguf/errors/MetadataNotParsedYetError.js.map +0 -1
  314. package/dist/gguf/errors/MissingNodeLlamaError.d.ts +0 -3
  315. package/dist/gguf/errors/MissingNodeLlamaError.js +0 -6
  316. package/dist/gguf/errors/MissingNodeLlamaError.js.map +0 -1
  317. package/dist/gguf/errors/ModelScore/NotEnoughVRamError.d.ts +0 -5
  318. package/dist/gguf/errors/ModelScore/NotEnoughVRamError.js +0 -12
  319. package/dist/gguf/errors/ModelScore/NotEnoughVRamError.js.map +0 -1
  320. package/dist/gguf/errors/UnsupportedMetadataTypeError.d.ts +0 -4
  321. package/dist/gguf/errors/UnsupportedMetadataTypeError.js +0 -8
  322. package/dist/gguf/errors/UnsupportedMetadataTypeError.js.map +0 -1
  323. package/dist/gguf/ggufParser/GGUFParser.d.ts +0 -18
  324. package/dist/gguf/ggufParser/GGUFParser.js +0 -123
  325. package/dist/gguf/ggufParser/GGUFParser.js.map +0 -1
  326. package/dist/gguf/ggufParser/GGUFTypes.d.ts +0 -257
  327. package/dist/gguf/ggufParser/GGUFTypes.js +0 -2
  328. package/dist/gguf/ggufParser/GGUFTypes.js.map +0 -1
  329. package/dist/gguf/ggufParser/checkArchitecture.d.ts +0 -14
  330. package/dist/gguf/ggufParser/checkArchitecture.js +0 -74
  331. package/dist/gguf/ggufParser/checkArchitecture.js.map +0 -1
  332. package/dist/gguf/ggufParser/stream/GGUFBaseStream.d.ts +0 -38
  333. package/dist/gguf/ggufParser/stream/GGUFBaseStream.js +0 -83
  334. package/dist/gguf/ggufParser/stream/GGUFBaseStream.js.map +0 -1
  335. package/dist/gguf/ggufParser/stream/GGUFFetchStream.d.ts +0 -14
  336. package/dist/gguf/ggufParser/stream/GGUFFetchStream.js +0 -35
  337. package/dist/gguf/ggufParser/stream/GGUFFetchStream.js.map +0 -1
  338. package/dist/gguf/ggufParser/stream/GGUFReadStream.d.ts +0 -15
  339. package/dist/gguf/ggufParser/stream/GGUFReadStream.js +0 -40
  340. package/dist/gguf/ggufParser/stream/GGUFReadStream.js.map +0 -1
  341. package/dist/utils/parseModelTypeDescription.d.ts +0 -6
  342. package/dist/utils/parseModelTypeDescription.js +0 -9
  343. package/dist/utils/parseModelTypeDescription.js.map +0 -1
  344. package/dist/utils/resolveChatWrapper.d.ts +0 -4
  345. package/dist/utils/resolveChatWrapper.js +0 -16
  346. package/dist/utils/resolveChatWrapper.js.map +0 -1
  347. package/llamaBins/mac-arm64-metal/ggml-metal.metal +0 -7731
  348. /package/dist/evaluator/LlamaContext/utils/{batchItemsPrioritizingStrategies → batchItemsPrioritizationStrategies}/firstInFirstOutStrategy.d.ts +0 -0
  349. /package/dist/evaluator/LlamaContext/utils/{batchItemsPrioritizingStrategies → batchItemsPrioritizationStrategies}/firstInFirstOutStrategy.js +0 -0
  350. /package/dist/evaluator/LlamaContext/utils/{batchItemsPrioritizingStrategies → batchItemsPrioritizationStrategies}/maximumParallelismStrategy.d.ts +0 -0
  351. /package/dist/evaluator/LlamaContext/utils/{batchItemsPrioritizingStrategies → batchItemsPrioritizationStrategies}/maximumParallelismStrategy.js +0 -0
@@ -0,0 +1,577 @@
1
+ import path from "path";
2
+ import process from "process";
3
+ import { fileURLToPath } from "url";
4
+ import { fork } from "node:child_process";
5
+ import chalk from "chalk";
6
+ import bytes from "bytes";
7
+ import stripAnsi from "strip-ansi";
8
+ import { readGgufFileInfo } from "../../../../gguf/readGgufFileInfo.js";
9
+ import { resolveCommandGgufPath } from "../../../utils/resolveCommandGgufPath.js";
10
+ import { getLlama } from "../../../../bindings/getLlama.js";
11
+ import { LlamaLogLevel } from "../../../../bindings/types.js";
12
+ import { getConsoleLogPrefix } from "../../../../utils/getConsoleLogPrefix.js";
13
+ import { ConsoleTable } from "../../../utils/ConsoleTable.js";
14
+ import { GgufInsights } from "../../../../gguf/GgufInsights.js";
15
+ export const InspectMeasureCommand = {
16
+ command: "measure [path]",
17
+ describe: "Measure VRAM consumption of a GGUF model file with all possible combinations of gpu layers and context sizes",
18
+ builder(yargs) {
19
+ return yargs
20
+ .option("path", {
21
+ type: "string",
22
+ demandOption: true,
23
+ description: "The path of the GGUF model file to measure"
24
+ })
25
+ .option("minLayers", {
26
+ alias: "mnl",
27
+ type: "number",
28
+ default: 1,
29
+ description: "Minimum number of layers to offload to the GPU",
30
+ group: "Optional:"
31
+ })
32
+ .option("maxLayers", {
33
+ alias: "mxl",
34
+ type: "number",
35
+ default: -1,
36
+ defaultDescription: "All layers",
37
+ description: "Maximum number of layers to offload to the GPU",
38
+ group: "Optional:"
39
+ })
40
+ .option("minContextSize", {
41
+ alias: "mncs",
42
+ type: "number",
43
+ default: 512,
44
+ description: "Minimum context size",
45
+ group: "Optional:"
46
+ })
47
+ .option("maxContextSize", {
48
+ alias: "mxcs",
49
+ type: "number",
50
+ default: -1,
51
+ defaultDescription: "Train context size",
52
+ description: "Maximum context size",
53
+ group: "Optional:"
54
+ })
55
+ .option("measures", {
56
+ alias: "m",
57
+ type: "number",
58
+ default: 10,
59
+ description: "Number of context size measures to take for each gpu layers count",
60
+ group: "Optional:"
61
+ })
62
+ .option("printHeaderBeforeEachLayer", {
63
+ alias: "ph",
64
+ type: "boolean",
65
+ default: true,
66
+ description: "Print header before each layer's measures",
67
+ group: "Optional:"
68
+ })
69
+ .option("evaluateText", {
70
+ alias: ["evaluate", "et"],
71
+ type: "string",
72
+ description: "Text to evaluate with the model",
73
+ group: "Optional:"
74
+ })
75
+ .option("repeatEvaluateText", {
76
+ alias: ["repeatEvaluate", "ret"],
77
+ type: "number",
78
+ default: 1,
79
+ description: "Number of times to repeat the evaluation text before sending it for evaluation, in order to make it longer",
80
+ group: "Optional:"
81
+ });
82
+ },
83
+ async handler({ path: ggufPath, minLayers, maxLayers, minContextSize, maxContextSize, measures = 10, printHeaderBeforeEachLayer = true, evaluateText, repeatEvaluateText }) {
84
+ if (maxLayers === -1)
85
+ maxLayers = undefined;
86
+ if (maxContextSize === -1)
87
+ maxContextSize = undefined;
88
+ if (minLayers < 1)
89
+ minLayers = 1;
90
+ const resolvedGgufPath = await resolveCommandGgufPath(ggufPath);
91
+ // ensure a llama build is available
92
+ const llama = await getLlama("lastBuild", {
93
+ logLevel: LlamaLogLevel.error
94
+ });
95
+ console.info(`${chalk.yellow("File:")} ${resolvedGgufPath}`);
96
+ console.info();
97
+ const ggufMetadata = await readGgufFileInfo(resolvedGgufPath, {
98
+ sourceType: "filesystem"
99
+ });
100
+ const ggufInsights = await GgufInsights.from(ggufMetadata, llama);
101
+ const totalVram = llama.getVramState().total;
102
+ let lastGpuLayers = maxLayers ?? ggufInsights.totalLayers;
103
+ let previousContextSizeCheck = undefined;
104
+ measureTable.logHeader({ drawRowSeparator: !printHeaderBeforeEachLayer });
105
+ while (lastGpuLayers >= (minLayers ?? 0)) {
106
+ let printedAlreadyWithThisProcess = false;
107
+ let hadSuccessInThisProcess = false;
108
+ const getNewProccessValue = () => {
109
+ if (printedAlreadyWithThisProcess)
110
+ return undefined;
111
+ printedAlreadyWithThisProcess = true;
112
+ return chalk.green("*");
113
+ };
114
+ const done = await measureModel({
115
+ modelPath: resolvedGgufPath,
116
+ maxGpuLayers: lastGpuLayers,
117
+ minGpuLayers: minLayers,
118
+ initialMaxContextSize: previousContextSizeCheck,
119
+ maxContextSize,
120
+ minContextSize,
121
+ tests: measures,
122
+ evaluateText: evaluateText == null
123
+ ? undefined
124
+ : evaluateText.repeat(repeatEvaluateText ?? 1),
125
+ onInfo({ gpuLayers, result }) {
126
+ if (lastGpuLayers !== gpuLayers) {
127
+ lastGpuLayers = gpuLayers;
128
+ previousContextSizeCheck = undefined;
129
+ measureTable.logLine({});
130
+ if (printHeaderBeforeEachLayer)
131
+ measureTable.logHeader({ drawRowSeparator: false });
132
+ }
133
+ if (result.type === "crash") {
134
+ if (!hadSuccessInThisProcess) {
135
+ measureTable.logLine({
136
+ newProcess: getNewProccessValue(),
137
+ type: chalk.redBright("Crash"),
138
+ gpuLayers: String(lastGpuLayers),
139
+ contextSize: previousContextSizeCheck != null
140
+ ? String(previousContextSizeCheck)
141
+ : chalk.red(result.result),
142
+ estimatedModelVram: previousContextSizeCheck == null
143
+ ? undefined
144
+ : chalk.red(result.result)
145
+ });
146
+ lastGpuLayers--;
147
+ }
148
+ }
149
+ else if (result.type === "error") {
150
+ previousContextSizeCheck = result.contextSize;
151
+ hadSuccessInThisProcess = true;
152
+ measureTable.logLine({
153
+ newProcess: getNewProccessValue(),
154
+ type: chalk.red("Error"),
155
+ gpuLayers: String(lastGpuLayers),
156
+ contextSize: previousContextSizeCheck != null
157
+ ? String(previousContextSizeCheck)
158
+ : chalk.red(result.error),
159
+ estimatedModelVram: previousContextSizeCheck == null
160
+ ? undefined
161
+ : chalk.red(result.error)
162
+ });
163
+ }
164
+ else if (result.type === "success") {
165
+ previousContextSizeCheck = result.contextSize;
166
+ hadSuccessInThisProcess = true;
167
+ const modelVramEstimation = ggufInsights.estimateModelResourceRequirements({ gpuLayers: lastGpuLayers }).gpuVram;
168
+ const modelVramEstimationDiffBytes = (modelVramEstimation < result.modelVramUsage ? "-" : "") +
169
+ bytes(Math.abs(result.modelVramUsage - modelVramEstimation));
170
+ const modelVramEstimationDiffText = modelVramEstimationDiffBytes.padEnd(9, " ") + " " +
171
+ padStartAnsi("(" + renderDiffPercentageWithColors(((modelVramEstimation / result.modelVramUsage) - 1) * 100) + ")", 9);
172
+ const contextVramEstimation = previousContextSizeCheck == null
173
+ ? undefined
174
+ : ggufInsights.estimateContextResourceRequirements({
175
+ contextSize: previousContextSizeCheck,
176
+ modelGpuLayers: lastGpuLayers
177
+ }).gpuVram;
178
+ const contextVramEstimationDiffBytes = (result.contextVramUsage == null || contextVramEstimation == null)
179
+ ? undefined
180
+ : ((contextVramEstimation < result.contextVramUsage ? "-" : "") +
181
+ bytes(Math.abs(result.contextVramUsage - contextVramEstimation)));
182
+ const contextVramEstimationDiffText = (contextVramEstimation == null || contextVramEstimationDiffBytes == null || result.contextVramUsage == null)
183
+ ? undefined
184
+ : (contextVramEstimationDiffBytes.padEnd(9, " ") + " " +
185
+ padStartAnsi("(" + renderDiffPercentageWithColors(((contextVramEstimation / result.contextVramUsage) - 1) * 100) + ")", 9));
186
+ measureTable.logLine({
187
+ newProcess: getNewProccessValue(),
188
+ type: previousContextSizeCheck == null
189
+ ? "Model"
190
+ : "Context",
191
+ gpuLayers: String(lastGpuLayers),
192
+ contextSize: previousContextSizeCheck != null
193
+ ? String(previousContextSizeCheck)
194
+ : undefined,
195
+ estimatedModelVram: bytes(modelVramEstimation),
196
+ actualModelVram: bytes(result.modelVramUsage),
197
+ modelEstimationDiff: modelVramEstimationDiffText,
198
+ estimatedContextVram: contextVramEstimation == null
199
+ ? undefined
200
+ : bytes(contextVramEstimation),
201
+ actualContextVram: result.contextVramUsage == null
202
+ ? undefined
203
+ : bytes(result.contextVramUsage),
204
+ contextEstimationDiff: contextVramEstimationDiffText,
205
+ totalVramUsage: ((result.totalVramUsage / totalVram) * 100).toFixed(2).padStart(5, "0") + "% " +
206
+ chalk.grey("(" + bytes(result.totalVramUsage) + "/" + bytes(totalVram) + ")")
207
+ });
208
+ }
209
+ }
210
+ });
211
+ if (done)
212
+ break;
213
+ }
214
+ }
215
+ };
216
+ const measureTable = new ConsoleTable([{
217
+ key: "newProcess",
218
+ title: " ",
219
+ width: 1
220
+ }, {
221
+ key: "type",
222
+ title: "Type",
223
+ width: Math.max("Type".length, "Model".length, "Context".length),
224
+ canSpanOverEmptyColumns: true
225
+ }, {
226
+ key: "gpuLayers",
227
+ title: "Layers",
228
+ width: "Layers".length,
229
+ canSpanOverEmptyColumns: true
230
+ }, {
231
+ key: "contextSize",
232
+ title: "Context size",
233
+ width: "Context size".length,
234
+ canSpanOverEmptyColumns: true
235
+ }, {
236
+ key: "estimatedModelVram",
237
+ title: "Estimated model VRAM",
238
+ width: "Estimated model VRAM".length,
239
+ canSpanOverEmptyColumns: true
240
+ }, {
241
+ key: "actualModelVram",
242
+ title: "Model VRAM",
243
+ width: "Model VRAM".length
244
+ }, {
245
+ key: "modelEstimationDiff",
246
+ title: "Diff",
247
+ width: Math.max("Diff".length, 9 + 1 + 9)
248
+ }, {
249
+ key: "estimatedContextVram",
250
+ title: "Estimated context VRAM",
251
+ width: "Estimated context VRAM".length
252
+ }, {
253
+ key: "actualContextVram",
254
+ title: "Context VRAM",
255
+ width: "Context VRAM".length
256
+ }, {
257
+ key: "contextEstimationDiff",
258
+ title: "Diff",
259
+ width: Math.max("Diff".length, 9 + 1 + 9)
260
+ }, {
261
+ key: "totalVramUsage",
262
+ title: "VRAM usage",
263
+ width: Math.max("VRAM usage".length, 8 + 1 + 8 + 1 + 8)
264
+ }]);
265
+ function renderDiffPercentageWithColors(percentage, { greenBright = 2, green = 6, yellow = 10, yellowBright = 14 } = {}) {
266
+ const percentageText = percentage.toFixed(2).padStart(5, "0") + "%";
267
+ const absPercentage = Math.abs(percentage);
268
+ if (absPercentage < greenBright)
269
+ return chalk.greenBright(percentageText);
270
+ else if (absPercentage < green)
271
+ return chalk.green(percentageText);
272
+ else if (absPercentage < yellow)
273
+ return chalk.yellow(percentageText);
274
+ else if (absPercentage < yellowBright)
275
+ return chalk.yellowBright(percentageText);
276
+ return chalk.red(percentageText);
277
+ }
278
+ const __filename = fileURLToPath(import.meta.url);
279
+ const detectedFileName = path.basename(__filename);
280
+ const expectedFileName = "InspectMeasureCommand";
281
+ async function measureModel({ modelPath, tests, initialMaxContextSize, maxContextSize, minContextSize, maxGpuLayers, minGpuLayers, evaluateText, onInfo }) {
282
+ if (!detectedFileName.startsWith(expectedFileName)) {
283
+ console.warn(getConsoleLogPrefix() +
284
+ `"${expectedFileName}.js" file is not independent, so running sub-process tests cannot be done with it\n` +
285
+ getConsoleLogPrefix() +
286
+ 'To resolve this issue, make sure that "node-llama-cpp" is not bundled together with other code.');
287
+ throw new Error("Sub-process tests cannot be done with the current file");
288
+ }
289
+ const subProcess = fork(__filename, [], {
290
+ detached: false,
291
+ stdio: [null, null, null, "ipc"],
292
+ env: {
293
+ ...process.env,
294
+ MEASURE_MODEL_CP: "true"
295
+ }
296
+ });
297
+ let isPlannedExit = false;
298
+ let forkSucceeded = false;
299
+ let timeoutHandle = null;
300
+ const processCreationTimeout = 1000 * 60 * 5;
301
+ const stdTexts = [];
302
+ let lastGpuLayers = maxGpuLayers;
303
+ function cleanup() {
304
+ if (subProcess.exitCode == null)
305
+ subProcess.kill("SIGKILL");
306
+ if (timeoutHandle != null)
307
+ clearTimeout(timeoutHandle);
308
+ process.off("exit", cleanup);
309
+ }
310
+ process.on("exit", cleanup);
311
+ subProcess.stdout?.on("data", (data) => {
312
+ stdTexts.push(data.toString());
313
+ });
314
+ subProcess.stderr?.on("data", (data) => {
315
+ stdTexts.push(data.toString());
316
+ });
317
+ return Promise.race([
318
+ new Promise((_, reject) => {
319
+ timeoutHandle = setTimeout(() => {
320
+ if (!forkSucceeded) {
321
+ reject(new Error("Measuring using a sub-process timed out"));
322
+ cleanup();
323
+ }
324
+ }, processCreationTimeout);
325
+ }),
326
+ new Promise((resolve, reject) => {
327
+ function done() {
328
+ if (!forkSucceeded)
329
+ reject(new Error(`Measuring a model failed to run a sub-process via file "${__filename}"`));
330
+ else
331
+ resolve(isPlannedExit);
332
+ cleanup();
333
+ }
334
+ subProcess.on("message", (message) => {
335
+ if (message.type === "ready") {
336
+ forkSucceeded = true;
337
+ subProcess.send({
338
+ type: "start",
339
+ modelPath,
340
+ tests,
341
+ initialMaxContextSize,
342
+ maxContextSize,
343
+ minContextSize,
344
+ maxGpuLayers,
345
+ minGpuLayers,
346
+ evaluateText
347
+ });
348
+ if (timeoutHandle != null) {
349
+ clearTimeout(timeoutHandle);
350
+ timeoutHandle = null;
351
+ }
352
+ }
353
+ else if (message.type === "done") {
354
+ isPlannedExit = true;
355
+ subProcess.send({ type: "exit" });
356
+ }
357
+ else if (message.type === "error") {
358
+ lastGpuLayers = message.gpuLayers;
359
+ onInfo({
360
+ gpuLayers: lastGpuLayers,
361
+ result: {
362
+ type: "error",
363
+ error: message.error,
364
+ contextSize: message.contextSize
365
+ }
366
+ });
367
+ }
368
+ else if (message.type === "stats") {
369
+ lastGpuLayers = message.gpuLayers;
370
+ onInfo({
371
+ gpuLayers: message.gpuLayers,
372
+ result: {
373
+ type: "success",
374
+ modelVramUsage: message.modelVramUsage,
375
+ contextSize: message.contextSize,
376
+ contextVramUsage: message.contextVramUsage,
377
+ contextStateSize: message.contextStateSize,
378
+ totalVramUsage: message.totalVramUsage
379
+ }
380
+ });
381
+ }
382
+ });
383
+ subProcess.on("exit", (code) => {
384
+ if (code !== 0 || !isPlannedExit)
385
+ onInfo({
386
+ gpuLayers: lastGpuLayers,
387
+ result: {
388
+ type: "crash",
389
+ result: stdTexts.join("")
390
+ }
391
+ });
392
+ done();
393
+ });
394
+ if (subProcess.killed || subProcess.exitCode != null) {
395
+ if (subProcess.exitCode !== 0 || !isPlannedExit)
396
+ onInfo({
397
+ gpuLayers: lastGpuLayers,
398
+ result: {
399
+ type: "crash",
400
+ result: stdTexts.join("")
401
+ }
402
+ });
403
+ done();
404
+ }
405
+ })
406
+ ]);
407
+ }
408
+ if (process.env.MEASURE_MODEL_CP === "true" && process.send != null) {
409
+ void runTestWorkerLogic();
410
+ }
411
+ async function runTestWorkerLogic() {
412
+ const llama = await getLlama("lastBuild", {
413
+ logLevel: LlamaLogLevel.error
414
+ });
415
+ if (process.send == null)
416
+ throw new Error("No IPC channel to parent process");
417
+ function sendInfoBack(info) {
418
+ if (process.send == null)
419
+ process.exit(1);
420
+ process.send(info);
421
+ }
422
+ async function testContextSizes({ model, modelVramUsage, startContextSize, maxContextSize, minContextSize, tests, evaluateText }) {
423
+ const contextSizeCheckPlan = getContextSizesCheckPlan(maxContextSize != null
424
+ ? Math.min(model.trainContextSize, maxContextSize)
425
+ : model.trainContextSize, tests, minContextSize);
426
+ let currentContextSizeCheck = startContextSize == null
427
+ ? -1
428
+ : getNextItemInCheckContextSizesPlan(contextSizeCheckPlan, startContextSize);
429
+ while (currentContextSizeCheck != null) {
430
+ if (currentContextSizeCheck === -1)
431
+ currentContextSizeCheck = null;
432
+ try {
433
+ const preContextVramUsage = llama.getVramState().used;
434
+ const context = await model.createContext({
435
+ contextSize: currentContextSizeCheck ?? undefined
436
+ });
437
+ if (evaluateText != null && evaluateText != "") {
438
+ const sequence = context.getSequence();
439
+ await sequence.evaluateWithoutGeneratingNewTokens(model.tokenize(evaluateText));
440
+ }
441
+ const postContextVramUsage = llama.getVramState().used;
442
+ sendInfoBack({
443
+ type: "stats",
444
+ gpuLayers: model.gpuLayers,
445
+ modelVramUsage,
446
+ contextSize: context.contextSize,
447
+ contextVramUsage: postContextVramUsage - preContextVramUsage,
448
+ contextStateSize: context.stateSize,
449
+ totalVramUsage: postContextVramUsage
450
+ });
451
+ currentContextSizeCheck = context.contextSize;
452
+ await context.dispose();
453
+ }
454
+ catch (err) {
455
+ sendInfoBack({
456
+ type: "error",
457
+ error: String(err),
458
+ gpuLayers: model.gpuLayers,
459
+ contextSize: currentContextSizeCheck == null
460
+ ? undefined
461
+ : currentContextSizeCheck
462
+ });
463
+ if (currentContextSizeCheck == null) {
464
+ currentContextSizeCheck = contextSizeCheckPlan[contextSizeCheckPlan.length - 1];
465
+ continue;
466
+ }
467
+ }
468
+ currentContextSizeCheck = getNextItemInCheckContextSizesPlan(contextSizeCheckPlan, currentContextSizeCheck);
469
+ }
470
+ }
471
+ async function testWithGpuLayers({ modelPath, gpuLayers, tests, startContextSize, maxContextSize, minContextSize, evaluateText }) {
472
+ try {
473
+ const preModelVramUsage = llama.getVramState().used;
474
+ const model = await llama.loadModel({
475
+ modelPath,
476
+ gpuLayers
477
+ });
478
+ const postModelVramUsage = llama.getVramState().used;
479
+ sendInfoBack({
480
+ type: "stats",
481
+ gpuLayers: model.gpuLayers,
482
+ modelVramUsage: postModelVramUsage - preModelVramUsage,
483
+ totalVramUsage: postModelVramUsage
484
+ });
485
+ await testContextSizes({
486
+ model,
487
+ modelVramUsage: postModelVramUsage - preModelVramUsage,
488
+ startContextSize,
489
+ maxContextSize,
490
+ minContextSize,
491
+ tests,
492
+ evaluateText
493
+ });
494
+ await model.dispose();
495
+ }
496
+ catch (err) {
497
+ sendInfoBack({
498
+ type: "error",
499
+ error: String(err),
500
+ gpuLayers: gpuLayers
501
+ });
502
+ }
503
+ }
504
+ process.on("message", async (message) => {
505
+ if (message.type === "start") {
506
+ for (let gpuLayers = message.maxGpuLayers; gpuLayers >= (message.minGpuLayers ?? 0); gpuLayers--) {
507
+ await testWithGpuLayers({
508
+ modelPath: message.modelPath,
509
+ gpuLayers,
510
+ tests: message.tests,
511
+ startContextSize: gpuLayers == message.maxGpuLayers
512
+ ? message.initialMaxContextSize
513
+ : undefined,
514
+ maxContextSize: message.maxContextSize,
515
+ minContextSize: message.minContextSize,
516
+ evaluateText: message.evaluateText
517
+ });
518
+ }
519
+ sendInfoBack({ type: "done" });
520
+ }
521
+ else if (message.type === "exit") {
522
+ await llama.dispose();
523
+ process.exit(0);
524
+ }
525
+ });
526
+ process.send({ type: "ready" });
527
+ }
528
+ function getContextSizesCheckPlan(trainContextSize, tests = 10, minContextSize) {
529
+ const res = [];
530
+ let shouldStop = false;
531
+ const attemptToCoverSizes = [256, 512, 1024, 2048, 4096];
532
+ function addSize(size) {
533
+ if (size > trainContextSize) {
534
+ size = trainContextSize;
535
+ shouldStop = true;
536
+ }
537
+ if (size < 2)
538
+ size = 2;
539
+ if (res[res.length - 1] === size) {
540
+ shouldStop = true;
541
+ return;
542
+ }
543
+ res.push(size);
544
+ }
545
+ while (!shouldStop && res.length < tests) {
546
+ const lastSize = res[res.length - 1];
547
+ if (lastSize == null) {
548
+ addSize(Math.max(minContextSize ?? 0, Math.min(attemptToCoverSizes[0], trainContextSize / tests)));
549
+ continue;
550
+ }
551
+ const stepSizesLeft = Math.floor((trainContextSize - Math.min(lastSize, attemptToCoverSizes[attemptToCoverSizes.length - 1])) / (tests - res.length));
552
+ let stopAddingAttemptedSizes = false;
553
+ for (const size of attemptToCoverSizes) {
554
+ if (stepSizesLeft > lastSize && lastSize < size && size <= trainContextSize) {
555
+ addSize(size);
556
+ stopAddingAttemptedSizes = true;
557
+ break;
558
+ }
559
+ }
560
+ if (stopAddingAttemptedSizes)
561
+ continue;
562
+ addSize(lastSize + stepSizesLeft);
563
+ }
564
+ return res.reverse();
565
+ }
566
+ function getNextItemInCheckContextSizesPlan(plan, currentSize) {
567
+ for (const size of plan) {
568
+ if (size < currentSize)
569
+ return size;
570
+ }
571
+ return null;
572
+ }
573
+ function padStartAnsi(text, length, padChar = " ") {
574
+ const textWithoutAnsi = stripAnsi(text);
575
+ return padChar.repeat(Math.max(0, length - textWithoutAnsi.length)) + text;
576
+ }
577
+ //# sourceMappingURL=InspectMeasureCommand.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"InspectMeasureCommand.js","sourceRoot":"","sources":["../../../../../src/cli/commands/inspect/commands/InspectMeasureCommand.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,23 @@
1
+ export declare class ConsoleTable<const T extends readonly ConsoleTableColumn[]> {
2
+ private readonly _columns;
3
+ private readonly _columnSeparator;
4
+ private readonly _drawHeaderRowSeparator;
5
+ constructor(columns: T, { columnSeparator, drawHeaderRowSeparator }?: {
6
+ columnSeparator?: string;
7
+ drawHeaderRowSeparator?: boolean;
8
+ });
9
+ logHeader({ drawRowSeparator }?: {
10
+ drawRowSeparator?: boolean;
11
+ }): void;
12
+ logLine(data: {
13
+ [key in T[number]["key"]]?: string;
14
+ }): void;
15
+ }
16
+ export type ConsoleTableColumn<K extends string = string> = {
17
+ readonly key: K;
18
+ readonly title?: string;
19
+ readonly titleFormatter?: (value: string) => string;
20
+ readonly width?: number;
21
+ readonly valueFormatter?: (value: string) => string;
22
+ readonly canSpanOverEmptyColumns?: boolean;
23
+ };