Merge branch 'upstream' into concedo_experimental

Browse source

# Conflicts:
#	README.md
#	examples/llama.android/llama/src/main/cpp/llama-android.cpp
#	examples/run/run.cpp
#	examples/server/README.md
#	examples/server/bench/README.md
#	examples/server/tests/README.md
#	ggml/src/CMakeLists.txt
#	ggml/src/ggml-cpu/CMakeLists.txt
#	tests/test-backend-ops.cpp

...

This commit is contained in:

Concedo 2025-01-03 11:56:20 +08:00

parent 22fd7a0439 2f0ee84b9b

commit 911da8765f

46 changed files with 82848 additions and 73880 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

154849

ggml/src/ggml-vulkan-shaders.cpp

View file

File diff suppressed because it is too large Load diff