Concedo da7fd4aa57 Merge branch 'upstream' into concedo_experimental ... # Conflicts: # .devops/musa.Dockerfile # .github/workflows/build.yml # README.md # ci/README.md # docs/docker.md # examples/lookahead/lookahead.cpp # examples/lookup/lookup.cpp # examples/parallel/parallel.cpp # ggml/src/ggml-musa/CMakeLists.txt # ggml/src/ggml-sycl/ggml-sycl.cpp # tests/test-arg-parser.cpp		2025-05-21 23:12:22 +08:00
..
legacy-models	mtmd : remove libllava, remove clip-quantize-cli (⚠️ breaking change) (#13460)	2025-05-13 15:33:58 +02:00
clip-impl.h	mtmd : add vision support for llama 4 (#13282)	2025-05-19 13:04:14 +02:00
clip.cpp	merge not working	2025-05-21 18:06:41 +08:00
clip.h	merge not working	2025-05-21 18:06:41 +08:00
deprecation-warning.cpp	mtmd : rename llava directory to mtmd (#13311)	2025-05-05 16:02:55 +02:00
llava.cpp	hey what do you know, it worked	2025-05-21 18:50:05 +08:00
llava.h	mtmd : remove libllava, remove clip-quantize-cli (⚠️ breaking change) (#13460)	2025-05-13 15:33:58 +02:00
mtmd-cli.cpp	mtmd : rename llava directory to mtmd (#13311)	2025-05-05 16:02:55 +02:00
mtmd-helper.cpp	mtmd-helper : bug fix to token batching in mtmd (#13650)	2025-05-20 18:55:30 +02:00
mtmd.cpp	merge not working	2025-05-21 18:06:41 +08:00
mtmd.h	mtmd : move helpers to dedicated file (#13442)	2025-05-11 11:34:23 +02:00
requirements.txt	mtmd : rename llava directory to mtmd (#13311)	2025-05-05 16:02:55 +02:00
test-1.jpeg	mtmd : rename llava directory to mtmd (#13311)	2025-05-05 16:02:55 +02:00
tests.sh	mtmd : add vision support for llama 4 (#13282)	2025-05-19 13:04:14 +02:00