Concedo 8b8396c30c Merge branch 'upstream' into concedo_experimental ... # Conflicts: # README.md # docs/build-s390x.md # examples/llama.vim # ggml/src/ggml-cann/aclnn_ops.cpp # ggml/src/ggml-cann/common.h # scripts/compare-llama-bench.py # src/CMakeLists.txt # tests/test-backend-ops.cpp # tools/llama-bench/README.md # tools/llama-bench/llama-bench.cpp # tools/server/README.md		2025-08-23 11:35:28 +08:00
..
unit	server : Support multimodal completion and embeddings prompts in JSON format (#15108)	2025-08-22 10:10:14 +02:00
.gitignore	llama : move end-user examples to tools directory (#13249)	2025-05-02 20:27:13 +02:00
conftest.py	llama : move end-user examples to tools directory (#13249)	2025-05-02 20:27:13 +02:00
pytest.ini	llama : move end-user examples to tools directory (#13249)	2025-05-02 20:27:13 +02:00
requirements.txt	llama : move end-user examples to tools directory (#13249)	2025-05-02 20:27:13 +02:00
tests.sh	scripts : make the shell scripts cross-platform (#14341)	2025-06-30 10:17:18 +02:00
utils.py	server: fix OpenAI API compatibility for usage statistics in chat streams (#15444)	2025-08-21 00:10:08 +02:00