Concedo 6054bacadd Merge branch 'upstream' into concedo_experimental ... # Conflicts: # .github/workflows/ai-issues.yml # CONTRIBUTING.md # docs/autoparser.md # docs/ops.md # docs/ops/Metal.csv # ggml/src/ggml-cann/aclnn_ops.cpp # ggml/src/ggml-cann/ggml-cann.cpp # ggml/src/ggml-cpu/CMakeLists.txt # ggml/src/ggml-hexagon/ggml-hexagon.cpp # ggml/src/ggml-hexagon/htp/CMakeLists.txt # ggml/src/ggml-hexagon/htp/hex-dma.h # ggml/src/ggml-hexagon/htp/hex-utils.h # ggml/src/ggml-hexagon/htp/htp-ctx.h # ggml/src/ggml-hexagon/htp/htp-msg.h # ggml/src/ggml-hexagon/htp/htp_iface.idl # ggml/src/ggml-hexagon/htp/hvx-base.h # ggml/src/ggml-hexagon/htp/main.c # ggml/src/ggml-hip/CMakeLists.txt # models/templates/Apriel-1.6-15b-Thinker-fixed.jinja # models/templates/deepseek-ai-DeepSeek-R1-Distill-Qwen-32B.jinja # models/templates/deepseek-ai-DeepSeek-V3.1.jinja # models/templates/llama-cpp-deepseek-r1.jinja # models/templates/meetkai-functionary-medium-v3.1.jinja # scripts/fetch_server_test_models.py # scripts/snapdragon/adb/run-cli.sh # scripts/snapdragon/adb/run-completion.sh # scripts/snapdragon/adb/run-mtmd.sh # scripts/snapdragon/adb/run-tool.sh # tests/test-chat-auto-parser.cpp # tests/test-chat-peg-parser.cpp # tests/test-chat.cpp # tools/cli/cli.cpp # tools/server/README.md		2026-03-21 12:06:01 +08:00
..
unit	server: Add cached_tokens info to oaicompat responses (#19361)	2026-03-19 19:09:33 +01:00
.gitignore	llama : move end-user examples to tools directory (#13249)	2025-05-02 20:27:13 +02:00
conftest.py	server : add Anthropic Messages API support (#17570)	2025-11-28 12:57:04 +01:00
pytest.ini	llama : move end-user examples to tools directory (#13249)	2025-05-02 20:27:13 +02:00
requirements.txt	server: /v1/responses (partial) (#18486)	2026-01-21 17:47:23 +01:00
tests.sh	scripts : make the shell scripts cross-platform (#14341)	2025-06-30 10:17:18 +02:00
utils.py	tests : use reasoning instead of reasoning_budget in server tests (#20432)	2026-03-12 13:41:01 +01:00