Merge branch 'upstream' into concedo_experimental

mirror of https://github.com/LostRuins/koboldcpp.git synced 2026-09-19 01:05:09 +02:00

# Conflicts:
#	.github/workflows/build-cache.yml
#	.github/workflows/build-cmake-pkg.yml
#	.github/workflows/build-linux-cross.yml
#	.github/workflows/build.yml
#	.github/workflows/check-vendor.yml
#	.github/workflows/close-issue.yml
#	.github/workflows/copilot-setup-steps.yml
#	.github/workflows/docker.yml
#	.github/workflows/editorconfig.yml
#	.github/workflows/gguf-publish.yml
#	.github/workflows/labeler.yml
#	.github/workflows/pre-tokenizer-hashes.yml
#	.github/workflows/python-check-requirements.yml
#	.github/workflows/python-lint.yml
#	.github/workflows/python-type-check.yml
#	.github/workflows/release.yml
#	.github/workflows/server-webui.yml
#	.github/workflows/server.yml
#	.github/workflows/update-ops-docs.yml
#	.github/workflows/winget.yml
#	ggml/src/ggml-opencl/CMakeLists.txt
#	ggml/src/ggml-opencl/ggml-opencl.cpp
#	ggml/src/ggml-zdnn/ggml-zdnn.cpp
#	requirements/requirements-tool_bench.txt
#	src/CMakeLists.txt
#	src/llama-quant.cpp
#	tests/test-backend-ops.cpp
#	tests/test-chat.cpp
#	tools/cli/cli.cpp
#	tools/server/README.md

This commit is contained in:

Concedo

2026-01-23 14:27:04 +08:00

parent 5c6cc02985 a3e812811d

commit e8e7c357c9

54 changed files with 2348 additions and 1040 deletions

									
										src/llama.cpp
									
		+1
		
												View File
												
				@@ -14,6 +14,7 @@ static bool old_mixtral_warning_showed = false;

				#include "llama-kv-cache.cpp"

				#include "llama-kv-cache-iswa.cpp"

				#include "llama-memory-hybrid.cpp"

				#include "llama-memory-hybrid-iswa.cpp"

				#include "llama-memory-recurrent.cpp"

				#include "llama-model-loader.cpp"

				#include "llama-model-saver.cpp"