Update (base update)

[ghstack-poisoned]

Author: Gasoonjia

.ci/scripts/download_hf_hub.sh

@@ -7,13 +7,15 @@ export HF_HUB_DISABLE_XET=1
 # Arguments:
 # 1. model_id: The Hugging Face repository ID (e.g., "organization/model_name")
 # 2. subdir: The optional subdirectory in the repo to look for files (pass "" if not used)
-# 3. file_names: A space-separated list of filenames to be downloaded
+# 3. revision: The commit hash to download
+# 4. file_names: A space-separated list of filenames to be downloaded
 # Returns:
 # The directory containing the downloaded files
 function download_hf_files() {
   local model_id="$1"
   local subdir="$2"
-  shift 2
+  local revision="$3"
+  shift 3
   local file_names=("$@")  # Capture all remaining arguments as an array
 
   local download_dir
@@ -24,7 +26,8 @@ from huggingface_hub import hf_hub_download
 # Download the first file and get its directory
 path = hf_hub_download(
     repo_id='${model_id}',
-    filename='${subdir:+${subdir}/}${file_names[0]}'
+    filename='${subdir:+${subdir}/}${file_names[0]}',
+    revision='${revision}'
 )
 import os
 print(os.path.dirname(path))")
@@ -41,7 +44,8 @@ from huggingface_hub import hf_hub_download
 # Download the file
 hf_hub_download(
     repo_id='${model_id}',
-    filename='${subdir:+${subdir}/}${file_name}'
+    filename='${subdir:+${subdir}/}${file_name}',
+    revision='${revision}'
 )"
 
     if [ $? -ne 0 ]; then
@@ -67,6 +71,10 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
         SUBDIR="$2"
         shift 2
         ;;
+      --revision)
+        REVISION="$2"
+        shift 2
+        ;;
       --files)
         shift
         FILES_TO_DOWNLOAD=()
@@ -83,13 +91,13 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
   done
 
   # Validate required arguments
