Concedo 3060dfb99f Merge branch 'upstream' into concedo_experimental ... # Conflicts: # examples/model-conversion/Makefile # examples/model-conversion/scripts/causal/convert-model.sh # ggml/src/ggml-cann/aclnn_ops.cpp # ggml/src/ggml-cann/common.h # ggml/src/ggml-cann/ggml-cann.cpp # ggml/src/ggml-cuda/CMakeLists.txt # scripts/compare-commits.sh		2025-08-28 23:17:29 +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: higher timeout for tests (#15621)	2025-08-27 20:58:09 +02:00