Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.
mlx: dedup dependency files (#18159)
Daniel Hiltgenef117cfcc0c4
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yamlindex 3c6bfb2a7..d2f046b92 100644--- a/.github/workflows/release.yaml+++ b/.github/workflows/release.yaml@@ -666,6 +666,7 @@ jobs:lib/ollama/vulkan*) echo $COMPONENT >>ollama-${{ matrix.os }}-${{ matrix.arch }}.tar.in ;;lib/ollama/mlx*) echo $COMPONENT >>ollama-${{ matrix.os }}-${{ matrix.arch }}-mlx.tar.in ;;lib/ollama/include*) echo $COMPONENT >>ollama-${{ matrix.os }}-${{ matrix.arch }}-mlx.tar.in ;;+ lib/ollama/*_LICENSE|lib/ollama/*_NOTICE) echo $COMPONENT >>ollama-${{ matrix.os }}-${{ matrix.arch }}.tar.in ;;lib/ollama/cuda_jetpack5) echo $COMPONENT >>ollama-${{ matrix.os }}-${{ matrix.arch }}-jetpack5.tar.in ;;lib/ollama/cuda_jetpack6) echo $COMPONENT >>ollama-${{ matrix.os }}-${{ matrix.arch }}-jetpack6.tar.in ;;lib/ollama/rocm_v*) echo $COMPONENT >>ollama-${{ matrix.os }}-${{ matrix.arch }}-rocm.tar.in ;;diff --git a/.github/workflows/test-llamacpp-update.yaml b/.github/workflows/test-llamacpp-update.yamlindex d37530466..0ae4f32b8 100644--- a/.github/workflows/test-llamacpp-update.yaml+++ b/.github/workflows/test-llamacpp-update.yaml@@ -240,6 +240,7 @@ jobs:lib/ollama/vulkan*) echo "${COMPONENT}" >>ollama-linux-${{ matrix.arch }}.tar.in ;;lib/ollama/mlx*) echo "${COMPONENT}" >>ollama-linux-${{ matrix.arch }}-mlx.tar.in ;;lib/ollama/include*) echo "${COMPONENT}" >>ollama-linux-${{ matrix.arch }}-mlx.tar.in ;;+ lib/ollama/*_LICENSE|lib/ollama/*_NOTICE) echo "${COMPONENT}" >>ollama-linux-${{ matrix.arch }}.tar.in ;;lib/ollama/cuda_jetpack5) echo "${COMPONENT}" >>ollama-linux-${{ matrix.arch }}-jetpack5.tar.in ;;lib/ollama/cuda_jetpack6) echo "${COMPONENT}" >>ollama-linux-${{ matrix.arch }}-jetpack6.tar.in ;;lib/ollama/rocm_v*) echo "${COMPONENT}" >>ollama-linux-${{ matrix.arch }}-rocm.tar.in ;;diff --git a/cmake/mlx/CMakeLists.txt b/cmake/mlx/CMakeLists.txtindex 4aeffdc1b..f510c213d 100644--- a/cmake/mlx/CMakeLists.txt+++ b/cmake/mlx/CMakeLists.txt@@ -145,17 +145,17 @@ install(TARGETS mlx mlxc ollama_xgrammar)install(FILES"${xgrammar_SOURCE_DIR}/LICENSE"- DESTINATION ${OLLAMA_INSTALL_DIR}+ DESTINATION ${OLLAMA_LIB_DIR}RENAME XGRAMMAR_LICENSECOMPONENT MLX)install(FILES"${xgrammar_SOURCE_DIR}/NOTICE"- DESTINATION ${OLLAMA_INSTALL_DIR}+ DESTINATION ${OLLAMA_LIB_DIR}RENAME XGRAMMAR_NOTICECOMPONENT MLX)install(FILES"${xgrammar_SOURCE_DIR}/3rdparty/dlpack/LICENSE"- DESTINATION ${OLLAMA_INSTALL_DIR}+ DESTINATION ${OLLAMA_LIB_DIR}RENAME DLPACK_LICENSECOMPONENT MLX)file(READ "${xgrammar_SOURCE_DIR}/3rdparty/picojson/picojson.h" _picojson_header LIMIT 4096)@@ -168,7 +168,7 @@ string(SUBSTRING "${_picojson_header}" 0 ${_picojson_license_end} _picojson_licefile(WRITE "${CMAKE_BINARY_DIR}/PICOJSON_LICENSE" "${_picojson_license}\n")install(FILES"${CMAKE_BINARY_DIR}/PICOJSON_LICENSE"- DESTINATION ${OLLAMA_INSTALL_DIR}+ DESTINATION ${OLLAMA_LIB_DIR}COMPONENT MLX)install(RUNTIME_DEPENDENCY_SET mlx_runtime_depsDIRECTORIES ${MLX_RUNTIME_DIRS}diff --git a/scripts/build_darwin.sh b/scripts/build_darwin.shindex 52e9a2a46..82164f1c5 100755--- a/scripts/build_darwin.sh+++ b/scripts/build_darwin.sh@@ -255,7 +255,7 @@ _build_macapp() {rm -f dist/Ollama-darwin.zipditto -c -k --norsrc --keepParent dist/Ollama.app dist/Ollama-darwin.zip- (cd dist/Ollama.app/Contents/Resources/; tar -cf - ollama llama-server llama-quantize *.so *.dylib *.metallib mlx_metal_v*/ 2>/dev/null) | gzip -9vc > dist/ollama-darwin.tgz+ (cd dist/Ollama.app/Contents/Resources/; tar -cf - ollama llama-server llama-quantize *.so *.dylib *.metallib *_LICENSE *_NOTICE mlx_metal_v*/ 2>/dev/null) | gzip -9vc > dist/ollama-darwin.tgz# Notarize and Stapleif [ -n "$APPLE_IDENTITY" ]; then