Concedo 6463f5c26b Merge branch 'upstream' into concedo_experimental ... # Conflicts: # .github/workflows/build.yml # .github/workflows/release.yml # CONTRIBUTING.md # docs/backend/CANN.md # examples/eval-callback/eval-callback.cpp # examples/model-conversion/requirements.txt # examples/model-conversion/scripts/causal/run-org-model.py # 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-cpu/kleidiai/kleidiai.cpp # ggml/src/ggml-cuda/CMakeLists.txt # ggml/src/ggml-opencl/ggml-opencl.cpp # ggml/src/ggml-rpc/ggml-rpc.cpp # ggml/src/ggml-sycl/ggml-sycl.cpp # ggml/src/ggml-webgpu/ggml-webgpu.cpp # ggml/src/ggml-zdnn/ggml-zdnn.cpp # models/templates/README.md # requirements/requirements-convert_hf_to_gguf.txt # requirements/requirements-convert_legacy_llama.txt # requirements/requirements-tool_bench.txt # tests/.gitignore # tests/test-backend-ops.cpp # tests/test-chat-parser.cpp # tests/test-chat.cpp # tests/test-json-schema-to-grammar.cpp # tests/test-tokenizer-random.py		2025-09-11 22:34:45 +08:00
..
unit	server : speed up tests (#15836)	2025-09-06 14:45:24 +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	requirements : update transformers/torch for Embedding Gemma (#15828)	2025-09-09 06:06:52 +02:00
tests.sh	scripts : make the shell scripts cross-platform (#14341)	2025-06-30 10:17:18 +02:00
utils.py	server : speed up tests (#15836)	2025-09-06 14:45:24 +02:00