Merge branch 'upstream' into concedo_experimental

Browse source

# Conflicts:
#	.devops/llama-server.Dockerfile
#	README.md
#	flake.lock
#	ggml/src/ggml-vulkan.cpp
#	ggml/src/vulkan-shaders/concat.comp
#	ggml/src/vulkan-shaders/pad.comp
#	ggml/src/vulkan-shaders/vulkan-shaders-gen.cpp
#	scripts/sync-ggml-am.sh
#	scripts/sync-ggml.last
#	src/llama.cpp
#	tests/test-backend-ops.cpp

...

This commit is contained in:

Concedo 2024-08-06 16:33:26 +08:00

parent 6b8b50b350 2d5dd7bb3f

commit e1f97f7fb5

55 changed files with 112612 additions and 111077 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

221367

ggml/src/ggml-vulkan-shaders.cpp

View file

File diff suppressed because it is too large Load diff