Merge branch 'upstream' into concedo_experimental

Browse source

# Conflicts:
#	Makefile
#	README.md
#	common/CMakeLists.txt
#	common/common.cpp
#	common/common.h
#	examples/embedding/embedding.cpp
#	examples/imatrix/imatrix.cpp
#	examples/infill/infill.cpp
#	examples/parallel/parallel.cpp
#	examples/perplexity/perplexity.cpp
#	examples/rpc/README.md
#	examples/save-load-state/save-load-state.cpp
#	examples/server/README.md
#	examples/speculative/speculative.cpp
#	tests/test-sampling.cpp

...

This commit is contained in:

Concedo 2024-09-10 16:39:23 +08:00

parent eee67281be 00ba2ff781

commit a947558e0e

45 changed files with 2628 additions and 6743 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

1929

common/common.cpp

View file

File diff suppressed because it is too large Load diff