Merge branch 'upstream' into concedo_experimental

Browse source

# Conflicts:
#	.github/workflows/docker.yml
#	examples/cvector-generator/mean.hpp
#	examples/cvector-generator/pca.hpp
#	examples/export-lora/export-lora.cpp
#	examples/rpc/rpc-server.cpp
#	examples/run/README.md
#	examples/run/run.cpp
#	examples/server/CMakeLists.txt
#	examples/server/README.md
#	ggml/src/CMakeLists.txt
#	ggml/src/ggml-cpu/CMakeLists.txt
#	ggml/src/ggml-vulkan/ggml-vulkan.cpp
#	scripts/compare-llama-bench.py
#	scripts/hf.sh
#	tests/test-chat-template.cpp

...

This commit is contained in:

Concedo 2024-12-28 12:48:34 +08:00

parent 29afdb7c90 d79d8f39b4

commit 7c671f289e

27 changed files with 26062 additions and 13566 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

35770

ggml/src/ggml-vulkan-shaders.cpp

View file

File diff suppressed because it is too large Load diff