whispercpp 1.3.4 → 1.3.5
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.
- checksums.yaml +4 -4
- data/README.md +60 -43
- data/ext/extconf.rb +2 -2
- data/ext/ruby_whisper.c +14 -2
- data/ext/ruby_whisper.h +39 -0
- data/ext/ruby_whisper_context.c +22 -22
- data/ext/ruby_whisper_model.c +12 -12
- data/ext/ruby_whisper_params.c +47 -23
- data/ext/ruby_whisper_segment.c +84 -19
- data/ext/ruby_whisper_token.c +351 -0
- data/ext/ruby_whisper_transcribe.cpp +1 -1
- data/ext/ruby_whisper_vad_context.c +75 -0
- data/ext/ruby_whisper_vad_context_detect.cpp +50 -0
- data/ext/ruby_whisper_vad_segment.c +139 -0
- data/ext/ruby_whisper_vad_segments.c +106 -0
- data/ext/sources/CMakeLists.txt +4 -1
- data/ext/sources/bindings/javascript/package.json +1 -1
- data/ext/sources/cmake/arm64-apple-clang.cmake +16 -0
- data/ext/sources/cmake/arm64-windows-llvm.cmake +16 -0
- data/ext/sources/cmake/riscv64-spacemit-linux-gnu-gcc.cmake +29 -0
- data/ext/sources/cmake/x64-windows-llvm.cmake +5 -0
- data/ext/sources/examples/addon.node/vad-example.js +2 -2
- data/ext/sources/examples/cli/cli.cpp +121 -112
- data/ext/sources/examples/lsp/CMakeLists.txt +2 -1
- data/ext/sources/examples/quantize/CMakeLists.txt +2 -1
- data/ext/sources/examples/server/server.cpp +10 -11
- data/ext/sources/examples/talk-llama/CMakeLists.txt +5 -1
- data/ext/sources/examples/talk-llama/llama-adapter.cpp +12 -3
- data/ext/sources/examples/talk-llama/llama-adapter.h +7 -1
- data/ext/sources/examples/talk-llama/llama-arch.cpp +2046 -1974
- data/ext/sources/examples/talk-llama/llama-arch.h +67 -2
- data/ext/sources/examples/talk-llama/llama-batch.cpp +75 -33
- data/ext/sources/examples/talk-llama/llama-batch.h +17 -4
- data/ext/sources/examples/talk-llama/llama-chat.cpp +79 -3
- data/ext/sources/examples/talk-llama/llama-chat.h +4 -0
- data/ext/sources/examples/talk-llama/llama-context.cpp +775 -78
- data/ext/sources/examples/talk-llama/llama-context.h +57 -9
- data/ext/sources/examples/talk-llama/llama-cparams.h +1 -0
- data/ext/sources/examples/talk-llama/llama-grammar.cpp +288 -53
- data/ext/sources/examples/talk-llama/llama-grammar.h +22 -1
- data/ext/sources/examples/talk-llama/llama-graph.cpp +381 -64
- data/ext/sources/examples/talk-llama/llama-graph.h +103 -13
- data/ext/sources/examples/talk-llama/llama-hparams.cpp +26 -2
- data/ext/sources/examples/talk-llama/llama-hparams.h +41 -10
- data/ext/sources/examples/talk-llama/llama-impl.cpp +7 -3
- data/ext/sources/examples/talk-llama/llama-impl.h +1 -1
- data/ext/sources/examples/talk-llama/llama-kv-cache-iswa.cpp +5 -3
- data/ext/sources/examples/talk-llama/llama-kv-cache.cpp +145 -65
- data/ext/sources/examples/talk-llama/llama-kv-cache.h +22 -7
- data/ext/sources/examples/talk-llama/llama-kv-cells.h +44 -2
- data/ext/sources/examples/talk-llama/llama-memory-hybrid.cpp +12 -10
- data/ext/sources/examples/talk-llama/llama-memory-recurrent.cpp +32 -19
- data/ext/sources/examples/talk-llama/llama-memory-recurrent.h +2 -2
- data/ext/sources/examples/talk-llama/llama-mmap.cpp +172 -37
- data/ext/sources/examples/talk-llama/llama-mmap.h +8 -3
- data/ext/sources/examples/talk-llama/llama-model-loader.cpp +91 -9
- data/ext/sources/examples/talk-llama/llama-model-loader.h +6 -0
- data/ext/sources/examples/talk-llama/llama-model-saver.cpp +3 -0
- data/ext/sources/examples/talk-llama/llama-model.cpp +1529 -13134
- data/ext/sources/examples/talk-llama/llama-model.h +44 -3
- data/ext/sources/examples/talk-llama/llama-quant.cpp +8 -23
- data/ext/sources/examples/talk-llama/llama-sampling.cpp +1294 -198
- data/ext/sources/examples/talk-llama/llama-sampling.h +19 -7
- data/ext/sources/examples/talk-llama/llama-vocab.cpp +133 -37
- data/ext/sources/examples/talk-llama/llama-vocab.h +45 -40
- data/ext/sources/examples/talk-llama/llama.cpp +729 -2
- data/ext/sources/examples/talk-llama/llama.h +152 -14
- data/ext/sources/examples/talk-llama/models/afmoe.cpp +191 -0
- data/ext/sources/examples/talk-llama/models/apertus.cpp +125 -0
- data/ext/sources/examples/talk-llama/models/arcee.cpp +135 -0
- data/ext/sources/examples/talk-llama/models/arctic.cpp +138 -0
- data/ext/sources/examples/talk-llama/models/arwkv7.cpp +86 -0
- data/ext/sources/examples/talk-llama/models/baichuan.cpp +122 -0
- data/ext/sources/examples/talk-llama/models/bailingmoe.cpp +144 -0
- data/ext/sources/examples/talk-llama/models/bailingmoe2.cpp +135 -0
- data/ext/sources/examples/talk-llama/models/bert.cpp +178 -0
- data/ext/sources/examples/talk-llama/models/bitnet.cpp +160 -0
- data/ext/sources/examples/talk-llama/models/bloom.cpp +101 -0
- data/ext/sources/examples/talk-llama/models/chameleon.cpp +178 -0
- data/ext/sources/examples/talk-llama/models/chatglm.cpp +132 -0
- data/ext/sources/examples/talk-llama/models/codeshell.cpp +111 -0
- data/ext/sources/examples/talk-llama/models/cogvlm.cpp +102 -0
- data/ext/sources/examples/talk-llama/models/cohere2-iswa.cpp +134 -0
- data/ext/sources/examples/talk-llama/models/command-r.cpp +122 -0
- data/ext/sources/examples/talk-llama/models/dbrx.cpp +123 -0
- data/ext/sources/examples/talk-llama/models/deci.cpp +135 -0
- data/ext/sources/examples/talk-llama/models/deepseek.cpp +144 -0
- data/ext/sources/examples/talk-llama/models/deepseek2.cpp +259 -0
- data/ext/sources/examples/talk-llama/models/dots1.cpp +134 -0
- data/ext/sources/examples/talk-llama/models/dream.cpp +105 -0
- data/ext/sources/examples/talk-llama/models/ernie4-5-moe.cpp +150 -0
- data/ext/sources/examples/talk-llama/models/ernie4-5.cpp +110 -0
- data/ext/sources/examples/talk-llama/models/exaone.cpp +114 -0
- data/ext/sources/examples/talk-llama/models/exaone4.cpp +123 -0
- data/ext/sources/examples/talk-llama/models/falcon-h1.cpp +113 -0
- data/ext/sources/examples/talk-llama/models/falcon.cpp +120 -0
- data/ext/sources/examples/talk-llama/models/gemma-embedding.cpp +116 -0
- data/ext/sources/examples/talk-llama/models/gemma.cpp +112 -0
- data/ext/sources/examples/talk-llama/models/gemma2-iswa.cpp +128 -0
- data/ext/sources/examples/talk-llama/models/gemma3.cpp +155 -0
- data/ext/sources/examples/talk-llama/models/gemma3n-iswa.cpp +384 -0
- data/ext/sources/examples/talk-llama/models/glm4-moe.cpp +170 -0
- data/ext/sources/examples/talk-llama/models/glm4.cpp +150 -0
- data/ext/sources/examples/talk-llama/models/gpt2.cpp +105 -0
- data/ext/sources/examples/talk-llama/models/gptneox.cpp +144 -0
- data/ext/sources/examples/talk-llama/models/granite-hybrid.cpp +196 -0
- data/ext/sources/examples/talk-llama/models/granite.cpp +211 -0
- data/ext/sources/examples/talk-llama/models/graph-context-mamba.cpp +283 -0
- data/ext/sources/examples/talk-llama/models/grok.cpp +159 -0
- data/ext/sources/examples/talk-llama/models/grovemoe.cpp +141 -0
- data/ext/sources/examples/talk-llama/models/hunyuan-dense.cpp +132 -0
- data/ext/sources/examples/talk-llama/models/hunyuan-moe.cpp +154 -0
- data/ext/sources/examples/talk-llama/models/internlm2.cpp +120 -0
- data/ext/sources/examples/talk-llama/models/jais.cpp +86 -0
- data/ext/sources/examples/talk-llama/models/jamba.cpp +106 -0
- data/ext/sources/examples/talk-llama/models/lfm2.cpp +175 -0
- data/ext/sources/examples/talk-llama/models/llada-moe.cpp +122 -0
- data/ext/sources/examples/talk-llama/models/llada.cpp +99 -0
- data/ext/sources/examples/talk-llama/models/llama-iswa.cpp +178 -0
- data/ext/sources/examples/talk-llama/models/llama.cpp +168 -0
- data/ext/sources/examples/talk-llama/models/maincoder.cpp +117 -0
- data/ext/sources/examples/talk-llama/models/mamba.cpp +55 -0
- data/ext/sources/examples/talk-llama/models/mimo2-iswa.cpp +123 -0
- data/ext/sources/examples/talk-llama/models/minicpm3.cpp +199 -0
- data/ext/sources/examples/talk-llama/models/minimax-m2.cpp +124 -0
- data/ext/sources/examples/talk-llama/models/mistral3.cpp +160 -0
- data/ext/sources/examples/talk-llama/models/models.h +569 -0
- data/ext/sources/examples/talk-llama/models/modern-bert.cpp +116 -0
- data/ext/sources/examples/talk-llama/models/mpt.cpp +126 -0
- data/ext/sources/examples/talk-llama/models/nemotron-h.cpp +150 -0
- data/ext/sources/examples/talk-llama/models/nemotron.cpp +122 -0
- data/ext/sources/examples/talk-llama/models/neo-bert.cpp +104 -0
- data/ext/sources/examples/talk-llama/models/olmo.cpp +121 -0
- data/ext/sources/examples/talk-llama/models/olmo2.cpp +150 -0
- data/ext/sources/examples/talk-llama/models/olmoe.cpp +124 -0
- data/ext/sources/examples/talk-llama/models/openai-moe-iswa.cpp +127 -0
- data/ext/sources/examples/talk-llama/models/openelm.cpp +124 -0
- data/ext/sources/examples/talk-llama/models/orion.cpp +123 -0
- data/ext/sources/examples/talk-llama/models/pangu-embedded.cpp +121 -0
- data/ext/sources/examples/talk-llama/models/phi2.cpp +121 -0
- data/ext/sources/examples/talk-llama/models/phi3.cpp +152 -0
- data/ext/sources/examples/talk-llama/models/plamo.cpp +110 -0
- data/ext/sources/examples/talk-llama/models/plamo2.cpp +316 -0
- data/ext/sources/examples/talk-llama/models/plamo3.cpp +128 -0
- data/ext/sources/examples/talk-llama/models/plm.cpp +168 -0
- data/ext/sources/examples/talk-llama/models/qwen.cpp +108 -0
- data/ext/sources/examples/talk-llama/models/qwen2.cpp +126 -0
- data/ext/sources/examples/talk-llama/models/qwen2moe.cpp +151 -0
- data/ext/sources/examples/talk-llama/models/qwen2vl.cpp +117 -0
- data/ext/sources/examples/talk-llama/models/qwen3.cpp +117 -0
- data/ext/sources/examples/talk-llama/models/qwen3moe.cpp +124 -0
- data/ext/sources/examples/talk-llama/models/qwen3next.cpp +873 -0
- data/ext/sources/examples/talk-llama/models/qwen3vl-moe.cpp +149 -0
- data/ext/sources/examples/talk-llama/models/qwen3vl.cpp +141 -0
- data/ext/sources/examples/talk-llama/models/refact.cpp +94 -0
- data/ext/sources/examples/talk-llama/models/rnd1.cpp +126 -0
- data/ext/sources/examples/talk-llama/models/rwkv6-base.cpp +162 -0
- data/ext/sources/examples/talk-llama/models/rwkv6.cpp +94 -0
- data/ext/sources/examples/talk-llama/models/rwkv6qwen2.cpp +86 -0
- data/ext/sources/examples/talk-llama/models/rwkv7-base.cpp +135 -0
- data/ext/sources/examples/talk-llama/models/rwkv7.cpp +90 -0
- data/ext/sources/examples/talk-llama/models/seed-oss.cpp +124 -0
- data/ext/sources/examples/talk-llama/models/smallthinker.cpp +126 -0
- data/ext/sources/examples/talk-llama/models/smollm3.cpp +128 -0
- data/ext/sources/examples/talk-llama/models/stablelm.cpp +146 -0
- data/ext/sources/examples/talk-llama/models/starcoder.cpp +100 -0
- data/ext/sources/examples/talk-llama/models/starcoder2.cpp +121 -0
- data/ext/sources/examples/talk-llama/models/t5-dec.cpp +166 -0
- data/ext/sources/examples/talk-llama/models/t5-enc.cpp +96 -0
- data/ext/sources/examples/talk-llama/models/wavtokenizer-dec.cpp +149 -0
- data/ext/sources/examples/talk-llama/models/xverse.cpp +108 -0
- data/ext/sources/examples/talk-llama/unicode.cpp +102 -16
- data/ext/sources/examples/vad-speech-segments/CMakeLists.txt +1 -1
- data/ext/sources/examples/whisper.wasm/index-tmpl.html +1 -1
- data/ext/sources/ggml/CMakeLists.txt +82 -54
- data/ext/sources/ggml/include/ggml-alloc.h +9 -0
- data/ext/sources/ggml/include/ggml-backend.h +4 -1
- data/ext/sources/ggml/include/ggml-cpu.h +1 -0
- data/ext/sources/ggml/include/ggml-hexagon.h +19 -0
- data/ext/sources/ggml/include/ggml-rpc.h +8 -11
- data/ext/sources/ggml/include/ggml-zendnn.h +22 -0
- data/ext/sources/ggml/include/ggml.h +190 -12
- data/ext/sources/ggml/src/CMakeLists.txt +82 -11
- data/ext/sources/ggml/src/ggml-alloc.c +124 -41
- data/ext/sources/ggml/src/ggml-backend-impl.h +1 -4
- data/ext/sources/ggml/src/ggml-backend-reg.cpp +27 -3
- data/ext/sources/ggml/src/ggml-backend.cpp +71 -21
- data/ext/sources/ggml/src/ggml-blas/CMakeLists.txt +17 -3
- data/ext/sources/ggml/src/ggml-blas/ggml-blas.cpp +5 -9
- data/ext/sources/ggml/src/ggml-cann/acl_tensor.cpp +57 -45
- data/ext/sources/ggml/src/ggml-cann/acl_tensor.h +138 -47
- data/ext/sources/ggml/src/ggml-cann/aclnn_ops.cpp +2179 -1696
- data/ext/sources/ggml/src/ggml-cann/aclnn_ops.h +238 -317
- data/ext/sources/ggml/src/ggml-cann/common.h +283 -208
- data/ext/sources/ggml/src/ggml-cann/ggml-cann.cpp +626 -776
- data/ext/sources/ggml/src/ggml-cpu/CMakeLists.txt +156 -86
- data/ext/sources/ggml/src/ggml-cpu/amx/amx.cpp +1 -0
- data/ext/sources/ggml/src/ggml-cpu/arch/arm/cpu-feats.cpp +4 -0
- data/ext/sources/ggml/src/ggml-cpu/arch/arm/quants.c +428 -26
- data/ext/sources/ggml/src/ggml-cpu/arch/arm/repack.cpp +1004 -0
- data/ext/sources/ggml/src/ggml-cpu/arch/loongarch/quants.c +4 -5
- data/ext/sources/ggml/src/ggml-cpu/arch/riscv/cpu-feats.cpp +38 -0
- data/ext/sources/ggml/src/ggml-cpu/arch/riscv/quants.c +108 -49
- data/ext/sources/ggml/src/ggml-cpu/arch/s390/cpu-feats.cpp +50 -0
- data/ext/sources/ggml/src/ggml-cpu/arch/x86/repack.cpp +6 -6
- data/ext/sources/ggml/src/ggml-cpu/arch-fallback.h +50 -2
- data/ext/sources/ggml/src/ggml-cpu/ggml-cpu-impl.h +5 -3
- data/ext/sources/ggml/src/ggml-cpu/ggml-cpu.c +195 -71
- data/ext/sources/ggml/src/ggml-cpu/ggml-cpu.cpp +4 -0
- data/ext/sources/ggml/src/ggml-cpu/kleidiai/kernels.cpp +573 -106
- data/ext/sources/ggml/src/ggml-cpu/kleidiai/kernels.h +33 -44
- data/ext/sources/ggml/src/ggml-cpu/kleidiai/kleidiai.cpp +298 -112
- data/ext/sources/ggml/src/ggml-cpu/llamafile/sgemm-ppc.h +333 -0
- data/ext/sources/ggml/src/ggml-cpu/llamafile/sgemm.cpp +819 -125
- data/ext/sources/ggml/src/ggml-cpu/llamafile/sgemm.h +6 -0
- data/ext/sources/ggml/src/ggml-cpu/ops.cpp +708 -431
- data/ext/sources/ggml/src/ggml-cpu/ops.h +5 -4
- data/ext/sources/ggml/src/ggml-cpu/repack.cpp +671 -31
- data/ext/sources/ggml/src/ggml-cpu/repack.h +14 -0
- data/ext/sources/ggml/src/ggml-cpu/simd-mappings.h +41 -43
- data/ext/sources/ggml/src/ggml-cpu/spacemit/ime.cpp +3 -2
- data/ext/sources/ggml/src/ggml-cpu/unary-ops.cpp +151 -0
- data/ext/sources/ggml/src/ggml-cpu/unary-ops.h +7 -0
- data/ext/sources/ggml/src/ggml-cpu/vec.cpp +124 -1
- data/ext/sources/ggml/src/ggml-cpu/vec.h +261 -146
- data/ext/sources/ggml/src/ggml-cuda/CMakeLists.txt +72 -1
- data/ext/sources/ggml/src/ggml-cuda/argmax.cu +2 -2
- data/ext/sources/ggml/src/ggml-cuda/argsort.cu +123 -6
- data/ext/sources/ggml/src/ggml-cuda/argsort.cuh +16 -0
- data/ext/sources/ggml/src/ggml-cuda/binbcast.cu +1 -1
- data/ext/sources/ggml/src/ggml-cuda/common.cuh +353 -80
- data/ext/sources/ggml/src/ggml-cuda/convert.cuh +10 -0
- data/ext/sources/ggml/src/ggml-cuda/cpy-utils.cuh +1 -1
- data/ext/sources/ggml/src/ggml-cuda/cpy.cu +339 -246
- data/ext/sources/ggml/src/ggml-cuda/cpy.cuh +1 -5
- data/ext/sources/ggml/src/ggml-cuda/cumsum.cu +307 -0
- data/ext/sources/ggml/src/ggml-cuda/cumsum.cuh +5 -0
- data/ext/sources/ggml/src/ggml-cuda/diag.cu +77 -0
- data/ext/sources/ggml/src/ggml-cuda/diag.cuh +5 -0
- data/ext/sources/ggml/src/ggml-cuda/fattn-common.cuh +31 -21
- data/ext/sources/ggml/src/ggml-cuda/fattn-mma-f16.cuh +663 -596
- data/ext/sources/ggml/src/ggml-cuda/fattn-tile.cu +35 -741
- data/ext/sources/ggml/src/ggml-cuda/fattn-tile.cuh +1241 -0
- data/ext/sources/ggml/src/ggml-cuda/fattn-vec.cuh +30 -37
- data/ext/sources/ggml/src/ggml-cuda/fattn-wmma-f16.cu +14 -13
- data/ext/sources/ggml/src/ggml-cuda/fattn-wmma-f16.cuh +48 -0
- data/ext/sources/ggml/src/ggml-cuda/fattn.cu +83 -37
- data/ext/sources/ggml/src/ggml-cuda/fill.cu +37 -0
- data/ext/sources/ggml/src/ggml-cuda/fill.cuh +3 -0
- data/ext/sources/ggml/src/ggml-cuda/ggml-cuda.cu +1155 -164
- data/ext/sources/ggml/src/ggml-cuda/mean.cu +5 -4
- data/ext/sources/ggml/src/ggml-cuda/mma.cuh +741 -48
- data/ext/sources/ggml/src/ggml-cuda/mmf.cu +60 -12
- data/ext/sources/ggml/src/ggml-cuda/mmf.cuh +381 -42
- data/ext/sources/ggml/src/ggml-cuda/mmid.cu +164 -0
- data/ext/sources/ggml/src/ggml-cuda/mmid.cuh +5 -0
- data/ext/sources/ggml/src/ggml-cuda/mmq.cu +69 -176
- data/ext/sources/ggml/src/ggml-cuda/mmq.cuh +498 -171
- data/ext/sources/ggml/src/ggml-cuda/mmvf.cu +375 -79
- data/ext/sources/ggml/src/ggml-cuda/mmvf.cuh +3 -2
- data/ext/sources/ggml/src/ggml-cuda/mmvq.cu +241 -95
- data/ext/sources/ggml/src/ggml-cuda/mmvq.cuh +1 -1
- data/ext/sources/ggml/src/ggml-cuda/pad.cu +64 -33
- data/ext/sources/ggml/src/ggml-cuda/quantize.cu +151 -0
- data/ext/sources/ggml/src/ggml-cuda/quantize.cuh +14 -0
- data/ext/sources/ggml/src/ggml-cuda/rope.cu +192 -77
- data/ext/sources/ggml/src/ggml-cuda/rope.cuh +2 -0
- data/ext/sources/ggml/src/ggml-cuda/set-rows.cu +101 -47
- data/ext/sources/ggml/src/ggml-cuda/set.cu +39 -0
- data/ext/sources/ggml/src/ggml-cuda/set.cuh +7 -0
- data/ext/sources/ggml/src/ggml-cuda/softmax.cu +203 -6
- data/ext/sources/ggml/src/ggml-cuda/solve_tri.cu +275 -0
- data/ext/sources/ggml/src/ggml-cuda/solve_tri.cuh +3 -0
- data/ext/sources/ggml/src/ggml-cuda/ssm-conv.cu +14 -20
- data/ext/sources/ggml/src/ggml-cuda/ssm-scan.cu +49 -84
- data/ext/sources/ggml/src/ggml-cuda/template-instances/fattn-tile-instance-dkq112-dv112.cu +5 -0
- data/ext/sources/ggml/src/ggml-cuda/template-instances/fattn-tile-instance-dkq128-dv128.cu +5 -0
- data/ext/sources/ggml/src/ggml-cuda/template-instances/fattn-tile-instance-dkq256-dv256.cu +5 -0
- data/ext/sources/ggml/src/ggml-cuda/template-instances/fattn-tile-instance-dkq40-dv40.cu +5 -0
- data/ext/sources/ggml/src/ggml-cuda/template-instances/fattn-tile-instance-dkq576-dv512.cu +5 -0
- data/ext/sources/ggml/src/ggml-cuda/template-instances/fattn-tile-instance-dkq64-dv64.cu +5 -0
- data/ext/sources/ggml/src/ggml-cuda/template-instances/fattn-tile-instance-dkq72-dv72.cu +5 -0
- data/ext/sources/ggml/src/ggml-cuda/template-instances/fattn-tile-instance-dkq80-dv80.cu +5 -0
- data/ext/sources/ggml/src/ggml-cuda/template-instances/fattn-tile-instance-dkq96-dv96.cu +5 -0
- data/ext/sources/ggml/src/ggml-cuda/template-instances/generate_cu_files.py +19 -1
- data/ext/sources/ggml/src/ggml-cuda/top-k.cu +96 -0
- data/ext/sources/ggml/src/ggml-cuda/top-k.cuh +3 -0
- data/ext/sources/ggml/src/ggml-cuda/topk-moe.cu +168 -76
- data/ext/sources/ggml/src/ggml-cuda/topk-moe.cuh +11 -4
- data/ext/sources/ggml/src/ggml-cuda/tri.cu +136 -0
- data/ext/sources/ggml/src/ggml-cuda/tri.cuh +5 -0
- data/ext/sources/ggml/src/ggml-cuda/unary.cu +105 -11
- data/ext/sources/ggml/src/ggml-cuda/unary.cuh +36 -0
- data/ext/sources/ggml/src/ggml-cuda/upscale.cu +163 -7
- data/ext/sources/ggml/src/ggml-cuda/vendors/cuda.h +4 -0
- data/ext/sources/ggml/src/ggml-cuda/vendors/hip.h +12 -1
- data/ext/sources/ggml/src/ggml-cuda/vendors/musa.h +6 -0
- data/ext/sources/ggml/src/ggml-hexagon/CMakeLists.txt +80 -0
- data/ext/sources/ggml/src/ggml-hexagon/ggml-hexagon.cpp +3151 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/CMakeLists.txt +44 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/act-ops.c +682 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/binary-ops.c +360 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/cmake-toolchain.cmake +157 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/flash-attn-ops.c +566 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/get-rows-ops.c +112 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/htp-ctx.h +35 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/htp-dma.c +63 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/htp-dma.h +157 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/htp-msg.h +165 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/htp-ops.h +92 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/htp_iface.idl +16 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/hvx-exp.c +94 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/hvx-inverse.c +72 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/hvx-sigmoid.c +49 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/hvx-utils.c +1020 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/hvx-utils.h +1353 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/main.c +1001 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/matmul-ops.c +2503 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/ops-utils.h +149 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/rope-ops.c +487 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/set-rows-ops.c +168 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/softmax-ops.c +402 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/unary-ops.c +287 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/worker-pool.c +297 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp/worker-pool.h +57 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp-utils.c +454 -0
- data/ext/sources/ggml/src/ggml-hexagon/htp-utils.h +221 -0
- data/ext/sources/ggml/src/ggml-hexagon/op-desc.h +153 -0
- data/ext/sources/ggml/src/ggml-hip/CMakeLists.txt +8 -13
- data/ext/sources/ggml/src/ggml-impl.h +67 -6
- data/ext/sources/ggml/src/ggml-metal/ggml-metal-common.cpp +2 -2
- data/ext/sources/ggml/src/ggml-metal/ggml-metal-context.m +29 -20
- data/ext/sources/ggml/src/ggml-metal/ggml-metal-device.cpp +652 -285
- data/ext/sources/ggml/src/ggml-metal/ggml-metal-device.h +103 -56
- data/ext/sources/ggml/src/ggml-metal/ggml-metal-device.m +496 -118
- data/ext/sources/ggml/src/ggml-metal/ggml-metal-impl.h +231 -9
- data/ext/sources/ggml/src/ggml-metal/ggml-metal-ops.cpp +1227 -224
- data/ext/sources/ggml/src/ggml-metal/ggml-metal-ops.h +12 -0
- data/ext/sources/ggml/src/ggml-metal/ggml-metal.cpp +14 -8
- data/ext/sources/ggml/src/ggml-metal/ggml-metal.metal +1972 -704
- data/ext/sources/ggml/src/ggml-musa/CMakeLists.txt +3 -1
- data/ext/sources/ggml/src/ggml-opencl/CMakeLists.txt +11 -0
- data/ext/sources/ggml/src/ggml-opencl/ggml-opencl.cpp +1430 -120
- data/ext/sources/ggml/src/ggml-opencl/kernels/cvt.cl +63 -0
- data/ext/sources/ggml/src/ggml-opencl/kernels/expm1.cl +82 -0
- data/ext/sources/ggml/src/ggml-opencl/kernels/fill.cl +17 -0
- data/ext/sources/ggml/src/ggml-opencl/kernels/flash_attn_f32.cl +4 -3
- data/ext/sources/ggml/src/ggml-opencl/kernels/gemm_moe_mxfp4_f32.cl +162 -0
- data/ext/sources/ggml/src/ggml-opencl/kernels/gemv_moe_mxfp4_f32.cl +156 -0
- data/ext/sources/ggml/src/ggml-opencl/kernels/get_rows.cl +36 -12
- data/ext/sources/ggml/src/ggml-opencl/kernels/mean.cl +39 -0
- data/ext/sources/ggml/src/ggml-opencl/kernels/mul_mm_f16_f32_kq_kqv.cl +273 -0
- data/ext/sources/ggml/src/ggml-opencl/kernels/mul_mm_f16_f32_l4_lm.cl +24 -10
- data/ext/sources/ggml/src/ggml-opencl/kernels/mul_mm_f32_f32_l4_lm.cl +24 -10
- data/ext/sources/ggml/src/ggml-opencl/kernels/mul_mm_q8_0_f32_l4_lm.cl +154 -0
- data/ext/sources/ggml/src/ggml-opencl/kernels/pad.cl +29 -20
- data/ext/sources/ggml/src/ggml-opencl/kernels/rms_norm.cl +25 -10
- data/ext/sources/ggml/src/ggml-opencl/kernels/rope.cl +50 -24
- data/ext/sources/ggml/src/ggml-opencl/kernels/set_rows.cl +35 -16
- data/ext/sources/ggml/src/ggml-opencl/kernels/softplus.cl +88 -0
- data/ext/sources/ggml/src/ggml-opencl/kernels/sqr.cl +53 -0
- data/ext/sources/ggml/src/ggml-opencl/kernels/sqrt.cl +53 -0
- data/ext/sources/ggml/src/ggml-opencl/kernels/ssm_conv.cl +77 -0
- data/ext/sources/ggml/src/ggml-opencl/kernels/transpose.cl +13 -0
- data/ext/sources/ggml/src/ggml-rpc/ggml-rpc.cpp +438 -156
- data/ext/sources/ggml/src/ggml-sycl/CMakeLists.txt +48 -3
- data/ext/sources/ggml/src/ggml-sycl/add-id.cpp +77 -0
- data/ext/sources/ggml/src/ggml-sycl/add-id.hpp +8 -0
- data/ext/sources/ggml/src/ggml-sycl/backend.hpp +6 -0
- data/ext/sources/ggml/src/ggml-sycl/binbcast.cpp +0 -9
- data/ext/sources/ggml/src/ggml-sycl/binbcast.hpp +0 -6
- data/ext/sources/ggml/src/ggml-sycl/common.hpp +117 -15
- data/ext/sources/ggml/src/ggml-sycl/concat.cpp +55 -44
- data/ext/sources/ggml/src/ggml-sycl/convert.cpp +34 -0
- data/ext/sources/ggml/src/ggml-sycl/count-equal.cpp +79 -0
- data/ext/sources/ggml/src/ggml-sycl/count-equal.hpp +9 -0
- data/ext/sources/ggml/src/ggml-sycl/cpy.cpp +0 -3
- data/ext/sources/ggml/src/ggml-sycl/dequantize.hpp +18 -0
- data/ext/sources/ggml/src/ggml-sycl/dpct/helper.hpp +76 -3
- data/ext/sources/ggml/src/ggml-sycl/element_wise.cpp +333 -300
- data/ext/sources/ggml/src/ggml-sycl/element_wise.hpp +10 -2
- data/ext/sources/ggml/src/ggml-sycl/ggml-sycl.cpp +335 -110
- data/ext/sources/ggml/src/ggml-sycl/mmvq.cpp +22 -0
- data/ext/sources/ggml/src/ggml-sycl/norm.cpp +156 -0
- data/ext/sources/ggml/src/ggml-sycl/norm.hpp +2 -0
- data/ext/sources/ggml/src/ggml-sycl/pad.cpp +97 -0
- data/ext/sources/ggml/src/ggml-sycl/pad.hpp +24 -0
- data/ext/sources/ggml/src/ggml-sycl/pad_reflect_1d.cpp +100 -0
- data/ext/sources/ggml/src/ggml-sycl/pad_reflect_1d.hpp +10 -0
- data/ext/sources/ggml/src/ggml-sycl/presets.hpp +2 -0
- data/ext/sources/ggml/src/ggml-sycl/repeat_back.cpp +76 -0
- data/ext/sources/ggml/src/ggml-sycl/repeat_back.hpp +8 -0
- data/ext/sources/ggml/src/ggml-sycl/roll.cpp +122 -0
- data/ext/sources/ggml/src/ggml-sycl/roll.hpp +20 -0
- data/ext/sources/ggml/src/ggml-sycl/rope.cpp +30 -17
- data/ext/sources/ggml/src/ggml-sycl/set.cpp +73 -0
- data/ext/sources/ggml/src/ggml-sycl/set.hpp +5 -0
- data/ext/sources/ggml/src/ggml-sycl/softmax.cpp +327 -162
- data/ext/sources/ggml/src/ggml-sycl/softmax.hpp +4 -0
- data/ext/sources/ggml/src/ggml-sycl/ssm_conv.cpp +127 -0
- data/ext/sources/ggml/src/ggml-sycl/ssm_conv.hpp +5 -0
- data/ext/sources/ggml/src/ggml-sycl/vecdotq.hpp +58 -0
- data/ext/sources/ggml/src/ggml-vulkan/CMakeLists.txt +38 -18
- data/ext/sources/ggml/src/ggml-vulkan/ggml-vulkan.cpp +5013 -2859
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/abs.comp +21 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/acc.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/add.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/add1.comp +28 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/add_id.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/arange.comp +20 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/argmax.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/argsort.comp +33 -26
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/argsort_large.comp +114 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/ceil.comp +22 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/clamp.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/concat.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/contig_copy.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/conv2d_dw.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/conv2d_mm.comp +47 -49
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/conv_transpose_1d.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/copy.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/copy_from_quant.comp +3 -3
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/copy_to_quant.comp +4 -4
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/copy_transpose.comp +67 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/cos.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/count_equal.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/count_experts.comp +51 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/cumsum.comp +83 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/cumsum_multipass1.comp +60 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/cumsum_multipass2.comp +66 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_f32.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{dequant_funcs.comp → dequant_funcs.glsl} +9 -21
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{dequant_funcs_cm2.comp → dequant_funcs_cm2.glsl} +18 -4
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{dequant_head.comp → dequant_head.glsl} +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_iq1_m.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_iq1_s.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_iq2_s.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_iq2_xs.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_iq2_xxs.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_iq3_s.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_iq3_xxs.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_iq4_nl.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_iq4_xs.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_mxfp4.comp +3 -3
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_q2_k.comp +3 -3
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_q3_k.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_q4_0.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_q4_1.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_q4_k.comp +3 -3
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_q5_0.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_q5_1.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_q5_k.comp +3 -3
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_q6_k.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/dequant_q8_0.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/diag.comp +29 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/diag_mask_inf.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/div.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/exp.comp +3 -3
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/fill.comp +19 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/flash_attn.comp +39 -17
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{flash_attn_base.comp → flash_attn_base.glsl} +19 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/flash_attn_cm1.comp +45 -7
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/flash_attn_cm2.comp +50 -12
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/flash_attn_split_k_reduce.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/floor.comp +22 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/geglu.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/geglu_erf.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/geglu_quick.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/gelu.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/gelu_erf.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/gelu_quick.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{generic_binary_head.comp → generic_binary_head.glsl} +17 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{generic_head.comp → generic_head.glsl} +2 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{generic_unary_head.comp → generic_unary_head.glsl} +7 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/get_rows.comp +4 -4
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/get_rows_quant.comp +3 -3
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{glu_head.comp → glu_head.glsl} +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/group_norm.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/hardsigmoid.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/hardswish.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/im2col.comp +19 -7
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/im2col_3d.comp +2 -3
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/l2_norm.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/leaky_relu.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/log.comp +18 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{mul_mat_vec_base.comp → mul_mat_vec_base.glsl} +70 -25
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_iface.glsl +35 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_iq1_m.comp +71 -21
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_iq1_s.comp +41 -25
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_iq2_s.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_iq2_xs.comp +44 -26
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_iq2_xxs.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_iq3_s.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_iq3_xxs.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_nc.comp +9 -7
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_p021.comp +9 -7
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_q2_k.comp +4 -6
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_q3_k.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_q4_k.comp +4 -6
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_q5_k.comp +4 -6
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_q6_k.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vecq.comp +39 -36
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vecq_funcs.glsl +494 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mm.comp +78 -103
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mm_cm2.comp +34 -23
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{mul_mm_funcs.comp → mul_mm_funcs.glsl} +69 -59
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mm_id_funcs.glsl +72 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mmq.comp +88 -228
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mmq_funcs.glsl +454 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mmq_shmem_types.glsl +78 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/multi_add.comp +97 -13
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/neg.comp +20 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/norm.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/opt_step_adamw.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/opt_step_sgd.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/pad.comp +21 -6
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/pool2d.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/quantize_q8_1.comp +10 -10
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/reglu.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/relu.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/repeat.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/repeat_back.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/rms_norm.comp +50 -4
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/rms_norm_back.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/rms_norm_partials.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/roll.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/rope_funcs.glsl +234 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/rope_head.glsl +20 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/rope_multi.comp +6 -50
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/rope_neox.comp +6 -33
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/rope_norm.comp +6 -33
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/rope_params.glsl +28 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/rope_vision.comp +6 -39
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/round.comp +29 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/scale.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/sigmoid.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/silu.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/silu_back.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/sin.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/soft_max.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/soft_max_back.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/soft_max_large1.comp +62 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/soft_max_large2.comp +79 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/soft_max_large3.comp +65 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/soft_max_large_common.glsl +53 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/softplus.comp +23 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/solve_tri.comp +81 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/sqrt.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/square.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/ssm_conv.comp +44 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/ssm_scan.comp +124 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/step.comp +22 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/sub.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/sum_rows.comp +2 -25
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/sum_rows.glsl +25 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/swiglu.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/swiglu_oai.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/tanh.comp +2 -2
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/timestep_embedding.comp +1 -1
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/topk_argsort.comp +118 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/topk_moe.comp +213 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/topk_nary_search.comp +246 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/tri.comp +43 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/trunc.comp +22 -0
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{types.comp → types.glsl} +345 -26
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/upscale.comp +90 -12
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp +335 -151
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/xielu.comp +35 -0
- data/ext/sources/ggml/src/ggml-webgpu/CMakeLists.txt +28 -2
- data/ext/sources/ggml/src/ggml-webgpu/ggml-webgpu-shader-lib.hpp +169 -0
- data/ext/sources/ggml/src/ggml-webgpu/ggml-webgpu.cpp +1964 -435
- data/ext/sources/ggml/src/ggml-webgpu/pre_wgsl.hpp +778 -0
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/bin_op.tmpl.wgsl +188 -0
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/cpy.tmpl.wgsl +101 -0
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/embed_wgsl.py +33 -10
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/flash_attn.wgsl +591 -0
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/get_rows.tmpl.wgsl +1 -1
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/glu.tmpl.wgsl +323 -0
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/mul_mat.tmpl.wgsl +6 -6
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/mul_mat_decls.tmpl +97 -0
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/mul_mat_reg_tile.tmpl.wgsl +247 -0
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/mul_mat_subgroup_matrix.tmpl.wgsl +302 -0
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/mul_mat_vec.tmpl.wgsl +267 -0
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/rms_norm.wgsl +83 -17
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/rope.tmpl.wgsl +295 -0
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/scale.tmpl.wgsl +90 -0
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/set_rows.tmpl.wgsl +112 -0
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/soft_max.tmpl.wgsl +345 -0
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/unary_op.wgsl +483 -0
- data/ext/sources/ggml/src/ggml-zendnn/CMakeLists.txt +92 -0
- data/ext/sources/ggml/src/ggml-zendnn/ggml-zendnn.cpp +466 -0
- data/ext/sources/ggml/src/ggml.c +425 -33
- data/ext/sources/include/whisper.h +1 -0
- data/ext/sources/src/CMakeLists.txt +3 -1
- data/ext/sources/src/whisper.cpp +101 -35
- data/ext/sources/tests/CMakeLists.txt +2 -2
- data/ext/sources/tests/test-vad-full.cpp +4 -2
- data/ext/sources/tests/test-vad.cpp +1 -1
- data/extsources.rb +1 -0
- data/lib/whisper/model/uri.rb +17 -18
- data/sig/whisper.rbs +119 -2
- data/test/test_params.rb +16 -8
- data/test/test_segment.rb +0 -1
- data/test/test_token.rb +70 -0
- data/test/test_vad.rb +1 -1
- data/test/test_vad_context.rb +50 -0
- data/test/test_vad_segment.rb +19 -0
- data/test/test_vad_segments.rb +16 -0
- data/test/test_whisper.rb +7 -0
- data/whispercpp.gemspec +1 -1
- metadata +287 -34
- data/ext/sources/build-xcframework.sh +0 -571
- data/ext/sources/ggml/src/ggml-cann/Doxyfile +0 -2579
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/mul_mmq_funcs.comp +0 -105
- data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/rope_head.comp +0 -55
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/add.tmpl.wgsl +0 -44
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/add_in_place.tmpl.wgsl +0 -41
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/cpy.wgsl +0 -60
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/mul.tmpl.wgsl +0 -44
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/mul_in_place.tmpl.wgsl +0 -41
- data/ext/sources/ggml/src/ggml-webgpu/wgsl-shaders/rms_norm_in_place.wgsl +0 -48
- /data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{test_bfloat16_support.comp → feature-tests/bfloat16.comp} +0 -0
- /data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{test_coopmat_support.comp → feature-tests/coopmat.comp} +0 -0
- /data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{test_coopmat2_support.comp → feature-tests/coopmat2.comp} +0 -0
- /data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{test_integer_dot_support.comp → feature-tests/integer_dot.comp} +0 -0
- /data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{glu_main.comp → glu_main.glsl} +0 -0
- /data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{rte.comp → rte.glsl} +0 -0
- /data/ext/sources/ggml/src/ggml-vulkan/vulkan-shaders/{utils.comp → utils.glsl} +0 -0
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
#include "llama.h"
|
|
2
|
+
|
|
1
3
|
#include "llama-impl.h"
|
|
2
4
|
|
|
3
5
|
#include "llama-chat.h"
|
|
6
|
+
#include "llama-context.h"
|
|
4
7
|
#include "llama-mmap.h"
|
|
5
8
|
#include "llama-vocab.h"
|
|
6
9
|
#include "llama-model-loader.h"
|
|
@@ -11,11 +14,14 @@
|
|
|
11
14
|
#include "ggml-backend.h"
|
|
12
15
|
|
|
13
16
|
#include <algorithm>
|
|
17
|
+
#include <cassert>
|
|
18
|
+
#include <cinttypes>
|
|
14
19
|
#include <cstddef>
|
|
15
20
|
#include <cstdint>
|
|
16
21
|
#include <cstdio>
|
|
17
22
|
#include <cstring>
|
|
18
23
|
#include <ctime>
|
|
24
|
+
#include <stdexcept>
|
|
19
25
|
|
|
20
26
|
#if defined(_MSC_VER)
|
|
21
27
|
#pragma warning(disable: 4244 4267) // possible loss of data
|
|
@@ -37,9 +43,721 @@ const char * llama_flash_attn_type_name(enum llama_flash_attn_type flash_attn_ty
|
|
|
37
43
|
GGML_ABORT("fatal error");
|
|
38
44
|
}
|
|
39
45
|
|
|
46
|
+
struct llama_device_memory_data {
|
|
47
|
+
int64_t total;
|
|
48
|
+
int64_t free;
|
|
49
|
+
llama_memory_breakdown_data mb;
|
|
50
|
+
};
|
|
51
|
+
|
|
52
|
+
static std::vector<llama_device_memory_data> llama_get_device_memory_data(
|
|
53
|
+
const char * path_model, const llama_model_params * mparams, const llama_context_params * cparams,
|
|
54
|
+
std::vector<ggml_backend_dev_t> & devs, uint32_t & hp_ngl, uint32_t & hp_n_ctx_train, uint32_t & hp_n_expert,
|
|
55
|
+
const ggml_log_level log_level) {
|
|
56
|
+
struct user_data_t {
|
|
57
|
+
struct {
|
|
58
|
+
ggml_log_callback callback;
|
|
59
|
+
void * user_data;
|
|
60
|
+
} original_logger;
|
|
61
|
+
ggml_log_level min_level; // prints below this log level go to debug log
|
|
62
|
+
};
|
|
63
|
+
user_data_t ud;
|
|
64
|
+
llama_log_get(&ud.original_logger.callback, &ud.original_logger.user_data);
|
|
65
|
+
ud.min_level = log_level;
|
|
66
|
+
|
|
67
|
+
llama_log_set([](ggml_log_level level, const char * text, void * user_data) {
|
|
68
|
+
const user_data_t * ud = (const user_data_t *) user_data;
|
|
69
|
+
const ggml_log_level level_eff = level >= ud->min_level ? level : GGML_LOG_LEVEL_DEBUG;
|
|
70
|
+
ud->original_logger.callback(level_eff, text, ud->original_logger.user_data);
|
|
71
|
+
}, &ud);
|
|
72
|
+
|
|
73
|
+
llama_model_params mparams_copy = *mparams;
|
|
74
|
+
mparams_copy.no_alloc = true;
|
|
75
|
+
mparams_copy.use_mmap = false;
|
|
76
|
+
mparams_copy.use_mlock = false;
|
|
77
|
+
|
|
78
|
+
llama_model * model = llama_model_load_from_file(path_model, mparams_copy);
|
|
79
|
+
if (model == nullptr) {
|
|
80
|
+
llama_log_set(ud.original_logger.callback, ud.original_logger.user_data);
|
|
81
|
+
throw std::runtime_error("failed to load model");
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
llama_context * ctx = llama_init_from_model(model, *cparams);
|
|
85
|
+
if (ctx == nullptr) {
|
|
86
|
+
llama_model_free(model);
|
|
87
|
+
llama_log_set(ud.original_logger.callback, ud.original_logger.user_data);
|
|
88
|
+
throw std::runtime_error("failed to create llama_context from model");
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
std::vector<llama_device_memory_data> ret(model->devices.size());
|
|
92
|
+
|
|
93
|
+
std::map<ggml_backend_buffer_type_t, llama_memory_breakdown_data> memory_breakdown = ctx->memory_breakdown();
|
|
94
|
+
|
|
95
|
+
for (const auto & [buft, mb] : memory_breakdown) {
|
|
96
|
+
if (ggml_backend_buft_is_host(buft)) {
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
ggml_backend_dev_t dev = ggml_backend_buft_get_device(buft);
|
|
101
|
+
if (!dev) {
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
104
|
+
for (size_t i = 0; i < ret.size(); i++) {
|
|
105
|
+
if (model->devices[i] == dev) {
|
|
106
|
+
ret[i].mb.model += mb.model;
|
|
107
|
+
ret[i].mb.context += mb.context;
|
|
108
|
+
ret[i].mb.compute += mb.compute;
|
|
109
|
+
break;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
for (size_t i = 0; i < ret.size(); i++) {
|
|
114
|
+
size_t free;
|
|
115
|
+
size_t total;
|
|
116
|
+
ggml_backend_dev_memory(model->devices[i], &free, &total);
|
|
117
|
+
|
|
118
|
+
// devices can return 0 bytes for free and total memory if they do not
|
|
119
|
+
// have any to report. in this case, we will use the host memory as a fallback
|
|
120
|
+
// fixes: https://github.com/ggml-org/llama.cpp/issues/18577
|
|
121
|
+
if (free == 0 && total == 0) {
|
|
122
|
+
ggml_backend_dev_t cpu_dev = ggml_backend_dev_by_type(GGML_BACKEND_DEVICE_TYPE_CPU);
|
|
123
|
+
if (cpu_dev == nullptr) {
|
|
124
|
+
throw std::runtime_error(format("%s: no CPU backend found", __func__));
|
|
125
|
+
}
|
|
126
|
+
ggml_backend_dev_memory(cpu_dev, &free, &total);
|
|
127
|
+
}
|
|
128
|
+
ret[i].free = free;
|
|
129
|
+
ret[i].total = total;
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
devs = model->devices;
|
|
133
|
+
hp_ngl = model->hparams.n_layer;
|
|
134
|
+
hp_n_ctx_train = model->hparams.n_ctx_train;
|
|
135
|
+
hp_n_expert = model->hparams.n_expert;
|
|
136
|
+
|
|
137
|
+
llama_memory_breakdown_print(ctx); // goes to debug log
|
|
138
|
+
|
|
139
|
+
llama_free(ctx);
|
|
140
|
+
llama_model_free(model);
|
|
141
|
+
llama_log_set(ud.original_logger.callback, ud.original_logger.user_data);
|
|
142
|
+
return ret;
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
// enum to identify part of a layer for distributing its tensors:
|
|
146
|
+
enum layer_fraction_t {
|
|
147
|
+
LAYER_FRACTION_NONE = 0, // nothing
|
|
148
|
+
LAYER_FRACTION_ATTN = 1, // attention
|
|
149
|
+
LAYER_FRACTION_UP = 2, // attention + up
|
|
150
|
+
LAYER_FRACTION_GATE = 3, // attention + up + gate
|
|
151
|
+
LAYER_FRACTION_MOE = 4, // everything but sparse MoE weights
|
|
152
|
+
};
|
|
153
|
+
// this enum is only used in llama_params_fit_impl but needs to be defined outside of it to fix a Windows compilation issue
|
|
154
|
+
|
|
155
|
+
class llama_params_fit_exception : public std::runtime_error {
|
|
156
|
+
using std::runtime_error::runtime_error;
|
|
157
|
+
};
|
|
158
|
+
|
|
159
|
+
static void llama_params_fit_impl(
|
|
160
|
+
const char * path_model, struct llama_model_params * mparams, struct llama_context_params * cparams,
|
|
161
|
+
float * tensor_split, struct llama_model_tensor_buft_override * tensor_buft_overrides,
|
|
162
|
+
size_t * margins_s, uint32_t n_ctx_min, enum ggml_log_level log_level) {
|
|
163
|
+
constexpr int64_t MiB = 1024*1024;
|
|
164
|
+
typedef std::vector<llama_device_memory_data> dmds_t;
|
|
165
|
+
const llama_model_params default_mparams = llama_model_default_params();
|
|
166
|
+
|
|
167
|
+
std::vector<ggml_backend_dev_t> devs;
|
|
168
|
+
uint32_t hp_ngl = 0; // hparams.n_gpu_layers
|
|
169
|
+
uint32_t hp_nct = 0; // hparams.n_ctx_train
|
|
170
|
+
uint32_t hp_nex = 0; // hparams.n_expert
|
|
171
|
+
|
|
172
|
+
// step 1: get data for default parameters and check whether any changes are necessary in the first place
|
|
173
|
+
|
|
174
|
+
LLAMA_LOG_DEBUG("%s: getting device memory data for initial parameters:\n", __func__);
|
|
175
|
+
const dmds_t dmds_full = llama_get_device_memory_data(path_model, mparams, cparams, devs, hp_ngl, hp_nct, hp_nex, log_level);
|
|
176
|
+
const size_t nd = devs.size(); // number of devices
|
|
177
|
+
if (nd == 0) {
|
|
178
|
+
LLAMA_LOG_INFO("%s: no devices with dedicated memory found\n", __func__);
|
|
179
|
+
return;
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
std::vector<int64_t> margins; // this function uses int64_t rather than size_t for memory sizes to more conveniently handle deficits
|
|
183
|
+
margins.reserve(nd);
|
|
184
|
+
for (size_t id = 0; id < nd; id++) {
|
|
185
|
+
margins.push_back(margins_s[id]);
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
std::vector<std::string> dev_names;
|
|
189
|
+
{
|
|
190
|
+
dev_names.reserve(nd);
|
|
191
|
+
size_t max_length = 0;
|
|
192
|
+
for (ggml_backend_dev_t dev : devs) {
|
|
193
|
+
std::string name = ggml_backend_dev_name(dev);
|
|
194
|
+
name += " (";
|
|
195
|
+
name += ggml_backend_dev_description(dev);
|
|
196
|
+
name += ")";
|
|
197
|
+
dev_names.push_back(name);
|
|
198
|
+
max_length = std::max(max_length, name.length());
|
|
199
|
+
}
|
|
200
|
+
for (std::string & dn : dev_names) {
|
|
201
|
+
dn.insert(dn.end(), max_length - dn.length(), ' ');
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
int64_t sum_free = 0;
|
|
206
|
+
int64_t sum_projected_free = 0;
|
|
207
|
+
int64_t sum_projected_used = 0;
|
|
208
|
+
int64_t sum_projected_model = 0;
|
|
209
|
+
std::vector<int64_t> projected_free_per_device;
|
|
210
|
+
projected_free_per_device.reserve(nd);
|
|
211
|
+
|
|
212
|
+
if (nd > 1) {
|
|
213
|
+
LLAMA_LOG_INFO("%s: projected memory use with initial parameters [MiB]:\n", __func__);
|
|
214
|
+
}
|
|
215
|
+
for (size_t id = 0; id < nd; id++) {
|
|
216
|
+
const llama_device_memory_data & dmd = dmds_full[id];
|
|
217
|
+
|
|
218
|
+
const int64_t projected_used = dmd.mb.total();
|
|
219
|
+
const int64_t projected_free = dmd.free - projected_used;
|
|
220
|
+
projected_free_per_device.push_back(projected_free);
|
|
221
|
+
|
|
222
|
+
sum_free += dmd.free;
|
|
223
|
+
sum_projected_used += projected_used;
|
|
224
|
+
sum_projected_free += projected_free;
|
|
225
|
+
sum_projected_model += dmd.mb.model;
|
|
226
|
+
|
|
227
|
+
if (nd > 1) {
|
|
228
|
+
LLAMA_LOG_INFO("%s: - %s: %6" PRId64 " total, %6" PRId64 " used, %6" PRId64 " free vs. target of %6" PRId64 "\n",
|
|
229
|
+
__func__, dev_names[id].c_str(), dmd.total/MiB, projected_used/MiB, projected_free/MiB, margins[id]/MiB);
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
assert(sum_free >= 0 && sum_projected_used >= 0);
|
|
233
|
+
LLAMA_LOG_INFO("%s: projected to use %" PRId64 " MiB of device memory vs. %" PRId64 " MiB of free device memory\n",
|
|
234
|
+
__func__, sum_projected_used/MiB, sum_free/MiB);
|
|
235
|
+
if (nd == 1) {
|
|
236
|
+
if (projected_free_per_device[0] >= margins[0]) {
|
|
237
|
+
LLAMA_LOG_INFO("%s: will leave %" PRId64 " >= %" PRId64 " MiB of free device memory, no changes needed\n",
|
|
238
|
+
__func__, projected_free_per_device[0]/MiB, margins[0]/MiB);
|
|
239
|
+
return;
|
|
240
|
+
}
|
|
241
|
+
} else {
|
|
242
|
+
bool changes_needed = false;
|
|
243
|
+
for (size_t id = 0; id < nd; id++) {
|
|
244
|
+
if (projected_free_per_device[id] < margins[id]) {
|
|
245
|
+
changes_needed = true;
|
|
246
|
+
break;
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
if (!changes_needed) {
|
|
250
|
+
LLAMA_LOG_INFO("%s: targets for free memory can be met on all devices, no changes needed\n", __func__);
|
|
251
|
+
return;
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
// step 2: try reducing memory use by reducing the context size
|
|
256
|
+
|
|
257
|
+
{
|
|
258
|
+
int64_t global_surplus = sum_projected_free;
|
|
259
|
+
for (size_t id = 0; id < nd; id++) {
|
|
260
|
+
global_surplus -= margins[id];
|
|
261
|
+
}
|
|
262
|
+
if (global_surplus < 0) {
|
|
263
|
+
if (nd == 1) {
|
|
264
|
+
LLAMA_LOG_INFO("%s: cannot meet free memory target of %" PRId64 " MiB, need to reduce device memory by %" PRId64 " MiB\n",
|
|
265
|
+
__func__, margins[0]/MiB, -global_surplus/MiB);
|
|
266
|
+
} else {
|
|
267
|
+
LLAMA_LOG_INFO(
|
|
268
|
+
"%s: cannot meet free memory targets on all devices, need to use %" PRId64 " MiB less in total\n",
|
|
269
|
+
__func__, -global_surplus/MiB);
|
|
270
|
+
}
|
|
271
|
+
if (cparams->n_ctx == 0) {
|
|
272
|
+
if (hp_nct > n_ctx_min) {
|
|
273
|
+
int64_t sum_used_target = sum_free;
|
|
274
|
+
for (size_t id = 0; id < nd; id++) {
|
|
275
|
+
sum_used_target -= margins[id];
|
|
276
|
+
}
|
|
277
|
+
if (nd > 1) {
|
|
278
|
+
// for multiple devices we need to be more conservative in terms of how much context we think can fit:
|
|
279
|
+
// - for dense models only whole layers can be assigned to devices
|
|
280
|
+
// - for MoE models only whole tensors can be assigned to devices, which we estimate to be <= 1/3 of a layer
|
|
281
|
+
// - on average we expect a waste of 0.5 layers/tensors per device
|
|
282
|
+
// - use slightly more than the expected average for nd devices to be safe
|
|
283
|
+
const int64_t model_per_layer = sum_projected_model / std::min(uint32_t(mparams->n_gpu_layers), hp_ngl);
|
|
284
|
+
sum_used_target -= (nd + 1) * model_per_layer / (hp_nex == 0 ? 2 : 6);
|
|
285
|
+
}
|
|
286
|
+
|
|
287
|
+
int64_t sum_projected_used_min_ctx = 0;
|
|
288
|
+
cparams->n_ctx = n_ctx_min;
|
|
289
|
+
const dmds_t dmds_min_ctx = llama_get_device_memory_data(path_model, mparams, cparams, devs, hp_ngl, hp_nct, hp_nex, log_level);
|
|
290
|
+
for (const auto & dmd : dmds_min_ctx) {
|
|
291
|
+
sum_projected_used_min_ctx += dmd.mb.total();
|
|
292
|
+
}
|
|
293
|
+
if (sum_used_target > sum_projected_used_min_ctx) {
|
|
294
|
+
// linear interpolation between minimum and maximum context size:
|
|
295
|
+
cparams->n_ctx += (hp_nct - n_ctx_min) * (sum_used_target - sum_projected_used_min_ctx)
|
|
296
|
+
/ (sum_projected_used - sum_projected_used_min_ctx);
|
|
297
|
+
cparams->n_ctx = std::max(cparams->n_ctx - cparams->n_ctx % 256, n_ctx_min); // round down context for CUDA backend
|
|
298
|
+
|
|
299
|
+
const int64_t bytes_per_ctx = (sum_projected_used - sum_projected_used_min_ctx) / (hp_nct - n_ctx_min);
|
|
300
|
+
const int64_t memory_reduction = (hp_nct - cparams->n_ctx) * bytes_per_ctx;
|
|
301
|
+
LLAMA_LOG_INFO("%s: context size reduced from %" PRIu32 " to %" PRIu32 " -> need %" PRId64 " MiB less memory in total\n",
|
|
302
|
+
__func__, hp_nct, cparams->n_ctx, memory_reduction/MiB);
|
|
303
|
+
if (nd == 1) {
|
|
304
|
+
LLAMA_LOG_INFO("%s: entire model can be fit by reducing context\n", __func__);
|
|
305
|
+
return;
|
|
306
|
+
}
|
|
307
|
+
LLAMA_LOG_INFO("%s: entire model should be fit across devices by reducing context\n", __func__);
|
|
308
|
+
} else {
|
|
309
|
+
const int64_t memory_reduction = sum_projected_used - sum_projected_used_min_ctx;
|
|
310
|
+
LLAMA_LOG_INFO("%s: context size reduced from %" PRIu32 " to %" PRIu32 " -> need %" PRId64 " MiB less memory in total\n",
|
|
311
|
+
__func__, hp_nct, cparams->n_ctx, memory_reduction/MiB);
|
|
312
|
+
}
|
|
313
|
+
} else {
|
|
314
|
+
LLAMA_LOG_INFO("%s: default model context size is %" PRIu32 " which is <= the min. context size of %" PRIu32 " -> no change\n",
|
|
315
|
+
__func__, hp_nct, n_ctx_min);
|
|
316
|
+
}
|
|
317
|
+
} else {
|
|
318
|
+
LLAMA_LOG_INFO("%s: context size set by user to %" PRIu32 " -> no change\n", __func__, cparams->n_ctx);
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
|
|
323
|
+
if (mparams->n_gpu_layers != default_mparams.n_gpu_layers) {
|
|
324
|
+
throw llama_params_fit_exception("n_gpu_layers already set by user to " + std::to_string(mparams->n_gpu_layers) + ", abort");
|
|
325
|
+
}
|
|
326
|
+
if (nd > 1) {
|
|
327
|
+
if (!tensor_split) {
|
|
328
|
+
throw llama_params_fit_exception("did not provide a buffer to write the tensor_split to, abort");
|
|
329
|
+
}
|
|
330
|
+
if (mparams->tensor_split) {
|
|
331
|
+
for (size_t id = 0; id < nd; id++) {
|
|
332
|
+
if (mparams->tensor_split[id] != 0.0f) {
|
|
333
|
+
throw llama_params_fit_exception("model_params::tensor_split already set by user, abort");
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
}
|
|
337
|
+
if (mparams->split_mode == LLAMA_SPLIT_MODE_ROW) {
|
|
338
|
+
throw llama_params_fit_exception("changing weight allocation for LLAMA_SPLIT_MODE_ROW not implemented, abort");
|
|
339
|
+
}
|
|
340
|
+
}
|
|
341
|
+
if (!tensor_buft_overrides) {
|
|
342
|
+
throw llama_params_fit_exception("did not provide buffer to set tensor_buft_overrides, abort");
|
|
343
|
+
}
|
|
344
|
+
if (mparams->tensor_buft_overrides && (mparams->tensor_buft_overrides->pattern || mparams->tensor_buft_overrides->buft)) {
|
|
345
|
+
throw llama_params_fit_exception("model_params::tensor_buft_overrides already set by user, abort");
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
// step 3: iteratively fill the back to front with "dense" layers
|
|
349
|
+
// - for a dense model simply fill full layers, giving each device a contiguous slice of the model
|
|
350
|
+
// - for a MoE model, same as dense model but with all MoE tensors in system memory
|
|
351
|
+
|
|
352
|
+
// utility function that returns a static C string matching the tensors for a specific layer index and layer fraction:
|
|
353
|
+
auto get_overflow_pattern = [&](const size_t il, const layer_fraction_t lf) -> const char * {
|
|
354
|
+
constexpr size_t n_strings = 1000;
|
|
355
|
+
if (il >= n_strings) {
|
|
356
|
+
throw std::runtime_error("at most " + std::to_string(n_strings) + " model layers are supported");
|
|
357
|
+
}
|
|
358
|
+
switch (lf) {
|
|
359
|
+
case LAYER_FRACTION_ATTN: {
|
|
360
|
+
static std::array<std::string, n_strings> patterns;
|
|
361
|
+
if (patterns[il].empty()) {
|
|
362
|
+
patterns[il] = "blk\\." + std::to_string(il) + "\\.ffn_(up|gate|down).*";
|
|
363
|
+
}
|
|
364
|
+
return patterns[il].c_str();
|
|
365
|
+
}
|
|
366
|
+
case LAYER_FRACTION_UP: {
|
|
367
|
+
static std::array<std::string, n_strings> patterns;
|
|
368
|
+
if (patterns[il].empty()) {
|
|
369
|
+
patterns[il] = "blk\\." + std::to_string(il) + "\\.ffn_(gate|down).*";
|
|
370
|
+
}
|
|
371
|
+
return patterns[il].c_str();
|
|
372
|
+
}
|
|
373
|
+
case LAYER_FRACTION_GATE: {
|
|
374
|
+
static std::array<std::string, n_strings> patterns;
|
|
375
|
+
if (patterns[il].empty()) {
|
|
376
|
+
patterns[il] = "blk\\." + std::to_string(il) + "\\.ffn_down.*";
|
|
377
|
+
}
|
|
378
|
+
return patterns[il].c_str();
|
|
379
|
+
}
|
|
380
|
+
case LAYER_FRACTION_MOE: {
|
|
381
|
+
static std::array<std::string, n_strings> patterns;
|
|
382
|
+
if (patterns[il].empty()) {
|
|
383
|
+
patterns[il] = "blk\\." + std::to_string(il) + "\\.ffn_(up|down|gate)_(ch|)exps";
|
|
384
|
+
}
|
|
385
|
+
return patterns[il].c_str();
|
|
386
|
+
}
|
|
387
|
+
default:
|
|
388
|
+
GGML_ABORT("fatal error");
|
|
389
|
+
}
|
|
390
|
+
};
|
|
391
|
+
|
|
392
|
+
struct ngl_t {
|
|
393
|
+
uint32_t n_layer = 0; // number of total layers
|
|
394
|
+
uint32_t n_part = 0; // number of partial layers, <= n_layer
|
|
395
|
+
|
|
396
|
+
// for the first partial layer varying parts can overflow, all further layers use LAYER_FRACTION_MOE:
|
|
397
|
+
layer_fraction_t overflow_type = LAYER_FRACTION_MOE;
|
|
398
|
+
|
|
399
|
+
uint32_t n_full() const {
|
|
400
|
+
assert(n_layer >= n_part);
|
|
401
|
+
return n_layer - n_part;
|
|
402
|
+
}
|
|
403
|
+
};
|
|
404
|
+
|
|
405
|
+
const size_t ntbo = llama_max_tensor_buft_overrides();
|
|
406
|
+
|
|
407
|
+
// utility function to set n_gpu_layers and tensor_split
|
|
408
|
+
auto set_ngl_tensor_split_tbo = [&](
|
|
409
|
+
const std::vector<ngl_t> & ngl_per_device,
|
|
410
|
+
const std::vector<ggml_backend_buffer_type_t> & overflow_bufts,
|
|
411
|
+
llama_model_params & mparams) {
|
|
412
|
+
mparams.n_gpu_layers = 0;
|
|
413
|
+
for (size_t id = 0; id < nd; id++) {
|
|
414
|
+
mparams.n_gpu_layers += ngl_per_device[id].n_layer;
|
|
415
|
+
if (nd > 1) {
|
|
416
|
+
tensor_split[id] = ngl_per_device[id].n_layer;
|
|
417
|
+
}
|
|
418
|
+
}
|
|
419
|
+
assert(uint32_t(mparams.n_gpu_layers) <= hp_ngl + 1);
|
|
420
|
+
uint32_t il0 = hp_ngl + 1 - mparams.n_gpu_layers; // start index for tensor buft overrides
|
|
421
|
+
|
|
422
|
+
mparams.tensor_split = tensor_split;
|
|
423
|
+
|
|
424
|
+
size_t itbo = 0;
|
|
425
|
+
for (size_t id = 0; id < nd; id++) {
|
|
426
|
+
il0 += ngl_per_device[id].n_full();
|
|
427
|
+
for (uint32_t il = il0; il < il0 + ngl_per_device[id].n_part; il++) {
|
|
428
|
+
if (itbo + 1 >= ntbo) {
|
|
429
|
+
tensor_buft_overrides[itbo].pattern = nullptr;
|
|
430
|
+
tensor_buft_overrides[itbo].buft = nullptr;
|
|
431
|
+
itbo++;
|
|
432
|
+
mparams.tensor_buft_overrides = tensor_buft_overrides;
|
|
433
|
+
throw llama_params_fit_exception("llama_max_tensor_buft_overrides() == "
|
|
434
|
+
+ std::to_string(ntbo) + " is insufficient for model");
|
|
435
|
+
}
|
|
436
|
+
tensor_buft_overrides[itbo].pattern = get_overflow_pattern(il, il == il0 ? ngl_per_device[id].overflow_type : LAYER_FRACTION_MOE);
|
|
437
|
+
tensor_buft_overrides[itbo].buft = il == il0 ? overflow_bufts[id] : ggml_backend_cpu_buffer_type();
|
|
438
|
+
itbo++;
|
|
439
|
+
}
|
|
440
|
+
il0 += ngl_per_device[id].n_part;
|
|
441
|
+
}
|
|
442
|
+
tensor_buft_overrides[itbo].pattern = nullptr;
|
|
443
|
+
tensor_buft_overrides[itbo].buft = nullptr;
|
|
444
|
+
itbo++;
|
|
445
|
+
mparams.tensor_buft_overrides = tensor_buft_overrides;
|
|
446
|
+
};
|
|
447
|
+
|
|
448
|
+
// utility function that returns the memory use per device for given numbers of layers per device
|
|
449
|
+
auto get_memory_for_layers = [&](
|
|
450
|
+
const char * func_name,
|
|
451
|
+
const std::vector<ngl_t> & ngl_per_device,
|
|
452
|
+
const std::vector<ggml_backend_buffer_type_t> & overflow_bufts) -> std::vector<int64_t> {
|
|
453
|
+
llama_model_params mparams_copy = *mparams;
|
|
454
|
+
set_ngl_tensor_split_tbo(ngl_per_device, overflow_bufts, mparams_copy);
|
|
455
|
+
|
|
456
|
+
const dmds_t dmd_nl = llama_get_device_memory_data(
|
|
457
|
+
path_model, &mparams_copy, cparams, devs, hp_ngl, hp_nct, hp_nex, log_level);
|
|
458
|
+
|
|
459
|
+
LLAMA_LOG_DEBUG("%s: memory for test allocation by device:\n", func_name);
|
|
460
|
+
for (size_t id = 0; id < nd; id++) {
|
|
461
|
+
const ngl_t & n = ngl_per_device[id];
|
|
462
|
+
LLAMA_LOG_DEBUG(
|
|
463
|
+
"%s: id=%zu, n_layer=%2" PRIu32 ", n_part=%2" PRIu32 ", overflow_type=%d, mem=%6" PRId64 " MiB\n",
|
|
464
|
+
func_name, id, n.n_layer, n.n_part, int(n.overflow_type), dmd_nl[id].mb.total()/MiB);
|
|
465
|
+
}
|
|
466
|
+
|
|
467
|
+
std::vector<int64_t> ret;
|
|
468
|
+
ret.reserve(nd);
|
|
469
|
+
for (const llama_device_memory_data & dmd : dmd_nl) {
|
|
470
|
+
ret.push_back(dmd.mb.total());
|
|
471
|
+
}
|
|
472
|
+
return ret;
|
|
473
|
+
};
|
|
474
|
+
|
|
475
|
+
int64_t global_surplus_cpu_moe = 0;
|
|
476
|
+
if (hp_nex > 0) {
|
|
477
|
+
const static std::string pattern_moe_all = "blk\\.\\d+\\.ffn_(up|down|gate)_(ch|)exps"; // matches all MoE tensors
|
|
478
|
+
ggml_backend_buffer_type_t cpu_buft = ggml_backend_cpu_buffer_type();
|
|
479
|
+
tensor_buft_overrides[0] = {pattern_moe_all.c_str(), cpu_buft};
|
|
480
|
+
tensor_buft_overrides[1] = {nullptr, nullptr};
|
|
481
|
+
mparams->tensor_buft_overrides = tensor_buft_overrides;
|
|
482
|
+
|
|
483
|
+
LLAMA_LOG_DEBUG("%s: getting device memory data with all MoE tensors moved to system memory:\n", __func__);
|
|
484
|
+
const dmds_t dmds_cpu_moe = llama_get_device_memory_data(
|
|
485
|
+
path_model, mparams, cparams, devs, hp_ngl, hp_nct, hp_nex, log_level);
|
|
486
|
+
|
|
487
|
+
for (size_t id = 0; id < nd; id++) {
|
|
488
|
+
global_surplus_cpu_moe += dmds_cpu_moe[id].free;
|
|
489
|
+
global_surplus_cpu_moe -= int64_t(dmds_cpu_moe[id].mb.total()) + margins[id];
|
|
490
|
+
}
|
|
491
|
+
|
|
492
|
+
if (global_surplus_cpu_moe > 0) {
|
|
493
|
+
LLAMA_LOG_INFO("%s: with only dense weights in device memory there is a total surplus of %" PRId64 " MiB\n",
|
|
494
|
+
__func__, global_surplus_cpu_moe/MiB);
|
|
495
|
+
} else {
|
|
496
|
+
LLAMA_LOG_INFO("%s: with only dense weights in device memory there is still a total deficit of %" PRId64 " MiB\n",
|
|
497
|
+
__func__, -global_surplus_cpu_moe/MiB);
|
|
498
|
+
}
|
|
499
|
+
|
|
500
|
+
// reset
|
|
501
|
+
tensor_buft_overrides[0] = {nullptr, nullptr};
|
|
502
|
+
mparams->tensor_buft_overrides = tensor_buft_overrides;
|
|
503
|
+
}
|
|
504
|
+
|
|
505
|
+
std::vector<int64_t> targets; // maximum acceptable memory use per device
|
|
506
|
+
targets.reserve(nd);
|
|
507
|
+
for (size_t id = 0; id < nd; id++) {
|
|
508
|
+
targets.push_back(dmds_full[id].free - margins[id]);
|
|
509
|
+
LLAMA_LOG_DEBUG("%s: id=%zu, target=%" PRId64 " MiB\n", __func__, id, targets[id]/MiB);
|
|
510
|
+
}
|
|
511
|
+
|
|
512
|
+
std::vector<ggml_backend_buffer_type_t> overflow_bufts; // which bufts the first partial layer of a device overflows to:
|
|
513
|
+
overflow_bufts.reserve(nd);
|
|
514
|
+
for (size_t id = 0; id < nd; id++) {
|
|
515
|
+
overflow_bufts.push_back(ggml_backend_cpu_buffer_type());
|
|
516
|
+
}
|
|
517
|
+
|
|
518
|
+
std::vector<ngl_t> ngl_per_device(nd);
|
|
519
|
+
std::vector<int64_t> mem = get_memory_for_layers(__func__, ngl_per_device, overflow_bufts);
|
|
520
|
+
|
|
521
|
+
// optimize the number of layers per device using the method of false position:
|
|
522
|
+
// - ngl_per_device has 0 layers for each device, lower bound
|
|
523
|
+
// - try a "high" configuration where a device is given all unassigned layers
|
|
524
|
+
// - interpolate the memory use / layer between low and high linearly to get a guess where it meets our target
|
|
525
|
+
// - check memory use of our guess, replace either the low or high bound
|
|
526
|
+
// - once we only have a difference of a single layer, stop and return the lower bound that just barely still fits
|
|
527
|
+
// - the last device has the output layer, which cannot be a partial layer
|
|
528
|
+
if (hp_nex == 0) {
|
|
529
|
+
LLAMA_LOG_INFO("%s: filling dense layers back-to-front:\n", __func__);
|
|
530
|
+
} else {
|
|
531
|
+
LLAMA_LOG_INFO("%s: filling dense-only layers back-to-front:\n", __func__);
|
|
532
|
+
}
|
|
533
|
+
for (int id = nd - 1; id >= 0; id--) {
|
|
534
|
+
uint32_t n_unassigned = hp_ngl + 1;
|
|
535
|
+
for (size_t jd = id + 1; jd < nd; ++jd) {
|
|
536
|
+
assert(n_unassigned >= ngl_per_device[jd].n_layer);
|
|
537
|
+
n_unassigned -= ngl_per_device[jd].n_layer;
|
|
538
|
+
}
|
|
539
|
+
|
|
540
|
+
std::vector<ngl_t> ngl_per_device_high = ngl_per_device;
|
|
541
|
+
ngl_per_device_high[id].n_layer = n_unassigned;
|
|
542
|
+
if (hp_nex > 0) {
|
|
543
|
+
ngl_per_device_high[id].n_part = size_t(id) < nd - 1 ? ngl_per_device_high[id].n_layer : ngl_per_device_high[id].n_layer - 1;
|
|
544
|
+
}
|
|
545
|
+
if (ngl_per_device_high[id].n_layer > 0) {
|
|
546
|
+
std::vector<int64_t> mem_high = get_memory_for_layers(__func__, ngl_per_device_high, overflow_bufts);
|
|
547
|
+
if (mem_high[id] > targets[id]) {
|
|
548
|
+
assert(ngl_per_device_high[id].n_layer > ngl_per_device[id].n_layer);
|
|
549
|
+
uint32_t delta = ngl_per_device_high[id].n_layer - ngl_per_device[id].n_layer;
|
|
550
|
+
LLAMA_LOG_DEBUG("%s: start filling device %" PRIu32 ", delta=%" PRIu32 "\n", __func__, id, delta);
|
|
551
|
+
while (delta > 1) {
|
|
552
|
+
uint32_t step_size = int64_t(delta) * (targets[id] - mem[id]) / (mem_high[id] - mem[id]);
|
|
553
|
+
step_size = std::max(step_size, uint32_t(1));
|
|
554
|
+
step_size = std::min(step_size, delta - 1);
|
|
555
|
+
|
|
556
|
+
std::vector<ngl_t> ngl_per_device_test = ngl_per_device;
|
|
557
|
+
ngl_per_device_test[id].n_layer += step_size;
|
|
558
|
+
if (hp_nex) {
|
|
559
|
+
ngl_per_device_test[id].n_part += size_t(id) == nd - 1 && ngl_per_device_test[id].n_part == 0 ?
|
|
560
|
+
step_size - 1 : step_size; // the first layer is the output layer which must always be full
|
|
561
|
+
}
|
|
562
|
+
const std::vector<int64_t> mem_test = get_memory_for_layers(__func__, ngl_per_device_test, overflow_bufts);
|
|
563
|
+
|
|
564
|
+
if (mem_test[id] <= targets[id]) {
|
|
565
|
+
ngl_per_device = ngl_per_device_test;
|
|
566
|
+
mem = mem_test;
|
|
567
|
+
LLAMA_LOG_DEBUG("%s: set ngl_per_device[%d].n_layer=%" PRIu32 "\n", __func__, id, ngl_per_device[id].n_layer);
|
|
568
|
+
} else {
|
|
569
|
+
ngl_per_device_high = ngl_per_device_test;
|
|
570
|
+
mem_high = mem_test;
|
|
571
|
+
LLAMA_LOG_DEBUG("%s: set ngl_per_device_high[%d].n_layer=%" PRIu32 "\n", __func__, id, ngl_per_device_high[id].n_layer);
|
|
572
|
+
}
|
|
573
|
+
delta = ngl_per_device_high[id].n_layer - ngl_per_device[id].n_layer;
|
|
574
|
+
}
|
|
575
|
+
} else {
|
|
576
|
+
assert(ngl_per_device_high[id].n_layer == n_unassigned);
|
|
577
|
+
ngl_per_device = ngl_per_device_high;
|
|
578
|
+
mem = mem_high;
|
|
579
|
+
LLAMA_LOG_DEBUG("%s: set ngl_per_device[%d].n_layer=%" PRIu32 "\n", __func__, id, ngl_per_device[id].n_layer);
|
|
580
|
+
}
|
|
581
|
+
}
|
|
582
|
+
|
|
583
|
+
const int64_t projected_margin = dmds_full[id].free - mem[id];
|
|
584
|
+
LLAMA_LOG_INFO(
|
|
585
|
+
"%s: - %s: %2" PRIu32 " layers, %6" PRId64 " MiB used, %6" PRId64 " MiB free\n",
|
|
586
|
+
__func__, dev_names[id].c_str(), ngl_per_device[id].n_layer, mem[id]/MiB, projected_margin/MiB);
|
|
587
|
+
}
|
|
588
|
+
if (hp_nex == 0 || global_surplus_cpu_moe <= 0) {
|
|
589
|
+
set_ngl_tensor_split_tbo(ngl_per_device, overflow_bufts, *mparams);
|
|
590
|
+
return;
|
|
591
|
+
}
|
|
592
|
+
|
|
593
|
+
// step 4: for a MoE model where all dense tensors fit,
|
|
594
|
+
// convert the dense-only layers in the back to full layers in the front until all devices are full
|
|
595
|
+
// essentially the same procedure as for the dense-only layers except front-to-back
|
|
596
|
+
// also, try fitting at least part of one more layer to reduce waste for "small" GPUs with e.g. 24 GiB VRAM
|
|
597
|
+
|
|
598
|
+
size_t id_dense_start = nd;
|
|
599
|
+
for (int id = nd - 1; id >= 0; id--) {
|
|
600
|
+
if (ngl_per_device[id].n_layer > 0) {
|
|
601
|
+
id_dense_start = id;
|
|
602
|
+
continue;
|
|
603
|
+
}
|
|
604
|
+
break;
|
|
605
|
+
}
|
|
606
|
+
assert(id_dense_start < nd);
|
|
607
|
+
|
|
608
|
+
LLAMA_LOG_INFO("%s: converting dense-only layers to full layers and filling them front-to-back with overflow to next device/system memory:\n", __func__);
|
|
609
|
+
for (size_t id = 0; id <= id_dense_start && id_dense_start < nd; id++) {
|
|
610
|
+
std::vector<ngl_t> ngl_per_device_high = ngl_per_device;
|
|
611
|
+
for (size_t jd = id_dense_start; jd < nd; jd++) {
|
|
612
|
+
const uint32_t n_layer_move = jd < nd - 1 ? ngl_per_device_high[jd].n_layer : ngl_per_device_high[jd].n_layer - 1;
|
|
613
|
+
ngl_per_device_high[id].n_layer += n_layer_move;
|
|
614
|
+
ngl_per_device_high[jd].n_layer -= n_layer_move;
|
|
615
|
+
ngl_per_device_high[jd].n_part = 0;
|
|
616
|
+
}
|
|
617
|
+
size_t id_dense_start_high = nd - 1;
|
|
618
|
+
std::vector<int64_t> mem_high = get_memory_for_layers(__func__, ngl_per_device_high, overflow_bufts);
|
|
619
|
+
|
|
620
|
+
if (mem_high[id] > targets[id]) {
|
|
621
|
+
assert(ngl_per_device_high[id].n_full() >= ngl_per_device[id].n_full());
|
|
622
|
+
uint32_t delta = ngl_per_device_high[id].n_full() - ngl_per_device[id].n_full();
|
|
623
|
+
while (delta > 1) {
|
|
624
|
+
uint32_t step_size = int64_t(delta) * (targets[id] - mem[id]) / (mem_high[id] - mem[id]);
|
|
625
|
+
step_size = std::max(step_size, uint32_t(1));
|
|
626
|
+
step_size = std::min(step_size, delta - 1);
|
|
627
|
+
|
|
628
|
+
std::vector<ngl_t> ngl_per_device_test = ngl_per_device;
|
|
629
|
+
size_t id_dense_start_test = id_dense_start;
|
|
630
|
+
uint32_t n_converted_test = 0;
|
|
631
|
+
for (;id_dense_start_test < nd; id_dense_start_test++) {
|
|
632
|
+
const uint32_t n_convert_jd = std::min(step_size - n_converted_test, ngl_per_device_test[id_dense_start_test].n_part);
|
|
633
|
+
ngl_per_device_test[id_dense_start_test].n_layer -= n_convert_jd;
|
|
634
|
+
ngl_per_device_test[id_dense_start_test].n_part -= n_convert_jd;
|
|
635
|
+
ngl_per_device_test[id].n_layer += n_convert_jd;
|
|
636
|
+
n_converted_test += n_convert_jd;
|
|
637
|
+
|
|
638
|
+
if (ngl_per_device_test[id_dense_start_test].n_part > 0) {
|
|
639
|
+
break;
|
|
640
|
+
}
|
|
641
|
+
}
|
|
642
|
+
const std::vector<int64_t> mem_test = get_memory_for_layers(__func__, ngl_per_device_test, overflow_bufts);
|
|
643
|
+
|
|
644
|
+
if (mem_test[id] <= targets[id]) {
|
|
645
|
+
ngl_per_device = ngl_per_device_test;
|
|
646
|
+
mem = mem_test;
|
|
647
|
+
id_dense_start = id_dense_start_test;
|
|
648
|
+
LLAMA_LOG_DEBUG("%s: set ngl_per_device[%zu].(n_layer, n_part)=(%" PRIu32 ", %" PRIu32 "), id_dense_start=%zu\n",
|
|
649
|
+
__func__, id, ngl_per_device[id].n_layer, ngl_per_device[id].n_part, id_dense_start);
|
|
650
|
+
} else {
|
|
651
|
+
ngl_per_device_high = ngl_per_device_test;
|
|
652
|
+
mem_high = mem_test;
|
|
653
|
+
id_dense_start_high = id_dense_start_test;
|
|
654
|
+
LLAMA_LOG_DEBUG("%s: set ngl_per_device_high[%zu].(n_layer, n_part)=(%" PRIu32 ", %" PRIu32 "), id_dense_start_high=%zu\n",
|
|
655
|
+
__func__, id, ngl_per_device_high[id].n_layer, ngl_per_device_high[id].n_part, id_dense_start_high);
|
|
656
|
+
}
|
|
657
|
+
assert(ngl_per_device_high[id].n_full() >= ngl_per_device[id].n_full());
|
|
658
|
+
delta = ngl_per_device_high[id].n_full() - ngl_per_device[id].n_full();
|
|
659
|
+
}
|
|
660
|
+
} else {
|
|
661
|
+
ngl_per_device = ngl_per_device_high;
|
|
662
|
+
mem = mem_high;
|
|
663
|
+
id_dense_start = id_dense_start_high;
|
|
664
|
+
LLAMA_LOG_DEBUG("%s: set ngl_per_device[%zu].(n_layer, n_part)=(%" PRIu32 ", %" PRIu32 "), id_dense_start=%zu\n",
|
|
665
|
+
__func__, id, ngl_per_device[id].n_layer, ngl_per_device[id].n_part, id_dense_start);
|
|
666
|
+
}
|
|
667
|
+
|
|
668
|
+
// try to fit at least part of one more layer
|
|
669
|
+
if (ngl_per_device[id_dense_start].n_layer > (id < nd - 1 ? 0 : 1)) {
|
|
670
|
+
std::vector<ngl_t> ngl_per_device_test = ngl_per_device;
|
|
671
|
+
size_t id_dense_start_test = id_dense_start;
|
|
672
|
+
ngl_per_device_test[id_dense_start_test].n_layer--;
|
|
673
|
+
ngl_per_device_test[id_dense_start_test].n_part--;
|
|
674
|
+
ngl_per_device_test[id].n_layer++;
|
|
675
|
+
ngl_per_device_test[id].n_part++;
|
|
676
|
+
if (ngl_per_device_test[id_dense_start_test].n_part == 0) {
|
|
677
|
+
id_dense_start_test++;
|
|
678
|
+
}
|
|
679
|
+
ngl_per_device_test[id].overflow_type = LAYER_FRACTION_UP;
|
|
680
|
+
std::vector<ggml_backend_buffer_type_t> overflow_bufts_test = overflow_bufts;
|
|
681
|
+
if (id < nd - 1) {
|
|
682
|
+
overflow_bufts_test[id] = ggml_backend_dev_buffer_type(devs[id + 1]);
|
|
683
|
+
}
|
|
684
|
+
LLAMA_LOG_DEBUG("%s: trying to fit one extra layer with overflow_type=LAYER_FRACTION_UP\n", __func__);
|
|
685
|
+
std::vector<int64_t> mem_test = get_memory_for_layers(__func__, ngl_per_device_test, overflow_bufts_test);
|
|
686
|
+
if (mem_test[id] < targets[id] && (id + 1 == nd || mem_test[id + 1] < targets[id + 1])) {
|
|
687
|
+
ngl_per_device = ngl_per_device_test;
|
|
688
|
+
overflow_bufts = overflow_bufts_test;
|
|
689
|
+
mem = mem_test;
|
|
690
|
+
id_dense_start = id_dense_start_test;
|
|
691
|
+
LLAMA_LOG_DEBUG("%s: set ngl_per_device[%zu].(n_layer, n_part, overflow_type)=(%" PRIu32 ", %" PRIu32 ", UP), id_dense_start=%zu\n",
|
|
692
|
+
__func__, id, ngl_per_device[id].n_layer, ngl_per_device[id].n_part, id_dense_start);
|
|
693
|
+
|
|
694
|
+
ngl_per_device_test[id].overflow_type = LAYER_FRACTION_GATE;
|
|
695
|
+
LLAMA_LOG_DEBUG("%s: trying to fit one extra layer with overflow_type=LAYER_FRACTION_GATE\n", __func__);
|
|
696
|
+
mem_test = get_memory_for_layers(__func__, ngl_per_device_test, overflow_bufts_test);
|
|
697
|
+
if (mem_test[id] < targets[id] && (id + 1 == nd || mem_test[id + 1] < targets[id + 1])) {
|
|
698
|
+
ngl_per_device = ngl_per_device_test;
|
|
699
|
+
overflow_bufts = overflow_bufts_test;
|
|
700
|
+
mem = mem_test;
|
|
701
|
+
id_dense_start = id_dense_start_test;
|
|
702
|
+
LLAMA_LOG_DEBUG("%s: set ngl_per_device[%zu].(n_layer, n_part, overflow_type)=(%" PRIu32 ", %" PRIu32 ", GATE), id_dense_start=%zu\n",
|
|
703
|
+
__func__, id, ngl_per_device[id].n_layer, ngl_per_device[id].n_part, id_dense_start);
|
|
704
|
+
}
|
|
705
|
+
} else {
|
|
706
|
+
ngl_per_device_test[id].overflow_type = LAYER_FRACTION_ATTN;
|
|
707
|
+
LLAMA_LOG_DEBUG("%s: trying to fit one extra layer with overflow_type=LAYER_FRACTION_ATTN\n", __func__);
|
|
708
|
+
mem_test = get_memory_for_layers(__func__, ngl_per_device_test, overflow_bufts_test);
|
|
709
|
+
if (mem_test[id] < targets[id] && (id + 1 == nd || mem_test[id + 1] < targets[id + 1])) {
|
|
710
|
+
ngl_per_device = ngl_per_device_test;
|
|
711
|
+
overflow_bufts = overflow_bufts_test;
|
|
712
|
+
mem = mem_test;
|
|
713
|
+
id_dense_start = id_dense_start_test;
|
|
714
|
+
LLAMA_LOG_DEBUG("%s: set ngl_per_device[%zu].(n_layer, n_part, overflow_type)=(%" PRIu32 ", %" PRIu32 ", ATTN), id_dense_start=%zu\n",
|
|
715
|
+
__func__, id, ngl_per_device[id].n_layer, ngl_per_device[id].n_part, id_dense_start);
|
|
716
|
+
}
|
|
717
|
+
}
|
|
718
|
+
}
|
|
719
|
+
|
|
720
|
+
const int64_t projected_margin = dmds_full[id].free - mem[id];
|
|
721
|
+
LLAMA_LOG_INFO(
|
|
722
|
+
"%s: - %s: %2" PRIu32 " layers (%2" PRIu32 " overflowing), %6" PRId64 " MiB used, %6" PRId64 " MiB free\n",
|
|
723
|
+
__func__, dev_names[id].c_str(), ngl_per_device[id].n_layer, ngl_per_device[id].n_part, mem[id]/MiB, projected_margin/MiB);
|
|
724
|
+
}
|
|
725
|
+
|
|
726
|
+
// print info for devices that were not changed during the conversion from dense only to full layers:
|
|
727
|
+
for (size_t id = id_dense_start + 1; id < nd; id++) {
|
|
728
|
+
const int64_t projected_margin = dmds_full[id].free - mem[id];
|
|
729
|
+
LLAMA_LOG_INFO(
|
|
730
|
+
"%s: - %s: %2" PRIu32 " layers (%2" PRIu32 " overflowing), %6" PRId64 " MiB used, %6" PRId64 " MiB free\n",
|
|
731
|
+
__func__, dev_names[id].c_str(), ngl_per_device[id].n_layer, ngl_per_device[id].n_part, mem[id]/MiB, projected_margin/MiB);
|
|
732
|
+
}
|
|
733
|
+
|
|
734
|
+
set_ngl_tensor_split_tbo(ngl_per_device, overflow_bufts, *mparams);
|
|
735
|
+
}
|
|
736
|
+
|
|
737
|
+
enum llama_params_fit_status llama_params_fit(
|
|
738
|
+
const char * path_model, struct llama_model_params * mparams, struct llama_context_params * cparams,
|
|
739
|
+
float * tensor_split, struct llama_model_tensor_buft_override * tensor_buft_overrides,
|
|
740
|
+
size_t * margins, uint32_t n_ctx_min, enum ggml_log_level log_level) {
|
|
741
|
+
const int64_t t0_us = llama_time_us();
|
|
742
|
+
llama_params_fit_status status = LLAMA_PARAMS_FIT_STATUS_SUCCESS;
|
|
743
|
+
try {
|
|
744
|
+
llama_params_fit_impl(path_model, mparams, cparams, tensor_split, tensor_buft_overrides, margins, n_ctx_min, log_level);
|
|
745
|
+
LLAMA_LOG_INFO("%s: successfully fit params to free device memory\n", __func__);
|
|
746
|
+
} catch (const llama_params_fit_exception & e) {
|
|
747
|
+
LLAMA_LOG_WARN("%s: failed to fit params to free device memory: %s\n", __func__, e.what());
|
|
748
|
+
status = LLAMA_PARAMS_FIT_STATUS_FAILURE;
|
|
749
|
+
} catch (const std::runtime_error & e) {
|
|
750
|
+
LLAMA_LOG_ERROR("%s: encountered an error while trying to fit params to free device memory: %s\n", __func__, e.what());
|
|
751
|
+
status = LLAMA_PARAMS_FIT_STATUS_ERROR;
|
|
752
|
+
}
|
|
753
|
+
const int64_t t1_us = llama_time_us();
|
|
754
|
+
LLAMA_LOG_INFO("%s: fitting params to free memory took %.2f seconds\n", __func__, (t1_us - t0_us) * 1e-6);
|
|
755
|
+
return status;
|
|
756
|
+
}
|
|
757
|
+
|
|
40
758
|
struct llama_sampler_chain_params llama_sampler_chain_default_params() {
|
|
41
759
|
struct llama_sampler_chain_params result = {
|
|
42
|
-
/*.no_perf
|
|
760
|
+
/*.no_perf =*/ true,
|
|
43
761
|
};
|
|
44
762
|
|
|
45
763
|
return result;
|
|
@@ -49,6 +767,10 @@ size_t llama_max_devices(void) {
|
|
|
49
767
|
return 16;
|
|
50
768
|
}
|
|
51
769
|
|
|
770
|
+
size_t llama_max_tensor_buft_overrides() {
|
|
771
|
+
return 4096;
|
|
772
|
+
}
|
|
773
|
+
|
|
52
774
|
bool llama_supports_mmap(void) {
|
|
53
775
|
return llama_mmap::SUPPORTED;
|
|
54
776
|
}
|
|
@@ -108,11 +830,12 @@ static int llama_model_load(const std::string & fname, std::vector<std::string>
|
|
|
108
830
|
model.t_start_us = tm.t_start_us;
|
|
109
831
|
|
|
110
832
|
try {
|
|
111
|
-
llama_model_loader ml(fname, splits, params.use_mmap, params.check_tensors, params.kv_overrides, params.tensor_buft_overrides);
|
|
833
|
+
llama_model_loader ml(fname, splits, params.use_mmap, params.use_direct_io, params.check_tensors, params.no_alloc, params.kv_overrides, params.tensor_buft_overrides);
|
|
112
834
|
|
|
113
835
|
ml.print_info();
|
|
114
836
|
|
|
115
837
|
model.hparams.vocab_only = params.vocab_only;
|
|
838
|
+
model.hparams.no_alloc = params.no_alloc;
|
|
116
839
|
|
|
117
840
|
try {
|
|
118
841
|
model.load_arch(ml);
|
|
@@ -124,6 +847,9 @@ static int llama_model_load(const std::string & fname, std::vector<std::string>
|
|
|
124
847
|
} catch(const std::exception & e) {
|
|
125
848
|
throw std::runtime_error("error loading model hyperparameters: " + std::string(e.what()));
|
|
126
849
|
}
|
|
850
|
+
if (model.arch == LLM_ARCH_CLIP) {
|
|
851
|
+
throw std::runtime_error("CLIP cannot be used as main model, use it with --mmproj instead");
|
|
852
|
+
}
|
|
127
853
|
try {
|
|
128
854
|
model.load_vocab(ml);
|
|
129
855
|
} catch(const std::exception & e) {
|
|
@@ -312,6 +1038,7 @@ struct llama_model * llama_model_load_from_splits(
|
|
|
312
1038
|
LLAMA_LOG_ERROR("%s: list of splits is empty\n", __func__);
|
|
313
1039
|
return nullptr;
|
|
314
1040
|
}
|
|
1041
|
+
splits.reserve(n_paths);
|
|
315
1042
|
for (size_t i = 0; i < n_paths; ++i) {
|
|
316
1043
|
splits.push_back(paths[i]);
|
|
317
1044
|
}
|