update apple build script

jathu · jathu · commit fd4bdcdef6ee · 2025-05-23T14:48:01.000-07:00
diff --git a/.github/workflows/apple-perf.yml b/.github/workflows/apple-perf.yml
@@ -386,8 +386,7 @@ jobs:
         echo "::endgroup::"
 
         echo "::group::Build ExecuTorch iOS frameworks"
-        PYTHON_EXECUTABLE=python ${CONDA_RUN} --no-capture-output \
-          scripts/build_apple_frameworks.sh --Release --Debug --coreml --custom --mps --optimized --portable --quantized --xnnpack
+        PYTHON_EXECUTABLE=python ${CONDA_RUN} --no-capture-output scripts/build_apple_frameworks.sh
         echo "::endgroup::"
 
         # NB: Although exported models can be copied to this directory and bundled together with the
diff --git a/.github/workflows/apple.yml b/.github/workflows/apple.yml
@@ -173,8 +173,7 @@ jobs:
         backends/apple/mps/install_requirements.sh
 
         # Build iOS Frameworks
-        PYTHON_EXECUTABLE=python ${CONDA_RUN} --no-capture-output \
-        scripts/build_apple_frameworks.sh --Release --Debug --coreml --custom --mps --optimized --portable --quantized --xnnpack
+        PYTHON_EXECUTABLE=python ${CONDA_RUN} --no-capture-output scripts/build_apple_frameworks.sh
 
         # Bundle iOS Frameworks
         for FRAMEWORK in "${FRAMEWORKS[@]}"; do (
@@ -314,8 +313,7 @@ jobs:
         echo "::endgroup::"
 
         echo "::group::Build ExecuTorch iOS frameworks"
-        PYTHON_EXECUTABLE=python ${CONDA_RUN} --no-capture-output \
-          scripts/build_apple_frameworks.sh --Release --Debug --coreml --custom --mps --optimized --portable --quantized --xnnpack
+        PYTHON_EXECUTABLE=python ${CONDA_RUN} --no-capture-output scripts/build_apple_frameworks.sh
         echo "::endgroup::"
 
         echo "::group::Build ExecuTorch benchmark app"
diff --git a/scripts/build_apple_frameworks.sh b/scripts/build_apple_frameworks.sh
@@ -7,23 +7,13 @@
 
 set -euxo pipefail
 
-SOURCE_ROOT_DIR=""
-OUTPUT="cmake-out"
-MODES=()
-TOOLCHAIN=""
-PYTHON=$(which python3)
-COREML=OFF
-CUSTOM=OFF
-MPS=OFF
-OPTIMIZED=OFF
-PORTABLE=OFF
-QUANTIZED=OFF
-XNNPACK=OFF
-HEADERS_PATH="include"
-
-PLATFORMS=("ios" "simulator" "macos")
-PLATFORM_FLAGS=("OS64" "SIMULATORARM64" "MAC_ARM64")
-PLATFORM_TARGET=("17.0" "17.0" "10.15")
+MODES=("Release" "Debug")
+PRESETS=("ios" "ios-simulator" "macos")
+
+SOURCE_ROOT_DIR="$(git rev-parse --show-toplevel)"
+OUTPUT_DIR="${SOURCE_ROOT_DIR}/cmake-out"
+HEADERS_RELATIVE_PATH="include"
+HEADERS_ABSOLUTE_PATH="${OUTPUT_DIR}/${HEADERS_RELATIVE_PATH}"
 
 FRAMEWORK_EXECUTORCH="executorch:\
 libexecutorch.a,\
@@ -33,7 +23,7 @@ libextension_data_loader.a,\
 libextension_flat_tensor.a,\
 libextension_module.a,\
 libextension_tensor.a,\
-:$HEADERS_PATH:ExecuTorch"
+:$HEADERS_RELATIVE_PATH:ExecuTorch"
 
 FRAMEWORK_BACKEND_COREML="backend_coreml:\
 libcoreml_util.a,\
@@ -75,33 +65,30 @@ libquantized_ops_lib.a,\
 :"
 
 usage() {
-  echo "Usage: $0 [SOURCE_ROOT_DIR] [OPTIONS]"
+  echo "Usage: $0 [OPTIONS]"
   echo "Build frameworks for Apple platforms."
-  echo "SOURCE_ROOT_DIR defaults to the current directory if not provided."
   echo
   echo "Options:"
-  echo "  --output=DIR         Output directory. Default: 'cmake-out'"
   echo "  --Debug              Build Debug version."
   echo "  --Release            Build Release version."
-  echo "  --toolchain=FILE     CMake toolchain file. Default: '\$SOURCE_ROOT_DIR/third-party/ios-cmake/ios.toolchain.cmake'"
-  echo "  --python=FILE        Python executable path. Default: Path of python3 in \$PATH"
-  echo "  --coreml             Build the Core ML backend."
-  echo "  --custom             Build the Custom kernels."
-  echo "  --mps                Build the Metal Performance Shaders backend."
-  echo "  --optimized          Build the Optimized kernels."
-  echo "  --portable           Build the Portable kernels."
-  echo "  --quantized          Build the Quantized kernels."
-  echo "  --xnnpack            Build the XNNPACK backend."
   echo
-  echo "Example:"
-  echo "  $0 /path/to/source/root --output=cmake-out --toolchain=/path/to/toolchain --python=/path/to/python3 --coreml --mps --xnnpack"
   exit 0
 }
 
+deprecated_option() {
+  local option_name="$1"
+  local cmake_var="${2:-}"
+  if [[ -n "$cmake_var" ]]; then
+    echo -e "\033[31mFlag '--${option_name}' is now ON by default and deprecated. To turn off that feature, use:\033[34m\n\n\tCMAKE_ARGS=\"-D${cmake_var}=OFF\" $0\n\033[0m"
+  else
+    echo -e "\033[31mFlag '--${option_name}' is now ON by default and deprecated.\033[0m"
+  fi
+  exit 1
+}
+
 for arg in "$@"; do
   case $arg in
       -h|--help) usage ;;
