Merge commit '9b61acf060' into concedo_experimental

# Conflicts: # Makefile # docs/multimodal/MobileVLM.md # docs/multimodal/glmedge.md # docs/multimodal/llava.md # docs/multimodal/minicpmo2.6.md # docs/multimodal/minicpmv2.5.md # docs/multimodal/minicpmv2.6.md # requirements/requirements-all.txt # tools/mtmd/CMakeLists.txt # tools/mtmd/README.md # tools/mtmd/android/adb_run.sh # tools/mtmd/android/build_64.sh # tools/mtmd/clip-quantize-cli.cpp
2025-09-16 20:09:41 +00:00 · 2025-05-06 23:34:21 +08:00 · 2025-05-06 23:34:21 +08:00 · 0fa435b2a6
commit 0fa435b2a6
parent 1377a93a73 9b61acf060
29 changed files with 17 additions and 18 deletions
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@ -27,7 +27,7 @@ else()
    add_subdirectory(run)
    add_subdirectory(tokenize)
    add_subdirectory(tts)
-    add_subdirectory(llava)
+    add_subdirectory(mtmd)
    if (GGML_RPC)
        add_subdirectory(rpc)
    endif()
--- a/tools/llava/README-quantize.md
+++ b/tools/llava/README-quantize.md
--- a/tools/llava/clip-impl.h
+++ b/tools/llava/clip-impl.h
--- a/tools/llava/clip.cpp
+++ b/tools/llava/clip.cpp
--- a/tools/llava/clip.h
+++ b/tools/llava/clip.h
--- a/tools/llava/convert_image_encoder_to_gguf.py
+++ b/tools/llava/convert_image_encoder_to_gguf.py
--- a/tools/llava/deprecation-warning.cpp
+++ b/tools/llava/deprecation-warning.cpp
--- a/tools/llava/glmedge-convert-image-encoder-to-gguf.py
+++ b/tools/llava/glmedge-convert-image-encoder-to-gguf.py
--- a/tools/llava/glmedge-surgery.py
+++ b/tools/llava/glmedge-surgery.py
--- a/tools/llava/llava.cpp
+++ b/tools/llava/llava.cpp
--- a/tools/llava/llava.h
+++ b/tools/llava/llava.h
--- a/tools/llava/llava_surgery.py
+++ b/tools/llava/llava_surgery.py
--- a/tools/llava/llava_surgery_v2.py
+++ b/tools/llava/llava_surgery_v2.py
--- a/tools/llava/minicpmv-convert-image-encoder-to-gguf.py
+++ b/tools/llava/minicpmv-convert-image-encoder-to-gguf.py
--- a/tools/llava/minicpmv-surgery.py
+++ b/tools/llava/minicpmv-surgery.py
--- a/tools/llava/mtmd-cli.cpp
+++ b/tools/llava/mtmd-cli.cpp
--- a/tools/llava/mtmd.cpp
+++ b/tools/llava/mtmd.cpp
--- a/tools/llava/mtmd.h
+++ b/tools/llava/mtmd.h
--- a/tools/llava/qwen2vl-test.cpp
+++ b/tools/llava/qwen2vl-test.cpp
--- a/tools/llava/requirements.txt
+++ b/tools/llava/requirements.txt
--- a/tools/llava/test-1.jpeg
+++ b/tools/llava/test-1.jpeg
--- a/tools/llava/tests.sh
+++ b/tools/llava/tests.sh