mirror of
https://github.com/ollama/ollama.git
synced 2026-10-24 04:21:28 +00:00
ci: bound and cache the macOS MLX payload build (#18240)
Avoid unbounded parallel builds on small runners, and cache the payloads for repeated runs.
This commit is contained in:
parent
87b9f9e95a
commit
d3efc63263
2 changed files with 35 additions and 7 deletions
36
.github/scripts/prepare_mlx_darwin.sh
vendored
36
.github/scripts/prepare_mlx_darwin.sh
vendored
|
|
@ -16,6 +16,7 @@
|
|||
# helper builds the minimal MLX payload for this platform: a single Metal
|
||||
# variant using the superbuild's platform default (metal_v4 on macOS 26.2+
|
||||
# SDKs, otherwise metal_v3), including a fresh libollama_xgrammar.dylib.
|
||||
# Built payloads are cached in the release tarball's layout for later runs.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
|
|
@ -28,6 +29,8 @@ tarball="${cache_dir}/ollama-darwin.tgz"
|
|||
tag_file="${cache_dir}/matched-tag"
|
||||
pins_file="${cache_dir}/matched-pins"
|
||||
target_pins_file="${target_dir}/.mlx-release-pins"
|
||||
# ${tag_file} value for a cached local build.
|
||||
local_tag="local-build"
|
||||
tmpdir=""
|
||||
tmp_tarball=""
|
||||
|
||||
|
|
@ -168,6 +171,23 @@ extract_payload() {
|
|||
tmpdir=""
|
||||
}
|
||||
|
||||
# Cache the built payload in the release tarball's layout.
|
||||
save_built_payload() {
|
||||
local variant
|
||||
local -a variants=()
|
||||
for variant in "${target_dir}"/mlx_metal_v*; do
|
||||
[ -d "${variant}" ] || continue
|
||||
variants+=("$(basename "${variant}")")
|
||||
done
|
||||
tmp_tarball="${tarball}.tmp"
|
||||
tar -czf "${tmp_tarball}" -C "${target_dir}" "${variants[@]}"
|
||||
mv "${tmp_tarball}" "${tarball}"
|
||||
tmp_tarball=""
|
||||
echo "${local_tag}" >"${tag_file}"
|
||||
echo "${current_pins}" >"${pins_file}"
|
||||
echo "Cached the built payload in ${cache_dir}"
|
||||
}
|
||||
|
||||
# Resolve the superbuild's platform-default MLX backend (metal_v3/metal_v4 on
|
||||
# arm64; empty when the platform has no MLX backend, e.g. x86_64 macOS).
|
||||
ci_mlx_backend() {
|
||||
|
|
@ -181,7 +201,7 @@ build_ci_sources() {
|
|||
cmake -S . -B "${ci_build_dir}" \
|
||||
-DOLLAMA_LLAMA_BACKENDS= \
|
||||
-DOLLAMA_PAYLOAD_INSTALL_PREFIX="$(dirname "$(dirname "${target_dir}")")"
|
||||
cmake --build "${ci_build_dir}" --target ollama-mlx-sources --parallel
|
||||
cmake --build "${ci_build_dir}" --target ollama-mlx-sources
|
||||
}
|
||||
|
||||
# Rebuild only libollama_xgrammar.dylib into the extracted payload. The
|
||||
|
|
@ -196,7 +216,7 @@ build_ci_xgrammar() {
|
|||
configure_args+=("-DFETCHCONTENT_SOURCE_DIR_XGRAMMAR=${OLLAMA_XGRAMMAR_SOURCE}")
|
||||
fi
|
||||
cmake "${configure_args[@]}"
|
||||
cmake --build "${xg_build_dir}" --target ollama_xgrammar --parallel
|
||||
cmake --build "${xg_build_dir}" --target ollama_xgrammar
|
||||
lib="${xg_build_dir}/lib/ollama/libollama_xgrammar.dylib"
|
||||
[ -f "${lib}" ] || {
|
||||
echo "ollama_xgrammar build produced no library at ${lib}" >&2
|
||||
|
|
@ -228,7 +248,7 @@ build_ci_payload() {
|
|||
esac
|
||||
echo "Building the ${backend} payload for unit tests"
|
||||
rm -rf "${target_dir}"/mlx_metal_v*
|
||||
cmake --build "${ci_build_dir}" --target "ollama-mlx-${backend}" --parallel
|
||||
cmake --build "${ci_build_dir}" --target "ollama-mlx-${backend}"
|
||||
for variant in "${target_dir}"/mlx_metal_v*; do
|
||||
[ -d "${variant}" ] || continue
|
||||
for lib in libmlx.dylib libmlxc.dylib libollama_xgrammar.dylib; do
|
||||
|
|
@ -245,6 +265,7 @@ build_ci_payload() {
|
|||
echo "${current_pins}" >"${target_pins_file}"
|
||||
echo "Built MLX payload for unit tests:"
|
||||
find "${target_dir}" -maxdepth 2 -type f \( -name 'libmlx.dylib' -o -name 'libmlxc.dylib' -o -name 'libollama_xgrammar.dylib' -o -name '*.metallib' \) -print
|
||||
save_built_payload
|
||||
}
|
||||
|
||||
if [ "$(uname -s)" != "Darwin" ]; then
|
||||
|
|
@ -252,6 +273,8 @@ if [ "$(uname -s)" != "Darwin" ]; then
|
|||
exit 0
|
||||
fi
|
||||
|
||||
export CMAKE_BUILD_PARALLEL_LEVEL="${CMAKE_BUILD_PARALLEL_LEVEL:-$(sysctl -n hw.ncpu)}"
|
||||
|
||||
current_mlx="$(read_pin MLX_VERSION)"
|
||||
current_mlxc="$(read_pin MLX_C_VERSION)"
|
||||
# The release tarball only depends on the MLX pins; the extracted payload's
|
||||
|
|
@ -266,7 +289,9 @@ fi
|
|||
|
||||
mkdir -p "${cache_dir}"
|
||||
|
||||
if [ -s "${tarball}" ] && [ -f "${tag_file}" ] && [ "$(cat "${pins_file}" 2>/dev/null || true)" = "${component_pins}" ]; then
|
||||
# Release tarballs are keyed on the MLX pins; local builds on the full fingerprint.
|
||||
cached_pins="$(cat "${pins_file}" 2>/dev/null || true)"
|
||||
if [ -s "${tarball}" ] && [ -f "${tag_file}" ] && { [ "${cached_pins}" = "${component_pins}" ] || [ "${cached_pins}" = "${current_pins}" ]; }; then
|
||||
extract_payload "$(cat "${tag_file}")"
|
||||
else
|
||||
matched_tag=""
|
||||
|
|
@ -319,7 +344,8 @@ else
|
|||
extract_payload "${matched_tag}"
|
||||
fi
|
||||
|
||||
if tag_matches_payload "$(cat "${tag_file}")"; then
|
||||
tag="$(cat "${tag_file}")"
|
||||
if [ "${tag}" = "${local_tag}" ] || tag_matches_payload "${tag}"; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue