Concedo 8855a7f52b Merge commit 'c945aaaef2' into concedo_experimental ... # Conflicts: # .devops/cann.Dockerfile # .github/workflows/build.yml # .github/workflows/release.yml # README.md # common/CMakeLists.txt # common/chat.cpp # docs/function-calling.md # ggml/src/ggml-cann/aclnn_ops.cpp # ggml/src/ggml-cann/aclnn_ops.h # ggml/src/ggml-cann/common.h # ggml/src/ggml-cann/ggml-cann.cpp # models/templates/NVIDIA-Nemotron-3-Nano-30B-A3B-BF16.jinja # scripts/sync_vendor.py # tests/CMakeLists.txt # tests/peg-parser/tests.h # tests/test-chat-peg-parser.cpp # tests/test-chat-template.cpp # tests/test-chat.cpp # tests/testing.h # tools/llama-bench/llama-bench.cpp		2026-01-17 10:24:03 +08:00
..
test-jinja.cpp	common : implement new jinja template engine (#18462)	2026-01-16 11:22:06 +01:00
test_autoguess.py	Adapter fixes (#1659)	2025-08-10 16:19:50 +08:00