Merge branch 'upstream' into concedo_experimental

Browse source

# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/server.yml
#	CMakeLists.txt
#	Makefile
#	examples/embedding/embedding.cpp
#	examples/imatrix/imatrix.cpp
#	examples/llama-bench/llama-bench.cpp
#	examples/llava/MobileVLM-README.md
#	examples/parallel/parallel.cpp
#	examples/perplexity/perplexity.cpp
#	examples/quantize/CMakeLists.txt
#	examples/server/README.md
#	examples/speculative/speculative.cpp
#	tests/test-backend-ops.cpp

...

This commit is contained in:

Concedo 2024-09-13 16:17:24 +08:00

parent 0fd85c3940 0abc6a2c25

commit e44ddf26ef

47 changed files with 117978 additions and 117646 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

233782

ggml/src/ggml-vulkan-shaders.cpp

View file

File diff suppressed because it is too large Load diff