Concedo 2562129271 Merge branch 'upstream' into concedo_experimental ... # Conflicts: # README.md # ci/run.sh # docs/backend/CANN.md # examples/speculative/speculative.cpp # ggml/CMakeLists.txt # ggml/src/ggml-cann/aclnn_ops.cpp # ggml/src/ggml-cann/common.h # ggml/src/ggml-cann/ggml-cann.cpp # ggml/src/ggml-cpu/CMakeLists.txt # ggml/src/ggml-opencl/ggml-opencl.cpp # ggml/src/ggml-opencl/kernels/flash_attn_f16.cl # ggml/src/ggml-opencl/kernels/flash_attn_f32.cl # ggml/src/ggml-opencl/kernels/flash_attn_f32_f16.cl # ggml/src/ggml-webgpu/ggml-webgpu.cpp # ggml/src/gguf.cpp # src/llama-context.cpp # tests/test-sampling.cpp # tools/server/README.md		2025-09-03 17:16:42 +08:00
..
unit	llama: use FA + max. GPU layers by default (#15434)	2025-08-30 16:32:10 +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 : enable /slots by default and make it secure (#15630)	2025-08-31 20:11:58 +03:00