Merge branch 'main' into et_dump

Author: psiddh

.ci/docker/build.sh

@@ -23,9 +23,14 @@ MINICONDA_VERSION=23.10.0-1
 BUCK2_VERSION=$(cat ci_commit_pins/buck2.txt)
 
 case "${IMAGE_NAME}" in
-  executorch-ubuntu-22.04-gcc9)
+  executorch-ubuntu-22.04-gcc11)
+    LINTRUNNER=""
+    GCC_VERSION=11
+    ;;
+  executorch-ubuntu-22.04-gcc9-nopytorch)
     LINTRUNNER=""
     GCC_VERSION=9
+    SKIP_PYTORCH=yes
     ;;
   executorch-ubuntu-22.04-clang12)
     LINTRUNNER=""
@@ -95,6 +100,7 @@ docker build \
   --build-arg "QNN_SDK=${QNN_SDK:-}" \
   --build-arg "MEDIATEK_SDK=${MEDIATEK_SDK:-}" \
   --build-arg "ANDROID_NDK_VERSION=${ANDROID_NDK_VERSION:-}" \
+  --build-arg "SKIP_PYTORCH=${SKIP_PYTORCH:-}" \
   -f "${OS}"/Dockerfile \
   "$@" \
   .

.ci/docker/ci_commit_pins/optimum-executorch.txt

@@ -1 +1 @@
-d03e90c2cd9048e6d9a75285c0355f033cd016fc
+de4f3c4978b4d36cc0bb8f87c6877a4a040d7ae7

.ci/docker/ci_commit_pins/pytorch.txt

@@ -1 +1 @@
-b31bad1b8f1331bf43d47f46602cf6141db56844
+7a064ed3eafa43f17412d434b395240c727b3000

.ci/docker/common/install_pytorch.sh

