Merge commit '947538acb8617756a092042ff7e58db18dde05ec' into concedo_experimental

Browse Source

# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/docker.yml
#	CMakePresets.json
#	examples/llama-bench/llama-bench.cpp
#	ggml/CMakeLists.txt
#	ggml/src/CMakeLists.txt
#	tests/test-backend-ops.cpp
#	tests/test-quantize-fns.cpp

...

This commit is contained in:

Concedo

2024-09-09 11:26:34 +08:00

parent 27bbdf7d2a 947538acb8

commit 70cdb55cc9

29 changed files with 93418 additions and 92397 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

ggml/src/ggml-vulkan-shaders.cpp

+91850 -91850

File diff suppressed because it is too large Load Diff