Concedo 58eb5573de Merge branch 'upstream' into concedo_experimental ...

# Conflicts:
#	ggml/src/ggml-cpu/CMakeLists.txt
#	ggml/src/ggml-hexagon/ggml-hexagon.cpp
#	ggml/src/ggml-hexagon/htp/act-ops.c
#	ggml/src/ggml-hexagon/htp/hvx-utils.c
#	ggml/src/ggml-hexagon/htp/main.c
#	src/llama-model.cpp
#	tools/server/README.md

2025-12-19 11:00:43 +08:00

..

bench

Merge branch 'upstream' into concedo_experimental

2025-08-23 11:35:28 +08:00

public

webui: display prompt processing stats (#18146)

2025-12-18 17:55:03 +01:00

public_legacy

common : fix json schema with '\' in literals (#17307)

2025-11-29 17:06:32 +01:00

public_simplechat

Merge branch 'upstream' into concedo_experimental

2025-05-03 12:15:36 +08:00

tests

Merge commit '4aced7a63156555911157d3002f9d3ddef4a1e55' into concedo_experimental

2025-12-16 23:14:12 +08:00

themes

Merge branch 'upstream' into concedo_experimental

2025-05-03 12:15:36 +08:00

webui

Merge branch 'upstream' into concedo_experimental

2025-12-19 11:00:43 +08:00

chat-llama2.sh

scripts : make the shell scripts cross-platform (#14341)

2025-06-30 10:17:18 +02:00

chat.mjs

llama : move end-user examples to tools directory (#13249)

2025-05-02 20:27:13 +02:00

chat.sh

scripts : make the shell scripts cross-platform (#14341)

2025-06-30 10:17:18 +02:00

README-dev.md

server: delegate result_state creation to server_task (#17835)

2025-12-08 17:04:38 +01:00

server-common.cpp

common : add parser for ministral/mistral large 3/devstral 2 (#17713)

2025-12-09 17:31:04 -06:00

server-common.h

server: improve speed of speculative decoding (#17808)

2025-12-08 14:35:28 +01:00

server-context.cpp

server: (webui) add --webui-config (#18028)

2025-12-17 21:45:45 +01:00

server-context.h

cli: new CLI experience (#17824)

2025-12-10 15:28:59 +01:00

server-http.cpp

server : add Anthropic Messages API support (#17570)

2025-11-28 12:57:04 +01:00

server-http.h

server: split HTTP into its own interface (#17216)

2025-11-17 22:05:44 +01:00

server-models.cpp

server: (webui) add --webui-config (#18028)

2025-12-17 21:45:45 +01:00

server-models.h

server: (webui) add --webui-config (#18028)

2025-12-17 21:45:45 +01:00

server-queue.cpp

server: delegate result_state creation to server_task (#17835)

2025-12-08 17:04:38 +01:00

server-queue.h

cli: new CLI experience (#17824)

2025-12-10 15:28:59 +01:00

server-task.cpp

server : make cache_reuse configurable per request (#17858)

2025-12-08 12:43:12 +02:00

server-task.h

cli: new CLI experience (#17824)

2025-12-10 15:28:59 +01:00

server.cpp

server: (webui) add --webui-config (#18028)

2025-12-17 21:45:45 +01:00