Merge branch 'upstream' into concedo_experimental

Browse Source

# Conflicts:
#	.ecrc
#	CMakePresets.json
#	ci/run.sh
#	docs/backend/SYCL.md
#	ggml/src/CMakeLists.txt
#	src/llama.cpp
#	tests/test-backend-ops.cpp
#	tests/test-sampling.cpp

...

This commit is contained in:

Concedo

2024-08-27 17:46:40 +08:00

parent a22a666f3b 2e59d61c1b

commit b2c1ff7a13

30 changed files with 7666 additions and 6889 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

+1048 -502

File diff suppressed because it is too large Load Diff