Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	Makefile
#	Package.swift
#	src/CMakeLists.txt
#	src/llama.cpp
#	tests/test-grammar-integration.cpp
#	tests/test-llama-grammar.cpp
This commit is contained in:
Concedo 2024-07-23 23:20:32 +08:00
commit eb5b4d0186
15 changed files with 3735 additions and 3276 deletions

View file

@ -1130,10 +1130,6 @@ ModelLoadResult gpttype_load_model(const load_model_inputs inputs, FileFormat in
useSmartContext = inputs.use_smartcontext;
useContextShift = inputs.use_contextshift;
debugmode = inputs.debugmode;
if(debugmode>0)
{
kcppstderr = true;
}
auto clamped_max_context_length = inputs.max_context_length;