Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	.gitignore
#	CONTRIBUTING.md
#	ggml/CMakeLists.txt
#	ggml/cmake/ggml-config.cmake.in
#	ggml/src/ggml-cann/kernels/dup.cpp
#	ggml/src/ggml-cpu/amx/amx.cpp
#	tests/test-backend-ops.cpp
This commit is contained in:
Concedo 2025-03-01 01:14:35 +08:00
commit c088355d01
41 changed files with 1200112 additions and 1186699 deletions

View file

@ -107,6 +107,7 @@ extern "C" {
LLAMA_VOCAB_PRE_TYPE_CHAMELEON = 26,
LLAMA_VOCAB_PRE_TYPE_MINERVA = 27,
LLAMA_VOCAB_PRE_TYPE_DEEPSEEK3_LLM = 28,
LLAMA_VOCAB_PRE_TYPE_GPT4O = 29,
};
enum llama_rope_type {