Concedo f430916a71 Merge branch 'upstream' into concedo_experimental ... # Conflicts: # docs/backend/CANN.md # docs/multimodal/minicpmo2.6.md # docs/multimodal/minicpmv2.5.md # docs/multimodal/minicpmv2.6.md # examples/speculative-simple/speculative-simple.cpp # ggml/cmake/ggml-config.cmake.in # ggml/src/ggml-cann/aclnn_ops.cpp # ggml/src/ggml-cann/ggml-cann.cpp # ggml/src/ggml-cpu/repack.cpp # ggml/src/ggml-opencl/CMakeLists.txt # ggml/src/ggml-opencl/ggml-opencl.cpp # ggml/src/ggml-opencl/kernels/add.cl # ggml/src/ggml-opencl/kernels/mul.cl # scripts/compare-commits.sh # scripts/compare-llama-bench.py # scripts/sync-ggml.last # tools/server/README.md		2025-08-02 10:25:10 +08:00
..
CL	wip dont use	2023-04-21 00:35:54 +08:00
vulkan	updated vulkan to make use of cm2	2025-04-18 22:10:57 +08:00
cblas.h	wip dont use	2023-04-21 00:35:54 +08:00
clblast.h	Revert "clblast up ver"	2024-02-21 14:35:38 +08:00
clblast_c.h	Revert "clblast up ver"	2024-02-21 14:35:38 +08:00
clblast_half.h	upgraded clblast	2023-05-25 10:18:12 +08:00
clblast_netlib_c.h	Not working, don't use. testing a merge	2023-05-16 12:33:24 +08:00
llama-cpp.h	llama : add llama_vocab, functions -> methods, naming (#11110)	2025-01-12 11:32:42 +02:00
llama.h	Merge branch 'upstream' into concedo_experimental	2025-08-02 10:25:10 +08:00
openblas_config.h	wip dont use	2023-04-21 00:35:54 +08:00