Concedo a947558e0e Merge branch 'upstream' into concedo_experimental ... # 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		2024-09-10 16:39:23 +08:00
..
Sources	llama : minor sampling refactor (2) (#9386)	2024-09-09 17:10:46 +02:00
.gitignore	examples : add batched.swift + improve CI for swift (#3562)	2023-10-11 06:14:05 -05:00
Makefile	build: rename main → llama-cli, server → llama-server, llava-cli → llama-llava-cli, etc... (#7809)	2024-06-13 00:41:52 +01:00
Package.swift	build: rename main → llama-cli, server → llama-server, llava-cli → llama-llava-cli, etc... (#7809)	2024-06-13 00:41:52 +01:00