-  if [ -z "$MODEL_ID" ] || [ ${#FILES_TO_DOWNLOAD[@]} -eq 0 ]; then
-    echo "Usage: $0 --model_id <model_id> --subdir <subdir> --files <file1> [<file2> ...]" >&2
+  if [ -z "$MODEL_ID" ] || [ -z "$REVISION" ] || [ ${#FILES_TO_DOWNLOAD[@]} -eq 0 ]; then
+    echo "Usage: $0 --model_id <model_id> --revision <commit> --subdir <subdir> --files <file1> [<file2> ...]" >&2
     exit 1
   fi
 
   # Call the function
-  DOWNLOAD_DIR=$(download_hf_files "$MODEL_ID" "$SUBDIR" "${FILES_TO_DOWNLOAD[@]}")
+  DOWNLOAD_DIR=$(download_hf_files "$MODEL_ID" "$SUBDIR" "$REVISION" "${FILES_TO_DOWNLOAD[@]}")
   if [ $? -eq 0 ]; then
     echo "$DOWNLOAD_DIR"
   else

.ci/scripts/setup-openvino.sh

@@ -18,26 +18,27 @@ for arg in "$@"; do
   esac
 done
 
-# Download and install OpenVINO from release packages
-OPENVINO_VERSION="2026.0"
-OPENVINO_BUILD="2026.0.0.20965.c6d6a13a886"
-OPENVINO_STABLE_URL="https://storage.openvinotoolkit.org/repositories/openvino/packages/${OPENVINO_VERSION}/linux/openvino_toolkit_ubuntu22_${OPENVINO_BUILD}_x86_64.tgz"
-
-OPENVINO_NIGHTLY_BUILD_ID="2026.1.0-21310-c694fbc2b6d"
-OPENVINO_NIGHTLY_BUILD="2026.1.0.dev20260312"
-OPENVINO_NIGHTLY_URL="https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/${OPENVINO_NIGHTLY_BUILD_ID}/openvino_toolkit_ubuntu22_${OPENVINO_NIGHTLY_BUILD}_x86_64.tgz"
-
+OPENVINO_PACKAGES_URL="https://storage.openvinotoolkit.org/repositories/openvino/packages"
 if [ "${USE_NIGHTLY}" = true ]; then
-  OPENVINO_URL="${OPENVINO_NIGHTLY_URL}"
-  OPENVINO_EXTRACTED_DIR="openvino_toolkit_ubuntu22_${OPENVINO_NIGHTLY_BUILD}_x86_64"
-  echo "Using OpenVINO nightly build: ${OPENVINO_NIGHTLY_BUILD_ID}"
+  # Only for quick testing. OpenVINO deletes nightlies after a few months, so
+  # take the newest one instead of pinning a build that will disappear.
+  OPENVINO_URL=$(curl -fsSL --retry 3 --retry-all-errors "${OPENVINO_PACKAGES_URL}/nightly/latest.txt" | sed -n 's/^ubuntu22_x86_64://p')
+  : "${OPENVINO_URL:?could not get the ubuntu22_x86_64 nightly from latest.txt}"
+  OPENVINO_SHA256=$(curl -fsSL --retry 3 --retry-all-errors "${OPENVINO_URL}.sha256" | sed -nE 's/^([0-9a-f]{64}).*/\1/p')
+  : "${OPENVINO_SHA256:?could not get the SHA-256 of the nightly from its .sha256 file}"
 else
-  OPENVINO_URL="${OPENVINO_STABLE_URL}"
-  OPENVINO_EXTRACTED_DIR="openvino_toolkit_ubuntu22_${OPENVINO_BUILD}_x86_64"
-  echo "Using OpenVINO stable release: ${OPENVINO_BUILD}"
+  OPENVINO_VERSION="2026.4.1"
+  OPENVINO_BUILD="2026.4.1.22982.07f9c262b05"
+  OPENVINO_SHA256="e2541afe65a81d5aabe981f9a86ad2c7efe557922b71e5649b6aafffec7c982b"
+  OPENVINO_URL="${OPENVINO_PACKAGES_URL}/${OPENVINO_VERSION}/linux/openvino_toolkit_ubuntu22_${OPENVINO_BUILD}_x86_64.tgz"
 fi
+OPENVINO_EXTRACTED_DIR=$(basename "${OPENVINO_URL}" .tgz)
+echo "Using OpenVINO: ${OPENVINO_EXTRACTED_DIR}"
 
-curl -Lo /tmp/openvino_toolkit.tgz --retry 3 --retry-all-errors --fail ${OPENVINO_URL}
+curl -Lo /tmp/openvino_toolkit.tgz --retry 3 --retry-all-errors --fail "${OPENVINO_URL}"
+# The storage server answers a missing file with an HTML page and HTTP 200, so
+# compare the download with the expected hash before extracting it.
+echo "${OPENVINO_SHA256}  /tmp/openvino_toolkit.tgz" | sha256sum -c -
 tar -xzf /tmp/openvino_toolkit.tgz
 mv "${OPENVINO_EXTRACTED_DIR}" openvino
 

.ci/scripts/setup-qnn-deps.sh

@@ -9,7 +9,6 @@ set -ex
 
 source "$(dirname "${BASH_SOURCE[0]}")/../../backends/qualcomm/scripts/install_qnn_sdk.sh"
 
-setup_libcpp 12
 setup_android_ndk
 install_qnn
 pip install -r backends/qualcomm/requirements.txt

.ci/scripts/test-native.sh

@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+set -euxo pipefail
+
+component="${1:?Usage: test-native.sh <runtime|cpu|ggml|vulkan> [cmake options]}"
+shift
+build_dir="cmake-out/native-${component}"
+build_jobs="${CMAKE_BUILD_PARALLEL_LEVEL:-$(nproc)}"
+cmake_args=()
+targets=()
+
+case "${component}" in
+  runtime)
+    targets+=(native_runtime_test)
+    test_regex='^native_runtime_test$'
+    ;;
+  cpu)
+    cmake_args+=(
+      -DEXECUTORCH_BUILD_NATIVE_CPU=ON
+      -DEXECUTORCH_BUILD_XNNPACK=ON
+      -DEXECUTORCH_BUILD_KERNELS_OPTIMIZED=ON
+      -DEXECUTORCH_BUILD_NATIVE_VISION_RUNNER=ON
+    )
+    targets+=(native_cpu_engine_test run_classification_cpu)
+    test_regex='^native_cpu_engine_test$'
+    ;;
+  ggml)
+    cmake_args+=(
+      -DEXECUTORCH_BUILD_NATIVE_GGML=ON
+      -DEXECUTORCH_BUILD_NATIVE_LLM_RUNNER=ON
+      -DEXECUTORCH_BUILD_NATIVE_VISION_RUNNER=ON
+      -DGGML_NATIVE=OFF
+    )
+    targets+=(run_hf_llm_ggml native_ggml_engine_test native_llm_runner_utils_test run_classification_ggml_cpu)
+    test_regex='^native_(ggml_engine|llm_runner_utils)_test$'
+    ;;
+  vulkan)
+    cmake_args+=(
+      -DEXECUTORCH_BUILD_NATIVE_VULKAN=ON
+      -DEXECUTORCH_BUILD_NATIVE_VISION_RUNNER=ON
+      -DEXECUTORCH_BUILD_NATIVE_LLM_RUNNER=ON
+      -DEXECUTORCH_VULKAN_SHADER_COMPILE_NTHREADS="${build_jobs}"
+    )
+    targets+=(native_vulkan_engine run_classification run_hf_llm_vulkan native_vulkan_passes_test native_runner_utils_test)
+    test_regex='^native_(vulkan_passes|runner_utils)_test$'
+    ;;
+  *)
+    echo "Unknown native component: ${component}" >&2
+    exit 1
+    ;;
+esac
+
+cmake -S . -B "${build_dir}" -G Ninja \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DPYTHON_EXECUTABLE="$(command -v python)" \
+  -DEXECUTORCH_BUILD_TESTS=ON \
+  -DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON \
+  -DEXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR=ON \
+  -DEXECUTORCH_BUILD_EXECUTOR_RUNNER=OFF \
+  -DEXECUTORCH_BUILD_NATIVE=ON \
+  "${cmake_args[@]}" "$@"
+cmake --build "${build_dir}" \
+  --parallel "${build_jobs}" \
+  --target "${targets[@]}"
+ctest --test-dir "${build_dir}/backends/native/test" \
+  -R "${test_regex}" --output-on-failure --no-tests=error --timeout 120
+
+if [[ "${component}" == "ggml" ]]; then
+  PYTHONPATH="${PWD}/src:${PYTHONPATH:-}" \
+    FLATC_EXECUTABLE="${FLATC_EXECUTABLE:-${PWD}/${build_dir}/third-party/flatc_ep/bin/flatc}" \
+    python .ci/scripts/test_native_llm_runner.py \
+      --runner "${build_dir}/backends/native/examples/hf_llm/runtime/run_hf_llm_ggml"
+fi

