mirror of
https://github.com/LostRuins/koboldcpp.git
synced 2026-09-18 08:44:57 +02:00
Merge branch 'upstream' into concedo_experimental
# Conflicts: # README.md # docs/build-s390x.md # examples/llama.vim # ggml/src/ggml-cann/aclnn_ops.cpp # ggml/src/ggml-cann/common.h # scripts/compare-llama-bench.py # src/CMakeLists.txt # tests/test-backend-ops.cpp # tools/llama-bench/README.md # tools/llama-bench/llama-bench.cpp # tools/server/README.md
This commit is contained in:
+2
-2
@@ -11,8 +11,8 @@ static bool old_mixtral_warning_showed = false;
|
||||
#include "llama-vocab.cpp"
|
||||
#include "llama-grammar.cpp"
|
||||
#include "llama-sampling.cpp"
|
||||
#include "llama-kv-cache-unified.cpp"
|
||||
#include "llama-kv-cache-unified-iswa.cpp"
|
||||
#include "llama-kv-cache.cpp"
|
||||
#include "llama-kv-cache-iswa.cpp"
|
||||
#include "llama-memory-hybrid.cpp"
|
||||
#include "llama-memory-recurrent.cpp"
|
||||
#include "llama-model-loader.cpp"
|
||||
|
||||
Reference in New Issue
Block a user