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
This commit is contained in:
Concedo 2025-05-06 23:34:21 +08:00
commit 0fa435b2a6
29 changed files with 17 additions and 18 deletions

View file

@ -40,8 +40,8 @@
#include "neox_v2.cpp"
#include "neox_v3.cpp"
#include "mpt_v3.cpp"
#include "tools/llava/clip.h"
#include "tools/llava/llava.h"
#include "tools/mtmd/clip.h"
#include "tools/mtmd/llava.h"
#include "common/common.h"
//const