-      --output=*) OUTPUT="${arg#*=}" ;;
       --Release)
         if [[ ! " ${MODES[*]:-} " =~ \bRelease\b ]]; then
           MODES+=("Release")
@@ -112,135 +99,59 @@ for arg in "$@"; do
           MODES+=("Debug")
         fi
         ;;
-      --toolchain=*) TOOLCHAIN="${arg#*=}" ;;
-      --python=*) PYTHON="${arg#*=}" ;;
-      --coreml) COREML=ON ;;
-      --custom) CUSTOM=ON ;;
-      --mps) MPS=ON ;;
-      --optimized) OPTIMIZED=ON ;;
-      --portable) PORTABLE=ON ;;
-      --quantized) QUANTIZED=ON ;;
-      --xnnpack) XNNPACK=ON ;;
+      --coreml) deprecated_option "coreml" "EXECUTORCH_BUILD_COREML";;
+      --custom) deprecated_option "custom" "EXECUTORCH_BUILD_KERNELS_CUSTOM" ;;
+      --mps) deprecated_option "mps" "EXECUTORCH_BUILD_MPS" ;;
+      --optimized) deprecated_option "optimized" "EXECUTORCH_BUILD_KERNELS_OPTIMIZED" ;;
+      --portable) deprecated_option "portable" ;;
+      --quantized) deprecated_option "quantized" "EXECUTORCH_BUILD_KERNELS_QUANTIZED" ;;
+      --xnnpack) deprecated_option "xnnpack" "EXECUTORCH_BUILD_XNNPACK" ;;
       *)
-      if [[ -z "$SOURCE_ROOT_DIR" ]]; then
-          SOURCE_ROOT_DIR="$arg"
-      else
-          echo "Invalid argument: $arg"
-          exit 1
-      fi
       ;;
   esac
 done
 
