cui-llama.rn 1.7.4 → 1.7.6
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 +217 -17
- package/android/src/main/CMakeLists.txt +34 -15
- package/android/src/main/java/com/rnllama/LlamaContext.java +79 -5
- package/android/src/main/java/com/rnllama/RNLlama.java +237 -0
- package/android/src/main/jni.cpp +213 -14
- package/android/src/main/jniLibs/arm64-v8a/librnllama.so +0 -0
- package/android/src/main/jniLibs/arm64-v8a/librnllama_v8.so +0 -0
- package/android/src/main/jniLibs/arm64-v8a/librnllama_v8_2.so +0 -0
- package/android/src/main/jniLibs/arm64-v8a/librnllama_v8_2_dotprod.so +0 -0
- package/android/src/main/jniLibs/arm64-v8a/librnllama_v8_2_dotprod_i8mm.so +0 -0
- package/android/src/main/jniLibs/arm64-v8a/librnllama_v8_2_i8mm.so +0 -0
- package/android/src/main/jniLibs/x86_64/librnllama.so +0 -0
- package/android/src/main/jniLibs/x86_64/librnllama_x86_64.so +0 -0
- package/android/src/newarch/java/com/rnllama/RNLlamaModule.java +35 -0
- package/android/src/oldarch/java/com/rnllama/RNLlamaModule.java +34 -0
- package/cpp/README.md +1 -1
- package/cpp/chat-parser.cpp +385 -0
- package/cpp/chat-parser.h +120 -0
- package/cpp/chat.cpp +726 -596
- package/cpp/chat.h +71 -6
- package/cpp/common.cpp +56 -38
- package/cpp/common.h +9 -3
- package/cpp/ggml-backend-reg.cpp +5 -0
- package/cpp/ggml-backend.cpp +10 -2
- package/cpp/ggml-common.h +4 -0
- package/cpp/ggml-cpu/amx/amx.cpp +1 -1
- package/cpp/ggml-cpu/amx/mmq.cpp +11 -10
- package/cpp/ggml-cpu/arch/arm/cpu-feats.cpp +94 -0
- package/cpp/ggml-cpu/arch/arm/quants.c +4114 -0
- package/cpp/ggml-cpu/arch/arm/repack.cpp +2163 -0
- package/cpp/ggml-cpu/arch/x86/cpu-feats.cpp +327 -0
- package/cpp/ggml-cpu/arch/x86/quants.c +4311 -0
- package/cpp/ggml-cpu/{ggml-cpu-aarch64.cpp → arch/x86/repack.cpp} +79 -3225
- package/cpp/ggml-cpu/arch-fallback.h +184 -0
- package/cpp/ggml-cpu/common.h +4 -3
- package/cpp/ggml-cpu/ggml-cpu-impl.h +21 -16
- package/cpp/ggml-cpu/ggml-cpu.c +123 -104
- package/cpp/ggml-cpu/ggml-cpu.cpp +11 -8
- package/cpp/ggml-cpu/ops.cpp +330 -148
- package/cpp/ggml-cpu/ops.h +1 -0
- package/cpp/ggml-cpu/quants.c +1158 -0
- package/cpp/ggml-cpu/{ggml-cpu-quants.h → quants.h} +26 -0
- package/cpp/ggml-cpu/repack.cpp +1571 -0
- package/cpp/ggml-cpu/repack.h +98 -0
- package/cpp/ggml-cpu/simd-mappings.h +330 -38
- package/cpp/ggml-cpu/{ggml-cpu-traits.cpp → traits.cpp} +1 -1
- package/cpp/ggml-cpu/vec.cpp +87 -18
- package/cpp/ggml-cpu/vec.h +249 -94
- package/cpp/ggml-cpu.h +1 -0
- package/cpp/ggml-impl.h +63 -183
- package/cpp/ggml-llama-sim.metallib +0 -0
- package/cpp/ggml-llama.metallib +0 -0
- package/cpp/ggml-metal.m +152 -45
- package/cpp/ggml-quants.c +0 -2
- package/cpp/ggml.c +61 -21
- package/cpp/ggml.h +22 -3
- package/cpp/gguf.cpp +24 -3
- package/cpp/json-partial.cpp +256 -0
- package/cpp/json-partial.h +38 -0
- package/cpp/json-schema-to-grammar.cpp +5 -47
- package/cpp/json-schema-to-grammar.h +4 -4
- package/cpp/llama-arch.cpp +153 -3
- package/cpp/llama-arch.h +27 -1
- package/cpp/llama-batch.cpp +741 -272
- package/cpp/llama-batch.h +112 -54
- package/cpp/llama-chat.cpp +30 -8
- package/cpp/llama-chat.h +1 -0
- package/cpp/llama-context.cpp +524 -339
- package/cpp/llama-context.h +38 -17
- package/cpp/llama-cparams.cpp +4 -0
- package/cpp/llama-cparams.h +2 -0
- package/cpp/llama-grammar.cpp +12 -2
- package/cpp/llama-graph.cpp +431 -356
- package/cpp/llama-graph.h +126 -58
- package/cpp/llama-hparams.cpp +10 -2
- package/cpp/llama-hparams.h +19 -2
- package/cpp/llama-kv-cache-unified-iswa.cpp +279 -0
- package/cpp/llama-kv-cache-unified-iswa.h +128 -0
- package/cpp/llama-kv-cache-unified.cpp +1841 -0
- package/cpp/llama-kv-cache-unified.h +303 -0
- package/cpp/llama-kv-cells.h +439 -0
- package/cpp/llama-memory-hybrid.cpp +246 -0
- package/cpp/llama-memory-hybrid.h +138 -0
- package/cpp/llama-memory-recurrent.cpp +1112 -0
- package/cpp/llama-memory-recurrent.h +183 -0
- package/cpp/llama-memory.cpp +41 -0
- package/cpp/llama-memory.h +86 -5
- package/cpp/llama-mmap.cpp +1 -1
- package/cpp/llama-model-loader.cpp +42 -17
- package/cpp/llama-model-saver.cpp +1 -0
- package/cpp/llama-model.cpp +1639 -513
- package/cpp/llama-model.h +26 -0
- package/cpp/llama-sampling.cpp +2 -2
- package/cpp/llama-vocab.cpp +65 -28
- package/cpp/llama-vocab.h +1 -0
- package/cpp/llama.cpp +11 -7
- package/cpp/llama.h +150 -42
- package/cpp/minja/chat-template.hpp +1 -1
- package/cpp/minja/minja.hpp +1 -1
- package/cpp/{json.hpp → nlohmann/json.hpp} +3027 -2267
- package/cpp/nlohmann/json_fwd.hpp +187 -0
- package/cpp/regex-partial.cpp +204 -0
- package/cpp/regex-partial.h +56 -0
- package/cpp/rn-llama.cpp +646 -35
- package/cpp/rn-llama.h +32 -1
- package/cpp/rn-tts.h +39 -0
- package/cpp/sampling.cpp +7 -8
- package/cpp/tools/mtmd/clip-impl.h +5 -0
- package/cpp/tools/mtmd/clip.cpp +572 -436
- package/cpp/tools/mtmd/clip.h +14 -4
- package/cpp/tools/mtmd/mtmd-audio.cpp +0 -86
- package/cpp/tools/mtmd/mtmd-audio.h +2 -17
- package/cpp/tools/mtmd/mtmd-helper.cpp +175 -12
- package/cpp/tools/mtmd/mtmd-helper.h +91 -0
- package/cpp/tools/mtmd/mtmd.cpp +368 -248
- package/cpp/tools/mtmd/mtmd.h +6 -70
- package/cpp/unicode.cpp +5 -0
- package/ios/CMakeLists.txt +26 -6
- package/ios/RNLlama.h +1 -1
- package/ios/RNLlama.mm +153 -3
- package/ios/RNLlamaContext.h +9 -1
- package/ios/RNLlamaContext.mm +112 -9
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/chat-parser.h +120 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/chat.h +71 -6
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/common.h +9 -3
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/ggml-common.h +4 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/ggml-cpu.h +1 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/ggml-impl.h +63 -183
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/ggml.h +22 -3
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/json-partial.h +38 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/json-schema-to-grammar.h +4 -4
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama-arch.h +27 -1
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama-batch.h +112 -54
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama-chat.h +1 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama-context.h +38 -17
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama-cparams.h +2 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama-graph.h +126 -58
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama-hparams.h +19 -2
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama-kv-cache-unified-iswa.h +128 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama-kv-cache-unified.h +303 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama-kv-cells.h +439 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama-memory-hybrid.h +138 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama-memory-recurrent.h +183 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama-memory.h +86 -5
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama-model.h +26 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama-vocab.h +1 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama.h +150 -42
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/minja/chat-template.hpp +1 -1
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/minja/minja.hpp +1 -1
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/{json.hpp → nlohmann/json.hpp} +3027 -2267
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/nlohmann/json_fwd.hpp +187 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/regex-partial.h +56 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/rn-llama.h +32 -1
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/rn-tts.h +39 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/ggml-llama.metallib +0 -0
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/rnllama +0 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/chat-parser.h +120 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/chat.h +71 -6
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/common.h +9 -3
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/ggml-common.h +4 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/ggml-cpu.h +1 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/ggml-impl.h +63 -183
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/ggml.h +22 -3
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/json-partial.h +38 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/json-schema-to-grammar.h +4 -4
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama-arch.h +27 -1
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama-batch.h +112 -54
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama-chat.h +1 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama-context.h +38 -17
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama-cparams.h +2 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama-graph.h +126 -58
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama-hparams.h +19 -2
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama-kv-cache-unified-iswa.h +128 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama-kv-cache-unified.h +303 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama-kv-cells.h +439 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama-memory-hybrid.h +138 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama-memory-recurrent.h +183 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama-memory.h +86 -5
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama-model.h +26 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama-vocab.h +1 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama.h +150 -42
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/minja/chat-template.hpp +1 -1
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/minja/minja.hpp +1 -1
- package/ios/rnllama.xcframework/{tvos-arm64/rnllama.framework/Headers → ios-arm64_x86_64-simulator/rnllama.framework/Headers/nlohmann}/json.hpp +3027 -2267
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/nlohmann/json_fwd.hpp +187 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/regex-partial.h +56 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/rn-llama.h +32 -1
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/rn-tts.h +39 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/ggml-llama-sim.metallib +0 -0
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/rnllama +0 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/chat-parser.h +120 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/chat.h +71 -6
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/common.h +9 -3
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/ggml-common.h +4 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/ggml-cpu.h +1 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/ggml-impl.h +63 -183
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/ggml.h +22 -3
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/json-partial.h +38 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/json-schema-to-grammar.h +4 -4
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama-arch.h +27 -1
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama-batch.h +112 -54
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama-chat.h +1 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama-context.h +38 -17
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama-cparams.h +2 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama-graph.h +126 -58
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama-hparams.h +19 -2
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama-kv-cache-unified-iswa.h +128 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama-kv-cache-unified.h +303 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama-kv-cells.h +439 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama-memory-hybrid.h +138 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama-memory-recurrent.h +183 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama-memory.h +86 -5
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama-model.h +26 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama-vocab.h +1 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama.h +150 -42
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/minja/chat-template.hpp +1 -1
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/minja/minja.hpp +1 -1
- package/ios/rnllama.xcframework/{ios-arm64_x86_64-simulator/rnllama.framework/Headers → tvos-arm64/rnllama.framework/Headers/nlohmann}/json.hpp +3027 -2267
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/nlohmann/json_fwd.hpp +187 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/regex-partial.h +56 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/rn-llama.h +32 -1
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/rn-tts.h +39 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/ggml-llama.metallib +0 -0
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/rnllama +0 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/chat-parser.h +120 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/chat.h +71 -6
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/common.h +9 -3
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/ggml-common.h +4 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/ggml-cpu.h +1 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/ggml-impl.h +63 -183
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/ggml.h +22 -3
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/json-partial.h +38 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/json-schema-to-grammar.h +4 -4
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama-arch.h +27 -1
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama-batch.h +112 -54
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama-chat.h +1 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama-context.h +38 -17
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama-cparams.h +2 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama-graph.h +126 -58
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama-hparams.h +19 -2
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama-kv-cache-unified-iswa.h +128 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama-kv-cache-unified.h +303 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama-kv-cells.h +439 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama-memory-hybrid.h +138 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama-memory-recurrent.h +183 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama-memory.h +86 -5
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama-model.h +26 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama-vocab.h +1 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama.h +150 -42
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/minja/chat-template.hpp +1 -1
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/minja/minja.hpp +1 -1
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/nlohmann/json.hpp +25526 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/nlohmann/json_fwd.hpp +187 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/regex-partial.h +56 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/rn-llama.h +32 -1
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/rn-tts.h +39 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/ggml-llama-sim.metallib +0 -0
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/rnllama +0 -0
- package/jest/mock.js +24 -0
- package/package.json +1 -1
- package/src/NativeRNLlama.ts +46 -2
- package/src/index.ts +105 -1
- package/cpp/ggml-cpu/ggml-cpu-aarch64.h +0 -8
- package/cpp/ggml-cpu/ggml-cpu-quants.c +0 -13326
- package/cpp/ggml-cpu/sgemm.cpp +0 -3544
- package/cpp/ggml-cpu/sgemm.h +0 -14
- package/cpp/llama-kv-cache.cpp +0 -2827
- package/cpp/llama-kv-cache.h +0 -515
- package/ios/rnllama.xcframework/ios-arm64/rnllama.framework/Headers/llama-kv-cache.h +0 -515
- package/ios/rnllama.xcframework/ios-arm64_x86_64-simulator/rnllama.framework/Headers/llama-kv-cache.h +0 -515
- package/ios/rnllama.xcframework/tvos-arm64/rnllama.framework/Headers/llama-kv-cache.h +0 -515
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/json.hpp +0 -24766
- package/ios/rnllama.xcframework/tvos-arm64_x86_64-simulator/rnllama.framework/Headers/llama-kv-cache.h +0 -515
- /package/cpp/ggml-cpu/{ggml-cpu-traits.h → traits.h} +0 -0
- /package/cpp/tools/mtmd/{miniaudio.h → miniaudio/miniaudio.h} +0 -0
- /package/cpp/tools/mtmd/{stb_image.h → stb/stb_image.h} +0 -0
@@ -0,0 +1,439 @@
|
|
1
|
+
#pragma once
|
2
|
+
|
3
|
+
#include "llama.h"
|
4
|
+
#include "llama-cparams.h"
|
5
|
+
|
6
|
+
#include <bitset>
|
7
|
+
#include <cassert>
|
8
|
+
#include <vector>
|
9
|
+
#include <set>
|
10
|
+
#include <map>
|
11
|
+
|
12
|
+
// meta information about KV cells that can be part of multiple sequences at the same time
|
13
|
+
// TODO: add unit tests
|
14
|
+
class llama_kv_cells_unified {
|
15
|
+
public:
|
16
|
+
void reset() {
|
17
|
+
for (uint32_t i = 0; i < pos.size(); ++i) {
|
18
|
+
pos[i] = -1;
|
19
|
+
shift[i] = 0;
|
20
|
+
seq[i].reset();
|
21
|
+
}
|
22
|
+
|
23
|
+
has_shift = false;
|
24
|
+
|
25
|
+
used.clear();
|
26
|
+
|
27
|
+
for (uint32_t s = 0; s < LLAMA_MAX_SEQ; ++s) {
|
28
|
+
seq_pos[s].clear();
|
29
|
+
}
|
30
|
+
}
|
31
|
+
|
32
|
+
void reset_shift() {
|
33
|
+
has_shift = false;
|
34
|
+
|
35
|
+
for (uint32_t i = 0; i < shift.size(); ++i) {
|
36
|
+
shift[i] = 0;
|
37
|
+
}
|
38
|
+
}
|
39
|
+
|
40
|
+
uint32_t size() const {
|
41
|
+
return pos.size();
|
42
|
+
}
|
43
|
+
|
44
|
+
void resize(uint32_t n) {
|
45
|
+
pos.resize(n);
|
46
|
+
shift.resize(n);
|
47
|
+
seq.resize(n);
|
48
|
+
|
49
|
+
reset();
|
50
|
+
}
|
51
|
+
|
52
|
+
bool is_empty(uint32_t i) const {
|
53
|
+
assert(i < pos.size());
|
54
|
+
assert((pos[i] < 0 && pos[i] == -1) || pos[i] >= 0);
|
55
|
+
|
56
|
+
return pos[i] == -1;
|
57
|
+
}
|
58
|
+
|
59
|
+
uint32_t get_used() const {
|
60
|
+
return used.size();
|
61
|
+
}
|
62
|
+
|
63
|
+
// the index of the first cell that is used
|
64
|
+
// return 0 if no cells are used
|
65
|
+
uint32_t used_min() const {
|
66
|
+
return used.empty() ? 0 : *used.begin();
|
67
|
+
}
|
68
|
+
|
69
|
+
// the index of the last cell that is used + 1
|
70
|
+
// return 0 if no cells are used
|
71
|
+
uint32_t used_max_p1() const {
|
72
|
+
return used.empty() ? 0 : *used.rbegin() + 1;
|
73
|
+
}
|
74
|
+
|
75
|
+
bool get_has_shift() const {
|
76
|
+
return has_shift;
|
77
|
+
}
|
78
|
+
|
79
|
+
// move cell isrc to idst (used during defrag)
|
80
|
+
void mv(uint32_t isrc, uint32_t idst) {
|
81
|
+
assert(isrc < pos.size());
|
82
|
+
assert(idst < pos.size());
|
83
|
+
|
84
|
+
assert(pos[idst] == -1);
|
85
|
+
assert(pos[isrc] != -1);
|
86
|
+
|
87
|
+
pos [idst] = pos [isrc];
|
88
|
+
shift[idst] = shift[isrc];
|
89
|
+
seq [idst] = seq [isrc];
|
90
|
+
|
91
|
+
pos [isrc] = -1;
|
92
|
+
shift[isrc] = 0;
|
93
|
+
seq [isrc].reset();
|
94
|
+
|
95
|
+
used.erase (isrc);
|
96
|
+
used.insert(idst);
|
97
|
+
}
|
98
|
+
|
99
|
+
// copy the state of cells [i, i + n) (used for save/restore the state of the cells)
|
100
|
+
llama_kv_cells_unified cp(uint32_t i, uint32_t n) const {
|
101
|
+
assert(i + n <= pos.size());
|
102
|
+
|
103
|
+
llama_kv_cells_unified res;
|
104
|
+
|
105
|
+
res.resize(n);
|
106
|
+
|
107
|
+
for (uint32_t j = 0; j < n; ++j) {
|
108
|
+
res.pos[j] = pos[i + j];
|
109
|
+
res.seq[j] = seq[i + j];
|
110
|
+
|
111
|
+
assert(shift[i + j] == 0);
|
112
|
+
}
|
113
|
+
|
114
|
+
return res;
|
115
|
+
}
|
116
|
+
|
117
|
+
// set the state of cells [i, i + other.pos.size()) (used for save/restore the state of the cells)
|
118
|
+
void set(uint32_t i, const llama_kv_cells_unified & other) {
|
119
|
+
assert(i + other.pos.size() <= pos.size());
|
120
|
+
|
121
|
+
for (uint32_t j = 0; j < other.pos.size(); ++j) {
|
122
|
+
if (pos[i + j] == -1 && other.pos[j] != -1) {
|
123
|
+
used.insert(i + j);
|
124
|
+
}
|
125
|
+
|
126
|
+
if (pos[i + j] != -1 && other.pos[j] == -1) {
|
127
|
+
used.erase(i + j);
|
128
|
+
}
|
129
|
+
|
130
|
+
if (pos[i + j] != -1) {
|
131
|
+
seq_pos_rm(i + j);
|
132
|
+
}
|
133
|
+
|
134
|
+
pos[i + j] = other.pos[j];
|
135
|
+
seq[i + j] = other.seq[j];
|
136
|
+
|
137
|
+
if (pos[i + j] != -1) {
|
138
|
+
seq_pos_add(i + j);
|
139
|
+
}
|
140
|
+
|
141
|
+
assert(shift[i + j] == 0);
|
142
|
+
}
|
143
|
+
}
|
144
|
+
|
145
|
+
// clear a non-empty cell
|
146
|
+
void rm(uint32_t i) {
|
147
|
+
assert(i < pos.size());
|
148
|
+
assert(pos[i] != -1);
|
149
|
+
|
150
|
+
seq_pos_rm(i);
|
151
|
+
seq[i].reset();
|
152
|
+
|
153
|
+
pos[i] = -1;
|
154
|
+
shift[i] = 0;
|
155
|
+
|
156
|
+
used.erase(i);
|
157
|
+
}
|
158
|
+
|
159
|
+
// note: call only if the cell has seq_id
|
160
|
+
// return true if the cell becomes empty
|
161
|
+
bool seq_rm(uint32_t i, llama_seq_id seq_id) {
|
162
|
+
assert(i < pos.size());
|
163
|
+
assert(seq[i].test(seq_id));
|
164
|
+
assert(pos[i] != -1);
|
165
|
+
assert(seq_id >= 0);
|
166
|
+
|
167
|
+
seq[i].reset(seq_id);
|
168
|
+
seq_pos_dec(seq_id, pos[i]);
|
169
|
+
|
170
|
+
if (seq[i].none()) {
|
171
|
+
pos[i] = -1;
|
172
|
+
shift[i] = 0;
|
173
|
+
|
174
|
+
used.erase(i);
|
175
|
+
|
176
|
+
return true;
|
177
|
+
}
|
178
|
+
|
179
|
+
return false;
|
180
|
+
}
|
181
|
+
|
182
|
+
// return true if the cell becomes empty (i.e. it did not contain seq_id before the call)
|
183
|
+
bool seq_keep(uint32_t i, llama_seq_id seq_id) {
|
184
|
+
assert(i < pos.size());
|
185
|
+
|
186
|
+
if (seq[i].test(seq_id)) {
|
187
|
+
seq_pos_rm(i);
|
188
|
+
seq[i].reset();
|
189
|
+
|
190
|
+
seq[i].set(seq_id);
|
191
|
+
seq_pos_inc(seq_id, pos[i]);
|
192
|
+
|
193
|
+
return false;
|
194
|
+
}
|
195
|
+
|
196
|
+
if (seq[i].any()) {
|
197
|
+
seq_pos_rm(i);
|
198
|
+
seq[i].reset();
|
199
|
+
|
200
|
+
pos[i] = -1;
|
201
|
+
shift[i] = 0;
|
202
|
+
|
203
|
+
used.erase(i);
|
204
|
+
|
205
|
+
return true;
|
206
|
+
}
|
207
|
+
|
208
|
+
assert(pos[i] == -1);
|
209
|
+
|
210
|
+
return false;
|
211
|
+
}
|
212
|
+
|
213
|
+
// number of different sequences in the cell
|
214
|
+
int seq_count(uint32_t i) const {
|
215
|
+
assert(i < pos.size());
|
216
|
+
assert(pos[i] != -1);
|
217
|
+
|
218
|
+
return seq[i].count();
|
219
|
+
}
|
220
|
+
|
221
|
+
// check if the cell contains seq_id
|
222
|
+
bool seq_has(uint32_t i, llama_seq_id seq_id) const {
|
223
|
+
assert(i < pos.size());
|
224
|
+
assert(seq_id >= 0);
|
225
|
+
|
226
|
+
return seq[i].test(seq_id);
|
227
|
+
}
|
228
|
+
|
229
|
+
// note: call only if the cell is not empty and the seq_id is not in the cell
|
230
|
+
void seq_add(uint32_t i, llama_seq_id seq_id) {
|
231
|
+
assert(i < pos.size());
|
232
|
+
assert(pos[i] != -1);
|
233
|
+
assert(!seq[i].test(seq_id));
|
234
|
+
|
235
|
+
seq[i].set(seq_id);
|
236
|
+
seq_pos_inc(seq_id, pos[i]);
|
237
|
+
}
|
238
|
+
|
239
|
+
// return the sequence id of this cell
|
240
|
+
// note: call only for cells with exactly one sequence
|
241
|
+
llama_seq_id seq_get(uint32_t i) const {
|
242
|
+
assert(seq[i].count() == 1);
|
243
|
+
|
244
|
+
for (int s = 0; s < LLAMA_MAX_SEQ; ++s) {
|
245
|
+
if (seq[i].test(s)) {
|
246
|
+
return s;
|
247
|
+
}
|
248
|
+
}
|
249
|
+
|
250
|
+
return -1;
|
251
|
+
}
|
252
|
+
|
253
|
+
// the minimum position of sequence seq_id currently present in any of the cells
|
254
|
+
// return -1 if the sequence is not present
|
255
|
+
llama_pos seq_pos_min(llama_seq_id seq_id) const {
|
256
|
+
assert(seq_id >= 0);
|
257
|
+
assert(seq_id < LLAMA_MAX_SEQ);
|
258
|
+
|
259
|
+
if (seq_pos[seq_id].empty()) {
|
260
|
+
return -1;
|
261
|
+
}
|
262
|
+
|
263
|
+
assert(seq_pos[seq_id].begin()->second > 0);
|
264
|
+
|
265
|
+
return seq_pos[seq_id].begin()->first;
|
266
|
+
}
|
267
|
+
|
268
|
+
// the maximum position of sequence seq_id currently present in any of the cells
|
269
|
+
// return -1 if the sequence is not present
|
270
|
+
llama_pos seq_pos_max(llama_seq_id seq_id) const {
|
271
|
+
assert(seq_id >= 0);
|
272
|
+
assert(seq_id < LLAMA_MAX_SEQ);
|
273
|
+
|
274
|
+
if (seq_pos[seq_id].empty()) {
|
275
|
+
return -1;
|
276
|
+
}
|
277
|
+
|
278
|
+
assert(seq_pos[seq_id].rbegin()->second > 0);
|
279
|
+
|
280
|
+
return seq_pos[seq_id].rbegin()->first;
|
281
|
+
}
|
282
|
+
|
283
|
+
// note: call only if the cell is not empty
|
284
|
+
llama_pos pos_get(uint32_t i) const {
|
285
|
+
assert(i < pos.size());
|
286
|
+
assert(pos[i] != -1);
|
287
|
+
|
288
|
+
return pos[i];
|
289
|
+
}
|
290
|
+
|
291
|
+
// note: call only if the cell is not empty
|
292
|
+
llama_pos get_shift(uint32_t i) const {
|
293
|
+
assert(i < pos.size());
|
294
|
+
assert(pos[i] != -1);
|
295
|
+
|
296
|
+
return shift[i];
|
297
|
+
}
|
298
|
+
|
299
|
+
// check if a cell is not empty and its position is within [p0, p1)
|
300
|
+
bool pos_in(uint32_t i, llama_pos p0, llama_pos p1) const {
|
301
|
+
assert(i < pos.size());
|
302
|
+
|
303
|
+
return pos[i] >= p0 && pos[i] < p1;
|
304
|
+
}
|
305
|
+
|
306
|
+
// set the position of an empty cell
|
307
|
+
// does not modify "has_shift"
|
308
|
+
// note: call only if the cell is empty
|
309
|
+
void pos_set(uint32_t i, llama_pos p) {
|
310
|
+
assert(i < pos.size());
|
311
|
+
assert(pos[i] == -1);
|
312
|
+
assert(seq[i].none());
|
313
|
+
|
314
|
+
pos[i] = p;
|
315
|
+
|
316
|
+
used.insert(i);
|
317
|
+
}
|
318
|
+
|
319
|
+
// pos[i] = pos[i] + d
|
320
|
+
// sets "has_shift" to true
|
321
|
+
// note: call only if the cell is not empty
|
322
|
+
bool pos_add(uint32_t i, llama_pos d) {
|
323
|
+
assert(i < pos.size());
|
324
|
+
assert(pos[i] != -1);
|
325
|
+
|
326
|
+
seq_pos_rm(i);
|
327
|
+
|
328
|
+
pos[i] += d;
|
329
|
+
shift[i] += d;
|
330
|
+
|
331
|
+
has_shift = true;
|
332
|
+
|
333
|
+
if (pos[i] < 0) {
|
334
|
+
seq[i].reset();
|
335
|
+
pos[i] = -1;
|
336
|
+
shift[i] = 0;
|
337
|
+
|
338
|
+
used.erase(i);
|
339
|
+
|
340
|
+
return true;
|
341
|
+
}
|
342
|
+
|
343
|
+
seq_pos_add(i);
|
344
|
+
|
345
|
+
return false;
|
346
|
+
}
|
347
|
+
|
348
|
+
// pos[i] = pos[i] / d
|
349
|
+
// sets "has_shift" to true
|
350
|
+
// note: call only if the cell is not empty
|
351
|
+
void pos_div(uint32_t i, int d) {
|
352
|
+
assert(i < pos.size());
|
353
|
+
assert(pos[i] != -1);
|
354
|
+
|
355
|
+
const llama_pos p_old = pos[i];
|
356
|
+
|
357
|
+
seq_pos_rm(i);
|
358
|
+
|
359
|
+
pos[i] /= d;
|
360
|
+
shift[i] += p_old - pos[i];
|
361
|
+
|
362
|
+
seq_pos_add(i);
|
363
|
+
|
364
|
+
has_shift = true;
|
365
|
+
}
|
366
|
+
|
367
|
+
private:
|
368
|
+
bool has_shift = false;
|
369
|
+
|
370
|
+
// set of indices of used cells (i.e. pos[i] != -1, allowed to not have any seq_id)
|
371
|
+
std::set<uint32_t> used;
|
372
|
+
|
373
|
+
std::vector<llama_pos> pos;
|
374
|
+
|
375
|
+
// this array accumulates any applied shifts to the pos array since the last reset_shift() call
|
376
|
+
// this is used to queue multiple updates to the pos array, which in the end can be applied in one go:
|
377
|
+
//
|
378
|
+
// cells.pos_add(x, shift_x);
|
379
|
+
// cells.pos_div(y, shift_y);
|
380
|
+
// ...
|
381
|
+
//
|
382
|
+
// if (cells.has_shift()) {
|
383
|
+
// for (int i = 0; i < n; ++i) {
|
384
|
+
// auto shift_i = cells.get_shift(i);
|
385
|
+
// ...
|
386
|
+
// }
|
387
|
+
// cells.reset_shift();
|
388
|
+
// }
|
389
|
+
//
|
390
|
+
std::vector<llama_pos> shift;
|
391
|
+
|
392
|
+
using seq_set_t = std::bitset<LLAMA_MAX_SEQ>;
|
393
|
+
|
394
|
+
// the bitset seq[i] tells us which sequences are currently occupying the i-th cell
|
395
|
+
std::vector<seq_set_t> seq;
|
396
|
+
|
397
|
+
// the set seq_pos[s][p] tells us how many times the position p is currently present for sequence s
|
398
|
+
// if the position p is not present, seq_pos[s][p] is not set
|
399
|
+
// this way seq_pos[s].begin() and seq_pos[s].rbegin() give us the min/max positions currently in the cache
|
400
|
+
//
|
401
|
+
// note that we cannot a use an std::set because in some cases a position can occur more than once for the same seq:
|
402
|
+
// - during performing a cache reuse via (rm + add)
|
403
|
+
// - some vision models have input embeddings with repeating positions
|
404
|
+
//
|
405
|
+
std::map<llama_pos, int> seq_pos[LLAMA_MAX_SEQ];
|
406
|
+
|
407
|
+
// helper functions for updating `seq_pos`, once cell at a time:
|
408
|
+
|
409
|
+
void seq_pos_dec(llama_seq_id s, llama_pos p) {
|
410
|
+
auto it = seq_pos[s].find(p);
|
411
|
+
assert(it != seq_pos[s].end());
|
412
|
+
|
413
|
+
if (--it->second == 0) {
|
414
|
+
seq_pos[s].erase(it);
|
415
|
+
}
|
416
|
+
}
|
417
|
+
|
418
|
+
void seq_pos_inc(llama_seq_id s, llama_pos p) {
|
419
|
+
seq_pos[s][p]++;
|
420
|
+
}
|
421
|
+
|
422
|
+
// remove cell i
|
423
|
+
void seq_pos_rm(uint32_t i) {
|
424
|
+
for (int s = 0; s < LLAMA_MAX_SEQ; ++s) {
|
425
|
+
if (seq[i].test(s)) {
|
426
|
+
seq_pos_dec(s, pos[i]);
|
427
|
+
}
|
428
|
+
}
|
429
|
+
}
|
430
|
+
|
431
|
+
// add cell i
|
432
|
+
void seq_pos_add(uint32_t i) {
|
433
|
+
for (int s = 0; s < LLAMA_MAX_SEQ; ++s) {
|
434
|
+
if (seq[i].test(s)) {
|
435
|
+
seq_pos_inc(s, pos[i]);
|
436
|
+
}
|
437
|
+
}
|
438
|
+
}
|
439
|
+
};
|
@@ -0,0 +1,138 @@
|
|
1
|
+
#pragma once
|
2
|
+
|
3
|
+
#include "llama-batch.h"
|
4
|
+
#include "llama-graph.h"
|
5
|
+
#include "llama-kv-cache-unified.h"
|
6
|
+
#include "llama-memory.h"
|
7
|
+
#include "llama-memory-recurrent.h"
|
8
|
+
|
9
|
+
#include <memory>
|
10
|
+
#include <vector>
|
11
|
+
|
12
|
+
//
|
13
|
+
// llama_memory_hybrid
|
14
|
+
//
|
15
|
+
|
16
|
+
// utilizes instances of llama_memory_recurrent and llama_kv_cache_unified to
|
17
|
+
// support models where each layer may be either attention-based or recurrent
|
18
|
+
|
19
|
+
class llama_memory_hybrid : public llama_memory_i {
|
20
|
+
public:
|
21
|
+
|
22
|
+
// this callback is used to filter out layers that should not be included in the cache
|
23
|
+
using layer_filter_cb = std::function<bool(int32_t il)>;
|
24
|
+
|
25
|
+
llama_memory_hybrid(
|
26
|
+
const llama_model & model,
|
27
|
+
/* attn */
|
28
|
+
lm_ggml_type type_k,
|
29
|
+
lm_ggml_type type_v,
|
30
|
+
bool v_trans,
|
31
|
+
uint32_t kv_size,
|
32
|
+
uint32_t n_pad,
|
33
|
+
uint32_t n_swa,
|
34
|
+
llama_swa_type swa_type,
|
35
|
+
/* recurrent */
|
36
|
+
lm_ggml_type type_r,
|
37
|
+
lm_ggml_type type_s,
|
38
|
+
uint32_t rs_size,
|
39
|
+
/* common */
|
40
|
+
uint32_t n_seq_max,
|
41
|
+
bool offload,
|
42
|
+
/* layer filters */
|
43
|
+
layer_filter_cb && filter_attn = nullptr,
|
44
|
+
layer_filter_cb && filter_recr = nullptr);
|
45
|
+
|
46
|
+
~llama_memory_hybrid() = default;
|
47
|
+
|
48
|
+
//
|
49
|
+
// llama_memory_i
|
50
|
+
//
|
51
|
+
|
52
|
+
llama_memory_context_ptr init_batch(
|
53
|
+
llama_batch_allocr & balloc,
|
54
|
+
uint32_t n_ubatch,
|
55
|
+
bool embd_all) override;
|
56
|
+
|
57
|
+
llama_memory_context_ptr init_full() override;
|
58
|
+
|
59
|
+
llama_memory_context_ptr init_update(llama_context * lctx, bool optimize) override;
|
60
|
+
|
61
|
+
bool get_can_shift() const override;
|
62
|
+
|
63
|
+
void clear(bool data) override;
|
64
|
+
|
65
|
+
bool seq_rm (llama_seq_id seq_id, llama_pos p0, llama_pos p1) override;
|
66
|
+
void seq_cp (llama_seq_id seq_id_src, llama_seq_id seq_id_dst, llama_pos p0, llama_pos p1) override;
|
67
|
+
void seq_keep(llama_seq_id seq_id) override;
|
68
|
+
void seq_add (llama_seq_id seq_id, llama_pos p0, llama_pos p1, llama_pos shift) override;
|
69
|
+
void seq_div (llama_seq_id seq_id, llama_pos p0, llama_pos p1, int d) override;
|
70
|
+
|
71
|
+
llama_pos seq_pos_min(llama_seq_id seq_id) const override;
|
72
|
+
llama_pos seq_pos_max(llama_seq_id seq_id) const override;
|
73
|
+
|
74
|
+
// state write/load
|
75
|
+
|
76
|
+
void state_write(llama_io_write_i & io, llama_seq_id seq_id = -1) const override;
|
77
|
+
void state_read (llama_io_read_i & io, llama_seq_id seq_id = -1) override;
|
78
|
+
|
79
|
+
//
|
80
|
+
// llama_memory_hybrid specific API
|
81
|
+
//
|
82
|
+
|
83
|
+
llama_kv_cache_unified * get_mem_attn() const;
|
84
|
+
llama_memory_recurrent * get_mem_recr() const;
|
85
|
+
|
86
|
+
private:
|
87
|
+
const llama_hparams & hparams;
|
88
|
+
|
89
|
+
const std::unique_ptr<llama_kv_cache_unified> mem_attn;
|
90
|
+
const std::unique_ptr<llama_memory_recurrent> mem_recr;
|
91
|
+
};
|
92
|
+
|
93
|
+
class llama_memory_hybrid_context : public llama_memory_context_i {
|
94
|
+
public:
|
95
|
+
// init failure
|
96
|
+
explicit llama_memory_hybrid_context(llama_memory_status status);
|
97
|
+
|
98
|
+
// init full
|
99
|
+
explicit llama_memory_hybrid_context(llama_memory_hybrid * mem);
|
100
|
+
|
101
|
+
// init update
|
102
|
+
explicit llama_memory_hybrid_context(
|
103
|
+
llama_memory_hybrid * mem,
|
104
|
+
llama_context * lctx,
|
105
|
+
bool optimize);
|
106
|
+
|
107
|
+
// init success
|
108
|
+
llama_memory_hybrid_context(
|
109
|
+
llama_memory_hybrid * mem,
|
110
|
+
std::vector<uint32_t> heads_attn,
|
111
|
+
std::vector<llama_ubatch> ubatches);
|
112
|
+
|
113
|
+
~llama_memory_hybrid_context() = default;
|
114
|
+
|
115
|
+
bool next() override;
|
116
|
+
bool apply() override;
|
117
|
+
|
118
|
+
llama_memory_status get_status() const override;
|
119
|
+
const llama_ubatch & get_ubatch() const override;
|
120
|
+
|
121
|
+
//
|
122
|
+
// llama_memory_hybrid_context
|
123
|
+
//
|
124
|
+
|
125
|
+
const llama_kv_cache_unified_context * get_attn() const;
|
126
|
+
const llama_memory_recurrent_context * get_recr() const;
|
127
|
+
|
128
|
+
private:
|
129
|
+
// the index of the next ubatch to process
|
130
|
+
size_t i_next = 0;
|
131
|
+
|
132
|
+
std::vector<llama_ubatch> ubatches;
|
133
|
+
|
134
|
+
const llama_memory_context_ptr ctx_attn;
|
135
|
+
const llama_memory_context_ptr ctx_recr;
|
136
|
+
|
137
|
+
const llama_memory_status status;
|
138
|
+
};
|