Concedo f0d4128e9f Merge branch 'upstream' into concedo_experimental ... # Conflicts: # docs/backend/CANN.md # examples/model-conversion/Makefile # examples/model-conversion/scripts/causal/compare-embeddings-logits.sh # examples/model-conversion/scripts/causal/convert-model.sh # examples/model-conversion/scripts/causal/run-casual-gen-embeddings-org.py # examples/model-conversion/scripts/causal/run-converted-model-embeddings-logits.sh # examples/model-conversion/scripts/causal/run-converted-model.sh # examples/model-conversion/scripts/embedding/compare-embeddings-logits.sh # examples/model-conversion/scripts/embedding/convert-model.sh # examples/model-conversion/scripts/embedding/modelcard.template # examples/model-conversion/scripts/embedding/run-converted-model.sh # examples/model-conversion/scripts/utils/create-collection-add-model.sh # examples/model-conversion/scripts/utils/inspect-converted-model.sh # examples/model-conversion/scripts/utils/inspect-org-model.py # examples/model-conversion/scripts/utils/perplexity-gen.sh # examples/model-conversion/scripts/utils/perplexity-run-simple.sh # examples/model-conversion/scripts/utils/perplexity-run.sh # examples/model-conversion/scripts/utils/quantize.sh # examples/model-conversion/scripts/utils/run-embedding-server.sh # ggml/src/ggml-cann/aclnn_ops.cpp # ggml/src/ggml-cann/common.h # ggml/src/ggml-cann/ggml-cann.cpp # ggml/src/ggml-opencl/ggml-opencl.cpp # ggml/src/ggml-sycl/ggml-sycl.cpp # src/llama-context.cpp # tests/test-backend-ops.cpp # tests/test-chat.cpp		2025-09-05 13:25:34 +08:00
..
bench	Merge branch 'upstream' into concedo_experimental	2025-08-23 11:35:28 +08:00
public	server : fix webui (#15462)	2025-08-21 08:19:22 +03:00
public_legacy	llama : move end-user examples to tools directory (#13249)	2025-05-02 20:27:13 +02:00
public_simplechat	Merge branch 'upstream' into concedo_experimental	2025-05-03 12:15:36 +08:00
tests	Merge branch 'upstream' into concedo_experimental	2025-09-05 13:25:34 +08:00
themes	Merge branch 'upstream' into concedo_experimental	2025-05-03 12:15:36 +08:00
webui	server : fix webui (#15462)	2025-08-21 08:19:22 +03: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
server.cpp	server: add exceed_context_size_error type (#15780)	2025-09-04 11:50:23 +02:00
utils.hpp	server : Support multimodal completion and embeddings prompts in JSON format (#15108)	2025-08-22 10:10:14 +02:00