Concedo 1c41c38a6a Merge branch 'upstream' into concedo_experimental ... # Conflicts: # .devops/cuda.Dockerfile # CODEOWNERS # README.md # ggml/src/ggml-cann/aclnn_ops.cpp # ggml/src/ggml-cann/common.h # ggml/src/ggml-opencl/ggml-opencl.cpp # scripts/sync-ggml-am.sh # scripts/sync-ggml.last # scripts/sync-ggml.sh # tests/test-chat.cpp # tools/batched-bench/batched-bench.cpp # tools/mtmd/clip.h		2025-08-20 20:34:45 +08:00
..
unit	server : disable context shift by default (#15416)	2025-08-19 16:46:37 +03: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 : disable context shift by default (#15416)	2025-08-19 16:46:37 +03:00