Skip to content

Commit ab209aa

Browse files
committed
mtmd : remove libllava, remove clip-quantize-cli
1 parent 7f323a5 commit ab209aa

15 files changed

+4
-842
lines changed

tools/mtmd/CMakeLists.txt

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,3 @@
1-
# llava (legacy)
2-
3-
add_library(llava OBJECT
4-
llava.cpp
5-
llava.h
6-
clip.cpp
7-
clip.h
8-
)
9-
10-
target_link_libraries(llava PRIVATE ggml llama ${CMAKE_THREAD_LIBS_INIT})
11-
12-
target_include_directories(llava PUBLIC .)
13-
target_include_directories(llava PUBLIC ../..)
14-
target_include_directories(llava PUBLIC ../../common)
15-
16-
target_compile_features(llava PRIVATE cxx_std_17)
17-
18-
add_library(llava_static STATIC $<TARGET_OBJECTS:llava>)
19-
if (BUILD_SHARED_LIBS)
20-
set_target_properties(llava PROPERTIES POSITION_INDEPENDENT_CODE ON)
21-
target_compile_definitions(llava PRIVATE LLAMA_SHARED LLAMA_BUILD)
22-
add_library(llava_shared SHARED $<TARGET_OBJECTS:llava>)
23-
target_link_libraries(llava_shared PRIVATE ggml llama ${CMAKE_THREAD_LIBS_INIT})
24-
install(TARGETS llava_shared LIBRARY)
25-
endif()
26-
271
# mtmd
282

293
add_library(mtmd OBJECT
@@ -53,12 +27,10 @@ if (BUILD_SHARED_LIBS)
5327
endif()
5428

5529
if (NOT MSVC)
56-
target_compile_options(llava PRIVATE -Wno-cast-qual) # stb_image.h
5730
target_compile_options(mtmd PRIVATE -Wno-cast-qual) # stb_image.h
5831
endif()
5932

6033
if(TARGET BUILD_INFO)
61-
add_dependencies(llava BUILD_INFO)
6234
add_dependencies(mtmd BUILD_INFO)
6335
endif()
6436

@@ -73,10 +45,3 @@ set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME llama-mtmd-cli)
7345
install(TARGETS ${TARGET} RUNTIME)
7446
target_link_libraries(${TARGET} PRIVATE common mtmd ${CMAKE_THREAD_LIBS_INIT})
7547
target_compile_features(${TARGET} PRIVATE cxx_std_17)
76-
77-
set(TARGET llama-llava-clip-quantize-cli)
78-
add_executable(${TARGET} clip-quantize-cli.cpp)
79-
set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME llama-llava-clip-quantize-cli)
80-
install(TARGETS ${TARGET} RUNTIME)
81-
target_link_libraries(${TARGET} PRIVATE common llava ${CMAKE_THREAD_LIBS_INIT})
82-
target_compile_features(${TARGET} PRIVATE cxx_std_17)

tools/mtmd/README-quantize.md

Lines changed: 0 additions & 44 deletions
This file was deleted.

tools/mtmd/README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ Built upon `clip.cpp` (similar to `llava.cpp`), `libmtmd` offers several advanta
4141

4242
Multimodal projector (`mmproj`) files are specific to each model architecture.
4343

44-
For the following models, you can use `convert_hf_to_gguf.py`with `--mmproj` flag to get the `mmproj` file:
45-
- [Gemma 3](https://huggingface.co/collections/google/gemma-3-release-67c6c6f89c4f76621268bb6d) - Note: 1B variant does not have vision support
44+
For the following models, you can use `convert_hf_to_gguf.py` with `--mmproj` flag to get the `mmproj` file:
45+
- [Gemma 3](https://huggingface.co/collections/google/gemma-3-release-67c6c6f89c4f76621268bb6d) ; See the guide [here](../../docs/multimodal/gemma3.md) - Note: 1B variant does not have vision support
4646
- SmolVLM (from [HuggingFaceTB](https://huggingface.co/HuggingFaceTB))
4747
- SmolVLM2 (from [HuggingFaceTB](https://huggingface.co/HuggingFaceTB))
4848
- [Pixtral 12B](https://huggingface.co/mistral-community/pixtral-12b) - only works with `transformers`-compatible checkpoint
@@ -52,11 +52,12 @@ For the following models, you can use `convert_hf_to_gguf.py`with `--mmproj` fla
5252

5353
For older models, please refer to the relevant guide for instructions on how to obtain or create them:
5454

55+
NOTE: conversion scripts are located under `tools/mtmd/legacy-models`
56+
5557
- [LLaVA](../../docs/multimodal/llava.md)
5658
- [MobileVLM](../../docs/multimodal/MobileVLM.md)
5759
- [GLM-Edge](../../docs/multimodal/glmedge.md)
5860
- [MiniCPM-V 2.5](../../docs/multimodal/minicpmv2.5.md)
5961
- [MiniCPM-V 2.6](../../docs/multimodal/minicpmv2.6.md)
6062
- [MiniCPM-o 2.6](../../docs/multimodal/minicpmo2.6.md)
6163
- [IBM Granite Vision](../../docs/multimodal/granitevision.md)
62-
- [Google Gemma 3](../../docs/multimodal/gemma3.md)

tools/mtmd/android/adb_run.sh

Lines changed: 0 additions & 53 deletions
This file was deleted.

tools/mtmd/android/build_64.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

tools/mtmd/clip-quantize-cli.cpp

Lines changed: 0 additions & 59 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)