Merge branch 'upstream' into concedo_experimental

Browse source

# Conflicts:
#	.devops/llama-server-cuda.Dockerfile
#	.devops/llama-server-rocm.Dockerfile
#	.devops/llama-server-vulkan.Dockerfile
#	.devops/llama-server.Dockerfile
#	.github/workflows/docker.yml
#	README.md
#	llama.cpp
#	tests/test-chat-template.cpp
#	tests/test-grammar-integration.cpp
#	tests/test-json-schema-to-grammar.cpp
#	tests/test-llama-grammar.cpp

...

This commit is contained in:

Concedo 2024-06-26 18:59:10 +08:00

parent 24bfa54f3c 8854044561

commit f3dfa96dbc

29 changed files with 2097 additions and 431 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

1019

llama.cpp

View file

File diff suppressed because it is too large Load diff