@@ -12,8 +12,8 @@ source "$(dirname "${BASH_SOURCE[0]}")/utils.sh"
 
 install_domains() {
   echo "Install torchvision and torchaudio"
-  pip_install --no-use-pep517 --user "git+https://github.com/pytorch/audio.git@${TORCHAUDIO_VERSION}"
-  pip_install --no-use-pep517 --user "git+https://github.com/pytorch/vision.git@${TORCHVISION_VERSION}"
+  pip_install --no-build-isolation --user "git+https://github.com/pytorch/audio.git@${TORCHAUDIO_VERSION}"
+  pip_install --no-build-isolation --user "git+https://github.com/pytorch/vision.git@${TORCHVISION_VERSION}"
 }
 
 install_pytorch_and_domains() {

.ci/docker/requirements-ci.txt

@@ -2,7 +2,7 @@ mpmath==1.3.0
 numpy>=2.0.0; python_version >= '3.10'
 PyYAML==6.0.1
 ruamel.yaml==0.18.15
-sympy==1.12
+sympy>=1.13.3
 timm==0.6.13
 tomli==2.0.1
 torchsr==1.0.4

.ci/docker/ubuntu/Dockerfile

@@ -64,9 +64,10 @@ ENV SCCACHE_S3_KEY_PREFIX executorch
 ENV SCCACHE_REGION us-east-1
 
 ARG TORCH_VERSION
+ARG SKIP_PYTORCH
 COPY ./common/install_pytorch.sh install_pytorch.sh
 COPY ./common/utils.sh utils.sh
-RUN bash ./install_pytorch.sh && rm install_pytorch.sh utils.sh
+RUN if [ -z "${SKIP_PYTORCH}" ]; then bash ./install_pytorch.sh; fi && rm install_pytorch.sh utils.sh
 
 ARG LINTRUNNER
 # Install lintrunner if needed

.ci/scripts/build-qnn-sdk.sh

@@ -42,11 +42,10 @@ set_up_aot() {
       -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \
       -DEXECUTORCH_ENABLE_EVENT_TRACER=ON \
       -DPYTHON_EXECUTABLE=python3
-  cmake --build $PWD --target "PyQnnManagerAdaptor" "PyQnnWrapperAdaptor" -j$(nproc)
+  cmake --build $PWD --target "PyQnnManagerAdaptor" -j$(nproc)
   # install Python APIs to correct import path
   # The filename might vary depending on your Python and host version.
   cp -f backends/qualcomm/PyQnnManagerAdaptor.cpython-310-x86_64-linux-gnu.so $EXECUTORCH_ROOT/backends/qualcomm/python
-  cp -f backends/qualcomm/PyQnnWrapperAdaptor.cpython-310-x86_64-linux-gnu.so $EXECUTORCH_ROOT/backends/qualcomm/python
   popd
 
   # Workaround for fbs files in exir/_serialize

.ci/scripts/setup-samsung-linux-deps.sh

@@ -8,61 +8,199 @@
 
 set -ex
 
+API_KEY=$SAMSUNG_AI_LITECORE_KEY
+if [[ -z "${API_KEY}" ]]; then
+  echo "ERROR: It didn't set up SAMSUNG_AI_LITECORE_KEY." >&2
+  exit 1
+fi
+
+OS_NAME="Ubuntu 22.04"
+LITECORE_BASE="https://soc-developer.semiconductor.samsung.com/api/v1/resource/ai-litecore/download"
+DEVICEFARM_BASE="https://soc-developer.semiconductor.samsung.com/api/v1/resource/remotelab/download"
+
+parse_url() {
+  local json="$1"
+  if command -v jq >/dev/null 2>&1; then
+    jq -r '.data // empty' <<<"$json"
+  else
+    sed -n 's/.*"data":[[:space:]]*"\([^"]*\)".*/\1/p' <<<"$json"
+  fi
+}
 
-download_ai_lite_core() {
-  API_BASE="https://soc-developer.semiconductor.samsung.com/api/v1/resource/ai-litecore/download"
-  API_KEY=$SAMSUNG_AI_LITECORE_KEY
-
-  VERSION="0.7"
-  OS_NAME="Ubuntu 22.04"
-  OUT_FILE="/tmp/exynos-ai-litecore-v${VERSION}.tar.gz"
-  TARGET_PATH="/tmp/exynos_ai_lite_core"
-
-  mkdir -p ${TARGET_PATH}
-  # Presigned issue URL
-  JSON_RESP=$(curl -sS -G \
-    --location --fail --retry 3 \
+download_and_extract() {
+  local base_url="$1"
+  local version="$2"
+  local out_dir="$3"
+  local out_file="$4"
+
+  local resp
+  resp=$(curl -fsSL -G \
     -H "apikey: ${API_KEY}" \
-    --data-urlencode "version=${VERSION}" \
+    --data-urlencode "version=${version}" \
     --data-urlencode "os=${OS_NAME}" \
-    "${API_BASE}")
+    "${base_url}")
+
+  local download_url
+  download_url=$(parse_url "$resp")
+  if [[ -z "${download_url}" ]]; then
+    echo "ERROR: It failed to download from ${base_url} ."
+    echo "Response: $resp" >&2
+    exit 1
+  fi
+
+  curl -fsSL -L --retry 3 -o "${out_file}" "${download_url}"
+  echo "Download completed: ${out_file}"
 
-  DOWNLOAD_URL=$(echo "$JSON_RESP" | sed -n 's/.*"data":[[:space:]]*"\([^"]*\)".*/\1/p')
+  mkdir -p "${out_dir}"
+  case "${out_file##*.}" in
+  tar|tgz|gz)
+    echo "Extracting TAR.GZ..."
+    tar -C "${out_dir}" --strip-components=1 -xzvf "${out_file}"
+    ;;
 
-  if [[ -z "$DOWNLOAD_URL" ]]; then
-    echo "Failed to extract download URL"
-    echo "$JSON_RESP"
+  zip)
+    echo "Extracting ZIP..."
+    unzip -q -d "${out_dir}" "${out_file}"
+    ;;
+
+  *)
     exit 1
+    ;;
+  esac
+  echo "Extracted to: ${out_dir}"
+}
+
+download_ai_lite_core() {
+  local litecore_version="${1:-1.0}"
+  local litecore_out="/tmp/exynos-ai-litecore-v${litecore_version}.tar.gz"
+  local litecore_dir="/tmp/exynos_ai_lite_core"
+
+  download_and_extract \
+    "${LITECORE_BASE}" \
+    "${litecore_version}" \
+    "${litecore_dir}" \
+    "${litecore_out}"
+
+  export EXYNOS_AI_LITECORE_ROOT="${litecore_dir}"
+  export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:${EXYNOS_AI_LITECORE_ROOT}/lib/x86_64-linux"
+}
+
+install_devicefarm_cli() {
+  local cli_version="${1:-beta-1.0.8}"
+  local cli_out="/tmp/devicefarm-cli-v${cli_version}.zip"
+  local cli_dir="/tmp/devicefarm_cli"
+
+  download_and_extract \
+    "${DEVICEFARM_BASE}" \
+    "${cli_version}" \
+    "${cli_dir}" \
+    "${cli_out}"
+
+  export PATH="${PATH%:}:${cli_dir}"
+  chmod +x "${cli_dir}/devicefarm-cli"
+}
+
+reserve_if_needed() {
+  if ! command -v devicefarm-cli >/dev/null 2>&1; then
+    echo "[WARN] devicefarm-cli is not installed." >&2
+    return 1
   fi
 
-  # Download LiteCore
-  curl -sS -L --fail --retry 3 \
-    --output "$OUT_FILE" \
-    "$DOWNLOAD_URL"
+  local raw_info info_lines
+  raw_info="$(devicefarm-cli -I)"
+
+  info_lines="$(printf '%s\n' "$raw_info" | grep -v '^\\[INFO\\]')"
 
-  echo "Download done: $OUT_FILE"
+  local found_count
 
+  found_count=$(printf '%s\n' "$info_lines" \
+    | grep -Eo 'Found available reservations *: *[0-9]+' \
+    | grep -Eo '[0-9]+')
+  [[ -z "$found_count" ]] && found_count=0
 
-  tar -C "${TARGET_PATH}" --strip-components=1 -xzvf "${OUT_FILE}"
+  echo "[INFO] Current Reserved Count: $found_count"
+
+  local THRESHOLD_SECONDS=12600
+  local any_below_threshold=0
+
+  if (( found_count > 0 )); then
+    local table_body
+    table_body=$(printf '%s\n' "$info_lines" | sed -n '2,$p')
+
+    while IFS= read -r line; do
+      if [[ "$line" =~ ^[0-9]+[[:space:]]+([0-9]{1,2}:[0-9]{2}:[0-9]{2}) ]]; then
+        local time_str="${BASH_REMATCH[1]}"
+        IFS=: read -r hh mm ss <<<"$time_str"
+        (( seconds = 10#$hh * 3600 + 10#$mm * 60 + 10#$ss ))
+        if (( seconds <= THRESHOLD_SECONDS )); then
+          any_below_threshold=1
+          break
+        fi
+      fi
+    done <<<"$table_body"
+  else
+    any_below_threshold=1
+  fi
 
-  export EXYNOS_AI_LITECORE_ROOT=${TARGET_PATH}
-  export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-}:${EXYNOS_AI_LITECORE_ROOT}/lib/x86_64-linux
+  if (( any_below_threshold )); then
+    echo "[INFO] Reserving now."
+    devicefarm-cli -R
+  else
+    echo "[INFO] Don't need to be reserved."
+  fi
+
+  local info_after reservation_id max_seconds=0 max_id
+
+  info_after="$(devicefarm-cli -I)"
+
+  local body_after
+  body_after=$(printf '%s\n' "$info_after" | grep -v '^\\[INFO\\]' | sed -n '2,$p')
+
+  while IFS= read -r line; do
+    if [[ "$line" =~ ^[0-9]+[[:space:]]+([0-9]{1,2}:[0-9]{2}:[0-9]{2})[[:space:]].*([0-9a-f-]{36})$ ]]; then
+      local time_str="${BASH_REMATCH[1]}"
+      local id="${BASH_REMATCH[2]}"
+      IFS=: read -r hh mm ss <<<"$time_str"
+      (( seconds = 10#$hh * 3600 + 10#$mm * 60 + 10#$ss ))
+      if (( seconds > max_seconds )); then
+        max_seconds=$seconds
+        max_id=$id
+      fi
+    fi
+  done <<<"$body_after"
+
+  reservation_id=$max_id
+
+  if [[ -n "$reservation_id" ]]; then
+    devicefarm-cli -C "$reservation_id"
+    devicefarm-cli -E "ls /"
+  else
+    echo "[WARN] There is no available devices."
+  fi
 }
 
 install_enn_backend() {
-  NDK_INSTALLATION_DIR=/opt/ndk
-  rm -rf "${NDK_INSTALLATION_DIR}" && sudo mkdir -p "${NDK_INSTALLATION_DIR}"
-  ANDROID_NDK_VERSION=r28c
+  local ndk_dir="/opt/ndk"
+  local ndk_version="r28c"
+
+  if [[ ! -d "${ndk_dir}" ]]; then
+    sudo mkdir -p "${ndk_dir}"
+    sudo chown "$(whoami)":"$(whoami)" "${ndk_dir}"
+  fi
+
+  export ANDROID_NDK_ROOT="${ndk_dir}"
+  echo "NDK will be installed/used at: ${ANDROID_NDK_ROOT}"
 
-  # build Exynos backend
-  export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT:-/opt/ndk}
   bash backends/samsung/build.sh --build all
-  # set env variable
-  export EXECUTORCH_ROOT="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/../.." && pwd)"
-  export PYTHONPATH=${PYTHONPATH:-}:${EXECUTORCH_ROOT}/..
+
+  export EXECUTORCH_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+  export PYTHONPATH="${PYTHONPATH:-}:${EXECUTORCH_ROOT}/.."
 }
 
-AI_LITE_CORE_VERSION=0.7.0
+litecore_ver="1.0"
+devicefarm_ver="beta-1.0.8"
 
-download_ai_lite_core ${AI_LITE_CORE_VERSION}
+download_ai_lite_core ${litecore_ver}
+install_devicefarm_cli "${devicefarm_ver}"
 install_enn_backend
+reserve_if_needed

.ci/scripts/test_ane_static_llama.sh

@@ -28,6 +28,13 @@ pushd $EXECUTORCH_ROOT/examples/apple/coreml/llama
 # Download stories llama110m artifacts
 download_stories_model_artifacts
 
+# Test static ANE llama model
+python export_static_llm_coreml.py --checkpoint stories110M.pt --params params.json --output model.pte
+
+# The ANE cannot run in github CI
+# python run_static_llm.py --model model.pte --params params.json --tokenizer tokenizer.model --prompt "Once upon a time," --lookahead
+
+# Test export of deprecated model
 python export.py -n model.pte -p params.json -c stories110M.pt --seq_length 32 --max_seq_length 64 --dtype fp16 --coreml-quantize c4w --embedding-quantize 4,32
 
 popd

.ci/scripts/test_backend.sh

@@ -64,7 +64,7 @@ if [[ "$FLOW" == *arm* ]]; then
     else
         .ci/scripts/setup-arm-baremetal-tools.sh
     fi
-    source examples/arm/ethos-u-scratch/setup_path.sh
+    source examples/arm/arm-scratch/setup_path.sh
 
     if [[ "$FLOW" == *ethos_u* ]]; then
         # Prepare a test runner binary that can run on the Corstone-3x0 FVPs