Concedo 42ad89cd86 Merge branch 'upstream' into concedo_experimental ... # Conflicts: # .devops/cann.Dockerfile # .devops/cpu.Dockerfile # .devops/llama-cli-cann.Dockerfile # .devops/nix/package.nix # .github/workflows/build-android.yml # .github/workflows/build-cann.yml # .github/workflows/build-msys.yml # .github/workflows/docker.yml # .github/workflows/editorconfig.yml # .github/workflows/gguf-publish.yml # .github/workflows/python-lint.yml # .github/workflows/release.yml # CMakeLists.txt # docs/backend/CANN.md # ggml/src/ggml-hexagon/ggml-hexagon.cpp # ggml/src/ggml-hexagon/htp/hmx-matmul-ops.c # ggml/src/ggml-hexagon/htp/htp-ctx.h # ggml/src/ggml-hexagon/htp/main.c # ggml/src/ggml-hexagon/htp/matmul-ops.c # ggml/src/ggml-rpc/ggml-rpc.cpp # scripts/sync_vendor.py # tests/test-chat-auto-parser.cpp # tests/test-chat.cpp # tests/test-json-schema-to-grammar.cpp # tests/test-reasoning-budget.cpp # tools/cli/cli.cpp # tools/server/CMakeLists.txt # tools/server/README.md		2026-03-30 20:45:38 +08:00
..
completion	Merge branch 'upstream' into concedo_experimental	2026-03-30 20:45:38 +08:00
fit-params	llama-fit-params: keep explicit --ctx-size 0 (#19070)	2026-01-24 22:13:08 +01:00
gguf-split	gguf-split : clarify operation of gguf-split (#19749)	2026-03-25 13:12:50 +02:00
mtmd	Merge branch 'upstream' into concedo_experimental	2026-03-30 20:45:38 +08:00
parser	common/parser: add proper reasoning tag prefill reading (#20424)	2026-03-19 16:58:21 +01:00
quantize	Merge branch 'upstream' into concedo_experimental	2026-03-14 17:56:16 +08:00
server	Merge branch 'upstream' into concedo_experimental	2026-03-30 20:45:38 +08:00
tts	Merge branch 'upstream' into concedo_experimental	2026-03-06 21:19:49 +08:00
kcpplauncherhook.py	Switched VS2019 for revert cu12.1 build, hopefully solves dll issues	2025-06-10 23:08:02 +08:00
quantclip.cpp	fixed autoguess adapters, fixed tool builds	2025-05-13 19:38:56 +08:00