Concedo 911da8765f Merge branch 'upstream' into concedo_experimental ...

# Conflicts:
#	README.md
#	examples/llama.android/llama/src/main/cpp/llama-android.cpp
#	examples/run/run.cpp
#	examples/server/README.md
#	examples/server/bench/README.md
#	examples/server/tests/README.md
#	ggml/src/CMakeLists.txt
#	ggml/src/ggml-cpu/CMakeLists.txt
#	tests/test-backend-ops.cpp

2025-01-03 11:56:20 +08:00

..

unit

server : allow using LoRA adapters per-request (#10994)

2025-01-02 15:05:18 +01:00

.gitignore

server : replace behave with pytest (#10416)

2024-11-26 16:20:18 +01:00

conftest.py

server : replace behave with pytest (#10416)

2024-11-26 16:20:18 +01:00

requirements.txt

server : allow using LoRA adapters per-request (#10994)

2025-01-02 15:05:18 +01:00

tests.sh

server : (refactoring) do not rely on JSON internally (#10643)

2024-12-06 11:14:32 +01:00

utils.py

server : allow using LoRA adapters per-request (#10994)

2025-01-02 15:05:18 +01:00