Merge branch 'master' into concedo_experimental

Browse Source

# Conflicts:
#	.github/workflows/nix-ci.yml
#	CMakeLists.txt
#	Makefile
#	ggml-cuda.cu
#	ggml-opencl.cpp
#	llama.cpp

...

This commit is contained in:

Concedo

2024-01-20 23:27:42 +08:00

parent 425849f387 d9aa4ffa6e

commit 71e9a64171

43 changed files with 6540 additions and 3500 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

llama.cpp

+1113 -1544

File diff suppressed because it is too large Load Diff