-if [ ${#MODES[@]} -eq 0 ]; then
-  MODES=("Release")
-fi
-
-if [[ -z "$SOURCE_ROOT_DIR" ]]; then
-    SOURCE_ROOT_DIR=$(pwd)
-fi
-
-if [[ -z "$TOOLCHAIN" ]]; then
-    TOOLCHAIN="$SOURCE_ROOT_DIR/third-party/ios-cmake/ios.toolchain.cmake"
-fi
-[[ -f "$TOOLCHAIN" ]] || { echo >&2 "Toolchain file $TOOLCHAIN does not exist."; exit 1; }
-
-BUCK2=$("$PYTHON" "$SOURCE_ROOT_DIR/tools/cmake/resolve_buck.py" --cache_dir="$SOURCE_ROOT_DIR/buck2-bin")
+BUCK2=$(python3 "$SOURCE_ROOT_DIR/tools/cmake/resolve_buck.py" --cache_dir="$SOURCE_ROOT_DIR/buck2-bin")
 
 if [[ "$BUCK2" == "buck2" ]]; then
   BUCK2=$(command -v buck2)
 fi
 
-check_command() {
-  if [[ "$1" == */* ]]; then
-    if [[ ! -x "$1" ]]; then
-      echo "Error: Command not found or not executable at '$1'" >&2
-      exit 1
-    fi
-  else
-    if ! command -v "$1" >/dev/null 2>&1; then
-      echo "Error: Command '$1' not found in PATH" >&2
-      exit 1
-    fi
-  fi
-}
-
-check_command cmake
-check_command rsync
-check_command "$PYTHON"
-check_command "$BUCK2"
-
 echo "Building libraries"
 
-rm -rf "$OUTPUT" && mkdir -p "$OUTPUT" && cd "$OUTPUT" || exit 1
-
-cmake_build() {
-    local platform=$1
-    local platform_flag=$2
-    local platform_target=$3
-    local mode=$4
-    echo "Building for $platform ($mode) with flag $platform_flag"
-    mkdir -p "$platform" && cd "$platform" || exit 1
-    cmake "$SOURCE_ROOT_DIR" -G Xcode \
-        -DCMAKE_BUILD_TYPE="$mode" \
-        -DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN" \
-        -DCMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD="c++17" \
-        -DCMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY="libc++" \
-        -DCMAKE_C_FLAGS="-ffile-prefix-map=$SOURCE_ROOT_DIR=/executorch -fdebug-prefix-map=$SOURCE_ROOT_DIR=/executorch" \
-        -DCMAKE_CXX_FLAGS="-ffile-prefix-map=$SOURCE_ROOT_DIR=/executorch -fdebug-prefix-map=$SOURCE_ROOT_DIR=/executorch" \
-        -DPYTHON_EXECUTABLE="$PYTHON" \
-        -DEXECUTORCH_BUILD_COREML=$COREML \
-        -DEXECUTORCH_BUILD_MPS=$MPS \
-        -DEXECUTORCH_BUILD_XNNPACK=$XNNPACK \
-        -DEXECUTORCH_XNNPACK_SHARED_WORKSPACE=ON \
-        -DEXECUTORCH_BUILD_EXECUTOR_RUNNER=OFF \
-        -DEXECUTORCH_BUILD_EXTENSION_APPLE=ON \
-        -DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON \
-        -DEXECUTORCH_BUILD_EXTENSION_MODULE=ON \
-        -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \
-        -DEXECUTORCH_BUILD_KERNELS_CUSTOM=$CUSTOM \
-        -DEXECUTORCH_BUILD_KERNELS_OPTIMIZED=$OPTIMIZED \
-        -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=$QUANTIZED \
-        -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY="$(pwd)" \
-        ${platform_flag:+-DPLATFORM=$platform_flag} \
-        ${platform_target:+-DDEPLOYMENT_TARGET=$platform_target} \
-        --log-level=VERBOSE
-    cmake --build . \
-        --config "$mode" \
-        --verbose
-    cd -
-}
-
-for index in ${!PLATFORMS[*]}; do
+rm -rf "${OUTPUT_DIR}"
+for preset in "${PRESETS[@]}"; do
   for mode in "${MODES[@]}"; do
-    cmake_build "${PLATFORMS[$index]}" "${PLATFORM_FLAGS[$index]}" "${PLATFORM_TARGET[$index]}" "$mode"
+    output_dir="${OUTPUT_DIR}/${preset}"
+    echo "Building preset ${preset} (${mode}) in ${output_dir}..."
+
+    cmake -S "${SOURCE_ROOT_DIR}" \
+          -B "${output_dir}" \
+          -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY="${output_dir}" \
+          -DCMAKE_BUILD_TYPE="${mode}" \
+          ${CMAKE_ARGS:-} \
+          --preset "${preset}"
+
+    cmake --build "${output_dir}" \
+          --config "${mode}" \
+          -j$(sysctl -n hw.ncpu)
   done
 done
 
 echo "Exporting headers"
 
-mkdir -p "$HEADERS_PATH"
+mkdir -p "$HEADERS_ABSOLUTE_PATH"
 
 "$SOURCE_ROOT_DIR"/scripts/print_exported_headers.py --buck2=$(realpath "$BUCK2") --targets \
   //extension/module: \
   //extension/tensor: \
-| rsync -av --files-from=- "$SOURCE_ROOT_DIR" "$HEADERS_PATH/executorch"
-
-# HACK: XCFrameworks don't appear to support exporting any build
-# options, but we need the following:
-# - runtime/core/portable/type/c10 reachable with `#include <c10/...>`
-# - exported -DC10_USING_CUSTOM_GENERATED_MACROS compiler flag
-# So, just patch our generated framework to do that.
-sed -i '' '1i\
-#define C10_USING_CUSTOM_GENERATED_MACROS
-' \
-"$HEADERS_PATH/executorch/runtime/core/portable_type/c10/c10/macros/Macros.h" \
-"$HEADERS_PATH/executorch/runtime/core/portable_type/c10/c10/macros/Export.h"
-
-cp -r $HEADERS_PATH/executorch/runtime/core/portable_type/c10/c10 "$HEADERS_PATH/"
-
-cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.h "$HEADERS_PATH/executorch"
-cat > "$HEADERS_PATH/module.modulemap" << 'EOF'
+| rsync -av --files-from=- "$SOURCE_ROOT_DIR" "$HEADERS_ABSOLUTE_PATH/executorch"
+
+cp -r $HEADERS_ABSOLUTE_PATH/executorch/runtime/core/portable_type/c10/c10 "$HEADERS_ABSOLUTE_PATH/"
+
+cp "$SOURCE_ROOT_DIR/extension/apple/ExecuTorch/Exported/"*.h "$HEADERS_ABSOLUTE_PATH/executorch"
+
+cat > "$HEADERS_ABSOLUTE_PATH/module.modulemap" << 'EOF'
 module ExecuTorch {
   umbrella header "ExecuTorch/ExecuTorch.h"
   export *
@@ -250,47 +161,52 @@ EOF
 echo "Creating frameworks"
 
 append_framework_flag() {
-  local flag="$1"
+  local option="$1"
   local framework="$2"
-  local mode="${3:-}"
-  if [[ $flag == ON ]]; then
-    if [[ -n "$mode" && "$mode" != "Release" ]]; then
+  local mode="$3"
+
+  if [[ "${CMAKE_ARGS:-}" =~ "-D${option}=OFF" ]]; then
+    echo "Skipping framework: ${framework}"
+    return
+  fi
+
+  if [[ -n "$mode" && "$mode" != "Release" ]]; then
       local name spec
       name=$(echo "$framework" | cut -d: -f1)
       spec=$(echo "$framework" | cut -d: -f2-)
       framework="${name}_$(echo "$mode" | tr '[:upper:]' '[:lower:]'):${spec}"
-    fi
-    echo "Framework: $framework"
-    FRAMEWORK_FLAGS+=("--framework=$framework")
   fi
+  echo "Adding framework: ${framework}"
+  FRAMEWORK_FLAGS+=("--framework=$framework")
 }
 
 for mode in "${MODES[@]}"; do
   FRAMEWORK_FLAGS=()
-  for platform in "${PLATFORMS[@]}"; do
-    echo "Directory: $platform/$mode"
-    FRAMEWORK_FLAGS+=("--directory=$platform/$mode")
+  for preset in "${PRESETS[@]}"; do
+    echo "Framework directory: ${preset}/${mode}"
+    FRAMEWORK_FLAGS+=("--directory=${preset}/${mode}")
   done
 
-  append_framework_flag "ON" "$FRAMEWORK_EXECUTORCH" "$mode"
-  append_framework_flag "$COREML" "$FRAMEWORK_BACKEND_COREML" "$mode"
-  append_framework_flag "$MPS" "$FRAMEWORK_BACKEND_MPS" "$mode"
-  append_framework_flag "$XNNPACK" "$FRAMEWORK_BACKEND_XNNPACK" "$mode"
-  append_framework_flag "$CUSTOM" "$FRAMEWORK_KERNELS_CUSTOM" "$mode"
-  append_framework_flag "$OPTIMIZED" "$FRAMEWORK_KERNELS_OPTIMIZED" "$mode"
-  append_framework_flag "$PORTABLE" "$FRAMEWORK_KERNELS_PORTABLE" "$mode"
-  append_framework_flag "$QUANTIZED" "$FRAMEWORK_KERNELS_QUANTIZED" "$mode"
+  append_framework_flag "" "$FRAMEWORK_EXECUTORCH" "$mode"
+  append_framework_flag "EXECUTORCH_BUILD_COREML" "$FRAMEWORK_BACKEND_COREML" "$mode"
+  append_framework_flag "EXECUTORCH_BUILD_MPS" "$FRAMEWORK_BACKEND_MPS" "$mode"
+  append_framework_flag "EXECUTORCH_BUILD_XNNPACK" "$FRAMEWORK_BACKEND_XNNPACK" "$mode"
+  append_framework_flag "EXECUTORCH_BUILD_KERNELS_CUSTOM" "$FRAMEWORK_KERNELS_CUSTOM" "$mode"
+  append_framework_flag "EXECUTORCH_BUILD_KERNELS_OPTIMIZED" "$FRAMEWORK_KERNELS_OPTIMIZED" "$mode"
+  append_framework_flag "" "$FRAMEWORK_KERNELS_PORTABLE" "$mode"
+  append_framework_flag "EXECUTORCH_BUILD_KERNELS_QUANTIZED" "$FRAMEWORK_KERNELS_QUANTIZED" "$mode"
 
+  cd "${OUTPUT_DIR}"
   "$SOURCE_ROOT_DIR"/scripts/create_frameworks.sh "${FRAMEWORK_FLAGS[@]}"
 done
 
 echo "Cleaning up"
 
-for platform in "${PLATFORMS[@]}"; do
-  rm -rf "$platform"
+for preset in "${PRESETS[@]}"; do
+  rm -rf "${OUTPUT_DIR}/${preset}/$preset"
 done
 
-rm -rf "$HEADERS_PATH"
+rm -rf "$HEADERS_ABSOLUTE_PATH"
 
 echo "Running tests"
 
