monster/trellis-2-mrp-mlx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: retry Metal build with ABI fallback

Browse Source
This commit is contained in:
Jourloy 2026-07-17 09:26:00 +03:00
parent 2b7f47fc87
commit b50b5c4fc5
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/setup_macos.sh
View File

@ -77,15 +77,15 @@ checkout_dependency() {
install_metal_stack() { install_metal_stack() {
export MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-12.0}" export MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-12.0}"
checkout_dependency mtlbvh https://github.com/pedronaugusto/mtlbvh.git "$MTLBVH_SHA" checkout_dependency mtlbvh https://github.com/pedronaugusto/mtlbvh.git "$MTLBVH_SHA" || return 1
"${PIP[@]}" install --no-build-isolation "$DEP_PATH" "${PIP[@]}" install --no-build-isolation "$DEP_PATH" || return 1
checkout_dependency mtldiffrast https://github.com/pedronaugusto/mtldiffrast.git "$MTLDIFFRAST_SHA" checkout_dependency mtldiffrast https://github.com/pedronaugusto/mtldiffrast.git "$MTLDIFFRAST_SHA" || return 1
"${PIP[@]}" install --no-build-isolation "$DEP_PATH" "${PIP[@]}" install --no-build-isolation "$DEP_PATH" || return 1
checkout_dependency mtlmesh https://github.com/pedronaugusto/mtlmesh.git "$MTLMESH_SHA" checkout_dependency mtlmesh https://github.com/pedronaugusto/mtlmesh.git "$MTLMESH_SHA" || return 1
"${PIP[@]}" install --no-build-isolation "$DEP_PATH" "${PIP[@]}" install --no-build-isolation "$DEP_PATH" || return 1
checkout_dependency mtlgemm https://github.com/pedronaugusto/mtlgemm.git "$MTLGEMM_SHA" checkout_dependency mtlgemm https://github.com/pedronaugusto/mtlgemm.git "$MTLGEMM_SHA" || return 1
"${PIP[@]}" install --no-build-isolation "$DEP_PATH" "${PIP[@]}" install --no-build-isolation "$DEP_PATH" || return 1
BUILD_TARGET=cpu "${PIP[@]}" install --no-build-isolation -e "$ROOT/o-voxel" BUILD_TARGET=cpu "${PIP[@]}" install --no-build-isolation -e "$ROOT/o-voxel" || return 1
} }
install_torch_pair "$PRIMARY_TORCH" "$PRIMARY_TORCHVISION" install_torch_pair "$PRIMARY_TORCH" "$PRIMARY_TORCHVISION"
@ -95,8 +95,7 @@ resolved_torchvision="$PRIMARY_TORCHVISION"
if [[ "${SKIP_METAL:-0}" == "1" ]]; then if [[ "${SKIP_METAL:-0}" == "1" ]]; then
BUILD_TARGET=cpu "${PIP[@]}" install --no-build-isolation -e "$ROOT/o-voxel" BUILD_TARGET=cpu "${PIP[@]}" install --no-build-isolation -e "$ROOT/o-voxel"
else else
install_metal_stack if ! install_metal_stack || ! "$PYTHON" "$ROOT/scripts/probe_macos.py" --require-metal; then
if ! "$PYTHON" "$ROOT/scripts/probe_macos.py" --require-metal; then
echo "Primary PyTorch pair failed the Metal build/probe; retrying the prescribed ABI fallback..." >&2 echo "Primary PyTorch pair failed the Metal build/probe; retrying the prescribed ABI fallback..." >&2
install_torch_pair "$FALLBACK_TORCH" "$FALLBACK_TORCHVISION" install_torch_pair "$FALLBACK_TORCH" "$FALLBACK_TORCHVISION"
install_metal_stack install_metal_stack