.ci/scripts/test_backend.sh

@@ -53,6 +53,10 @@ if [[ "$FLOW" == *qnn* ]]; then
     EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_QNN=ON -DQNN_SDK_ROOT=$QNN_SDK_ROOT -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON"
 fi
 
+if [[ "$FLOW" == *cpu* ]]; then
+    EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_CPU=ON -DEXECUTORCH_BUILD_XNNPACK=ON -DEXECUTORCH_BUILD_KERNELS_OPTIMIZED=ON"
+fi
+
 if [[ "$FLOW" == *vulkan* ]]; then
     # CPU runners can have Mesa ICDs installed without a usable hardware GPU.
     source .ci/scripts/setup-vulkan-linux-deps.sh "swiftshader"
@@ -72,11 +76,13 @@ if [[ "$FLOW" == *arm* ]]; then
         PYTEST_RETRY_ARGS=(--reruns 2 --reruns-delay 1)
     fi
 
-    # Setup ARM deps.
+    # Setup ARM deps. Only the Ethos-U flows run on an FVP.
     if [[ "$FLOW" == *vgf* ]]; then
-        .ci/scripts/setup-arm-baremetal-tools.sh --enable-mlsdk-deps --install-mlsdk-deps-with-pip
-    else
+        .ci/scripts/setup-arm-baremetal-tools.sh --disable-ethos-u-deps --enable-mlsdk-deps --install-mlsdk-deps-with-pip
+    elif [[ "$FLOW" == *ethos_u* ]]; then
         .ci/scripts/setup-arm-baremetal-tools.sh
+    else
+        .ci/scripts/setup-arm-baremetal-tools.sh --disable-ethos-u-deps
     fi
     source examples/arm/arm-scratch/setup_path.sh
 
@@ -94,7 +100,7 @@ fi
 if [[ "$FLOW" == *cortex_m* ]]; then
     # Cortex-M runs on the Corstone-300 FVP, using the same Arm toolchain as the
     # Ethos-U flows but its own semihosting runner.
-    .ci/scripts/setup-arm-baremetal-tools.sh
+    .ci/scripts/setup-arm-baremetal-tools.sh --fvp corstone300
     source examples/arm/arm-scratch/setup_path.sh
 
     backends/cortex_m/test/build_test_runner.sh
@@ -119,7 +125,7 @@ fi
 
 if [[ "$FLOW" == *openvino* ]]; then
     # Setup OpenVINO environment
-    source .ci/scripts/setup-openvino.sh --nightly
+    source .ci/scripts/setup-openvino.sh
     EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_OPENVINO=ON"
 fi
 

.ci/scripts/test_cuda_runtime_windows.ps1

