LLM inference in C/C++
C++ ggml
build: include libmtmd in Apple XCFramework (#21935)
Abraham Gonzaleze12a0128ab0b
diff --git a/CMakeLists.txt b/CMakeLists.txtindex 9e7b1253c7..81f23d7e70 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -222,6 +222,16 @@ if (LLAMA_BUILD_APP)add_subdirectory(app)endif()+# Standalone libmtmd build without pulling in the rest of the tools/ tree.+# Useful when packaging just the mtmd library for language bindings (e.g. an+# Apple XCFramework, or a WASM build). When the full tools build is enabled,+# mtmd is already built by the tools/ subdirectory above; this hook only fires+# when LLAMA_BUILD_TOOLS is OFF to avoid double-adding the target.+option(LLAMA_BUILD_MTMD "llama: build tools/mtmd library standalone" OFF)+if (LLAMA_BUILD_MTMD AND NOT (LLAMA_BUILD_COMMON AND LLAMA_BUILD_TOOLS))+ add_subdirectory(tools/mtmd)+endif()+## install#diff --git a/build-xcframework.sh b/build-xcframework.shindex 180c01a88e..3a265e53ee 100755--- a/build-xcframework.sh+++ b/build-xcframework.sh@@ -13,6 +13,7 @@ LLAMA_BUILD_EXAMPLES=OFFLLAMA_BUILD_TOOLS=OFFLLAMA_BUILD_TESTS=OFFLLAMA_BUILD_SERVER=OFF+LLAMA_BUILD_MTMD=ONGGML_METAL=ONGGML_METAL_EMBED_LIBRARY=ONGGML_BLAS_DEFAULT=ON@@ -39,6 +40,7 @@ COMMON_CMAKE_ARGS=(-DLLAMA_BUILD_TOOLS=${LLAMA_BUILD_TOOLS}-DLLAMA_BUILD_TESTS=${LLAMA_BUILD_TESTS}-DLLAMA_BUILD_SERVER=${LLAMA_BUILD_SERVER}+ -DLLAMA_BUILD_MTMD=${LLAMA_BUILD_MTMD}-DGGML_METAL_EMBED_LIBRARY=${GGML_METAL_EMBED_LIBRARY}-DGGML_BLAS_DEFAULT=${GGML_BLAS_DEFAULT}-DGGML_METAL=${GGML_METAL}@@ -126,6 +128,8 @@ setup_framework_structure() {cp ggml/include/ggml-cpu.h ${header_path}cp ggml/include/ggml-blas.h ${header_path}cp ggml/include/gguf.h ${header_path}+ cp tools/mtmd/mtmd.h ${header_path}+ cp tools/mtmd/mtmd-helper.h ${header_path}# Create module map (common for all platforms)cat > ${module_path}module.modulemap << EOF@@ -247,6 +251,7 @@ combine_static_libraries() {"${base_dir}/${build_dir}/ggml/src/${release_dir}/libggml-cpu.a""${base_dir}/${build_dir}/ggml/src/ggml-metal/${release_dir}/libggml-metal.a""${base_dir}/${build_dir}/ggml/src/ggml-blas/${release_dir}/libggml-blas.a"+ "${base_dir}/${build_dir}/tools/mtmd/${release_dir}/libmtmd.a")# Create temporary directory for processingdiff --git a/tools/mtmd/CMakeLists.txt b/tools/mtmd/CMakeLists.txtindex 09b62357f3..ea684d9f15 100644--- a/tools/mtmd/CMakeLists.txt+++ b/tools/mtmd/CMakeLists.txt@@ -115,22 +115,28 @@ if (TARGET mtmd)endif()endif()-add_executable(llama-llava-cli deprecation-warning.cpp)-add_executable(llama-gemma3-cli deprecation-warning.cpp)-add_executable(llama-minicpmv-cli deprecation-warning.cpp)-add_executable(llama-qwen2vl-cli deprecation-warning.cpp)--set(TARGET llama-mtmd-cli)-add_executable (${TARGET} mtmd-cli.cpp)-set_target_properties (${TARGET} PROPERTIES OUTPUT_NAME llama-mtmd-cli)-if(LLAMA_TOOLS_INSTALL)- install(TARGETS ${TARGET} RUNTIME)+# Gate CLI binaries on LLAMA_BUILD_TOOLS so that standalone library-only+# builds (LLAMA_BUILD_MTMD=ON with LLAMA_BUILD_TOOLS=OFF — e.g. Apple+# XCFramework packaging) skip the executables entirely. LLAMA_BUILD_COMMON+# defaults to ON in standalone builds, so we cannot rely on it for gating.+if (LLAMA_BUILD_TOOLS)+ add_executable(llama-llava-cli deprecation-warning.cpp)+ add_executable(llama-gemma3-cli deprecation-warning.cpp)+ add_executable(llama-minicpmv-cli deprecation-warning.cpp)+ add_executable(llama-qwen2vl-cli deprecation-warning.cpp)++ set(TARGET llama-mtmd-cli)+ add_executable (${TARGET} mtmd-cli.cpp)+ set_target_properties (${TARGET} PROPERTIES OUTPUT_NAME llama-mtmd-cli)+ if(LLAMA_TOOLS_INSTALL)+ install(TARGETS ${TARGET} RUNTIME)+ endif()+ target_link_libraries (${TARGET} PRIVATE llama-common mtmd Threads::Threads)+ target_compile_features(${TARGET} PRIVATE cxx_std_17)++ # mtmd-debug tool+ add_executable(llama-mtmd-debug debug/mtmd-debug.cpp)+ set_target_properties(llama-mtmd-debug PROPERTIES OUTPUT_NAME llama-mtmd-debug)+ target_link_libraries(llama-mtmd-debug PRIVATE llama-common mtmd Threads::Threads)+ target_compile_features(llama-mtmd-debug PRIVATE cxx_std_17)endif()-target_link_libraries (${TARGET} PRIVATE llama-common mtmd Threads::Threads)-target_compile_features(${TARGET} PRIVATE cxx_std_17)--# mtmd-debug tool-add_executable(llama-mtmd-debug debug/mtmd-debug.cpp)-set_target_properties(llama-mtmd-debug PROPERTIES OUTPUT_NAME llama-mtmd-debug)-target_link_libraries(llama-mtmd-debug PRIVATE llama-common mtmd Threads::Threads)-target_compile_features(llama-mtmd-debug PRIVATE cxx_std_17)