Merge branch 'upstream' into concedo_experimental

Browse Source

# Conflicts:
#	Makefile
#	README.md
#	examples/CMakeLists.txt
#	examples/main/README.md
#	ggml/src/CMakeLists.txt
#	ggml/src/kompute-shaders/common.comp
#	scripts/sync-ggml.last
#	src/llama.cpp

...

This commit is contained in:

Concedo

2024-11-02 21:57:29 +08:00

parent 223c5f0844 a6744e43e8

commit bc30ebd044

20 changed files with 1384 additions and 594 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

src/llama.cpp

+299 -337

File diff suppressed because it is too large Load Diff