@@ -33,6 +33,7 @@ $tests = @(
     "test_cuda_allocator",
     "test_cuda_mutable_state",
     "test_cuda_weight_cache",
+    "test_cuda_output_copy",
     "test_cuda_sort_rand",
     "test_cuda_guard",
     "test_cuda_stream_guard"

.ci/scripts/test_espressif.sh

@@ -9,21 +9,45 @@ set -euo pipefail
 
 et_root=$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)
 build_dir="${ESPRESSIF_BUILD_DIR:-${et_root}/cmake-out-esp-emulator}"
+espnn_kernels="${ESPRESSIF_NN_KERNELS:-optimized}"
+case "${espnn_kernels}" in
+    optimized) espnn_config=CONFIG_NN_OPTIMIZED ;;
+    ansi) espnn_config=CONFIG_NN_ANSI_C ;;
+    *) echo "ESPRESSIF_NN_KERNELS must be optimized or ansi" >&2; exit 1 ;;
+esac
 export ESPRESSIF_TOOLS_DIR="${ESPRESSIF_TOOLS_DIR:-${RUNNER_TEMP:-/tmp}/executorch-espressif}"
 mkdir -p "${build_dir}"
 build_dir=$(cd "${build_dir}" && pwd)
 cd "${et_root}"
 
 collect_artifacts() {
+    local file operator_dir artifact_dir
     if [[ -n "${RUNNER_ARTIFACT_DIR:-}" ]]; then
         mkdir -p "${RUNNER_ARTIFACT_DIR}/esp32s3"
         for file in "${build_dir}"/*.log "${build_dir}"/*.bpte \
+            "${build_dir}"/espnn-*-sdkconfig \
+            "${build_dir}/espnn-tests"/*.bpte \
+            "${build_dir}/espnn-tests/manifest.json" \
+            "${build_dir}/espnn-tests/operators.txt" \
+            "${et_root}/examples/espressif/project/dependencies.lock" \
             "${build_dir}/firmware/merged-binary.bin" \
             "${build_dir}/firmware/executorch_esp_runner.elf"; do
             if [[ -f "${file}" ]]; then
                 cp "${file}" "${RUNNER_ARTIFACT_DIR}/esp32s3/"
             fi
         done
+        for operator_dir in "${build_dir}"/operator-library-*; do
+            [[ -d "${operator_dir}" ]] || continue
+            artifact_dir="${RUNNER_ARTIFACT_DIR}/esp32s3/${operator_dir##*/}"
+            mkdir -p "${artifact_dir}"
+            for file in "${operator_dir}"/*.log "${operator_dir}"/*.bpte \
+                "${operator_dir}/sdkconfig" "${operator_dir}"/*.elf \
+                "${operator_dir}/merged-binary.bin"; do
+                if [[ -f "${file}" ]]; then
+                    cp "${file}" "${artifact_dir}/"
+                fi
+            done
+        done
     fi
 }
 trap collect_artifacts EXIT
@@ -34,13 +58,27 @@ source "${ESPRESSIF_TOOLS_DIR}/setup_path.sh"
 
 python examples/espressif/export_smoke_model.py \
     --output "${build_dir}/smoke.bpte" 2>&1 | tee "${build_dir}/export.log"
+python examples/espressif/export_espnn_test_programs.py \
+    --output-dir "${build_dir}/espnn-tests" 2>&1 | tee "${build_dir}/espnn-export.log"
+
+# One runtime serves the smoke test and the ESP-NN programs. quantized_ops_lib
+# registers kernels outside the selected list, so the registry is sized
+# explicitly instead of from the list. The quantized kernels' parallel_for
+# runs inline without pthreadpool, which needs POSIX calls ESP-IDF lacks.
+espnn_ops=$(tr -d '\n' < "${build_dir}/espnn-tests/operators.txt" \
+    | tr ',' '\n' | grep -v '^quantized_decomposed::' | paste -sd, -)
+if [[ "${espnn_kernels}" == optimized ]]; then
+    espnn_ops="${espnn_ops},aten::sin.out"
+fi
 
 cmake --preset esp-baremetal -G Ninja -B "${build_dir}/runtime" \
     -DCMAKE_TOOLCHAIN_FILE="${IDF_PATH}/tools/cmake/toolchain-esp32s3.cmake" \
     -DCMAKE_BUILD_TYPE=Release \
     -DEXECUTORCH_BUILD_DEVTOOLS=ON \
-    -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=OFF \
-    -DEXECUTORCH_SELECT_OPS_LIST=aten::add.out,aten::mul.out \
+    -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON \
+    -DEXECUTORCH_SELECT_OPS_LIST="aten::add.out,aten::mul.out,${espnn_ops}" \
+    -DMAX_KERNEL_NUM=256 \
+    -DEXECUTORCH_BUILD_PTHREADPOOL=OFF -DEXECUTORCH_BUILD_CPUINFO=OFF \
     2>&1 | tee "${build_dir}/runtime-configure.log"
 cmake --build "${build_dir}/runtime" \
     2>&1 | tee "${build_dir}/runtime-build.log"
@@ -66,3 +104,64 @@ timeout 130s esp-emu --chip esp32s3 \
     --net user --psram-size 8M --timeout 120s --exit-on 'Program complete.' \
     2>&1 | tee "${build_dir}/emulator.log"
 python examples/espressif/test_emulator.py "${build_dir}/emulator.log"
+
+# ESP-NN backend: run every exported program through the ExecuTorch runtime
+# and the ESP-NN delegate, and check it against the bundled host reference.
+espnn_firmware_dir="${build_dir}/espnn-${espnn_kernels}-firmware"
+espnn_sdkconfig="${build_dir}/espnn-${espnn_kernels}-sdkconfig"
+espnn_defaults="${build_dir}/espnn-${espnn_kernels}.defaults"
+printf '%s=y\n' "${espnn_config}" > "${espnn_defaults}"
+# Runs a command with its output in a log, and shows the log's tail on failure.
+logged() {
+    local log="${build_dir}/$1"
+    shift
+    if ! "$@" > "${log}" 2>&1; then
+        tail -n 60 "${log}"
+        echo "FAIL: see ${log}" >&2
+        return 1
+    fi
+}
+while read -r -u 3 name atol rtol; do
+    espnn_log_prefix="espnn-${espnn_kernels}-${name}"
+    logged "${espnn_log_prefix}-configure.log" \
+        idf.py -C examples/espressif/project -B "${espnn_firmware_dir}" \
+        -DIDF_TARGET=esp32s3 \
+        -DSDKCONFIG="${espnn_sdkconfig}" \
+        "-DSDKCONFIG_DEFAULTS=sdkconfig.defaults;${espnn_defaults}" \
+        -DET_ESPNN_BACKEND=ON \
+        -DET_BUILD_DIR_PATH="${build_dir}/runtime" \
+        -DET_PTE_FILE_PATH="${build_dir}/espnn-tests/${name}.bpte" \
+        -DET_BUNDLE_IO=ON -DET_NUM_INFERENCES=1 \
+        -DET_ATOL="${atol}" -DET_RTOL="${rtol}" reconfigure
+    if ! grep -qx "${espnn_config}=y" "${espnn_sdkconfig}"; then
+        echo "Expected ${espnn_config}=y in ${espnn_sdkconfig}" >&2
+        exit 1
+    fi
+    logged "${espnn_log_prefix}-build.log" cmake --build "${espnn_firmware_dir}"
+    logged "${espnn_log_prefix}-merge.log" \
+        idf.py -C examples/espressif/project -B "${espnn_firmware_dir}" merge-bin
+    logged "${espnn_log_prefix}-emulator.log" \
+        timeout 90s esp-emu --chip esp32s3 \
+        --firmware "${espnn_firmware_dir}/merged-binary.bin" \
+        --elf "${espnn_firmware_dir}/executorch_esp_runner.elf" \
+        --net user --psram-size 8M --timeout 60s --exit-on 'Program complete.'
+    echo -n "${espnn_kernels}/${name}: "
+    python examples/espressif/test_emulator.py "${build_dir}/${espnn_log_prefix}-emulator.log"
+done 3< <(python -c '
+import json, sys
+for entry in json.load(open(sys.argv[1])):
+    print(entry["name"], entry["atol"], entry["rtol"])
+' "${build_dir}/espnn-tests/manifest.json")
+
+if [[ "${espnn_kernels}" == optimized ]]; then
+    # Stop on failure so later cases cannot overwrite its firmware and logs.
+    ESPRESSIF_BUILD_DIR="${build_dir}" python -m pytest \
+        -x -v --tb=short backends/espressif/test/ops -k implementation \
+        2>&1 | tee "${build_dir}/operator-library-tests.log"
+    for sdkconfig in "${build_dir}"/operator-library-*/sdkconfig; do
+        if ! grep -qx 'CONFIG_NN_OPTIMIZED=y' "${sdkconfig}"; then
+            echo "Expected CONFIG_NN_OPTIMIZED=y in ${sdkconfig}" >&2
+            exit 1
+        fi
+    done
+fi