Merge branch 'upstream' into concedo_experimental

Browse source

# Conflicts:
#	README.md
#	examples/llama-bench/llama-bench.cpp
#	examples/llama.android/llama/src/main/cpp/llama-android.cpp
#	examples/llama.android/llama/src/main/java/android/llama/cpp/LLamaAndroid.kt
#	src/llama-vocab.cpp
#	tests/test-backend-ops.cpp

...

This commit is contained in:

Concedo 2025-01-17 23:13:50 +08:00

parent e8570de0e6 3edfa7d375

commit 96407502cd

43 changed files with 15434 additions and 435 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

13905

ggml/src/ggml-vulkan-shaders.cpp

View file

File diff suppressed because it is too large Load diff