Merge commit '935a3402923e79679e056f1d8fdc6bc48ec6dbbc' into concedo_experimental

Browse Source

# Conflicts:
#	examples/diffusion/CMakeLists.txt
#	scripts/server-test-function-call.py
#	src/llama-model.cpp
#	src/models/gemma4.cpp
#	tests/test-chat.cpp
#	tests/test-reasoning-budget.cpp
#	tools/server/README.md

...

This commit is contained in:

Concedo

2026-05-06 21:02:25 +08:00

parent bcf9c81e0d 935a340292

commit 7240da764a

148 changed files with 11619 additions and 8787 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/llama-model.cpp

+369 -7369

File diff suppressed because it is too large Load Diff