Concedo 29625c3d2e Merge branch 'upstream' into concedo_experimental ... # Conflicts: # .github/workflows/build.yml # .github/workflows/server.yml # CMakeLists.txt # Makefile # README.md # ci/run.sh # common/CMakeLists.txt # common/common.cpp # docs/backend/SYCL.md # examples/embedding/embedding.cpp # examples/imatrix/imatrix.cpp # examples/infill/infill.cpp # examples/llama-bench/llama-bench.cpp # examples/main/README.md # examples/parallel/parallel.cpp # examples/perplexity/perplexity.cpp # examples/server/CMakeLists.txt # examples/server/README.md # examples/server/bench/README.md # examples/server/tests/README.md # examples/speculative/speculative.cpp # flake.lock # ggml/CMakeLists.txt # ggml/src/CMakeLists.txt # grammars/README.md # scripts/compare-commits.sh # scripts/compare-llama-bench.py # tests/CMakeLists.txt		2024-09-19 14:53:57 +08:00
..
lookup-create.cpp	common : move arg parser code to arg.cpp (#9388)	2024-09-09 23:36:09 +02:00
lookup-merge.cpp	build: rename main → llama-cli, server → llama-server, llava-cli → llama-llava-cli, etc... (#7809)	2024-06-13 00:41:52 +01:00
lookup-stats.cpp	common : reimplement logging (#9418)	2024-09-15 20:46:12 +03:00
lookup.cpp	common : reimplement logging (#9418)	2024-09-15 20:46:12 +03:00