Update (base update)

[ghstack-poisoned]

Author: JCNTH

.ci/scripts/build-qnn-windows-msvc.ps1

@@ -0,0 +1,70 @@
+# Copyright (c) Qualcomm Innovation Center, Inc.
+# 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.
+
+$ErrorActionPreference = "Stop"
+
+conda create --yes --quiet -n et python=3.12
+conda activate et
+
+# Install CI requirements
+pip install -r .ci/docker/requirements-ci.txt
+
+# Provision the QNN SDK
+if ($env:QNN_SDK_ROOT -and (Test-Path -Path $env:QNN_SDK_ROOT)) {
+    Write-Host "Using existing QNN SDK at $env:QNN_SDK_ROOT"
+} else {
+    # Resolve the QNN_VERSION and QNN_ZIP_URL
+    $qnnInfo = python -c "import sys; sys.path.insert(0, r'backends\qualcomm\scripts'); import download_qnn_sdk as d; print(d.QNN_VERSION); print(d.QNN_ZIP_URL)"
+    if ($LASTEXITCODE -ne 0 -or $qnnInfo.Count -lt 2) {
+        Write-Error "Failed to read QNN_VERSION and QNN_ZIP_URL from download_qnn_sdk.py."
+        exit 1
+    }
+    $qnnVersion = $qnnInfo[0].Trim()
+    $qnnZipUrl  = $qnnInfo[1].Trim()
+
+    $qnnInstallDir = Join-Path $env:TEMP "qnn"
+    New-Item -Path $qnnInstallDir -ItemType Directory -Force | Out-Null
+    $qnnZip = Join-Path $env:TEMP "qnn_sdk.zip"
+    Write-Host "Downloading QNN SDK v$qnnVersion ..."
+    $ProgressPreference = "SilentlyContinue"
+    Invoke-WebRequest -Uri $qnnZipUrl -OutFile $qnnZip
+    Write-Host "Extracting QNN SDK ..."
+    Expand-Archive -Path $qnnZip -DestinationPath $qnnInstallDir -Force
+    Remove-Item -Path $qnnZip -Force
+
+    $env:QNN_SDK_ROOT = Join-Path $qnnInstallDir "qairt\$qnnVersion"
+    Write-Host "Set QNN_SDK_ROOT=$env:QNN_SDK_ROOT"
+}
+
+if (-not (Test-Path -Path (Join-Path $env:QNN_SDK_ROOT "include\QNN"))) {
+    Write-Error "QNN SDK layout unexpected: missing include\QNN under $env:QNN_SDK_ROOT"
+    exit 1
+}
+
+# Test x86_64 Windows host build
+.\backends\qualcomm\scripts\build.ps1 -SkipArm64Windows -Release
+
+$x86Artifacts = @(
+    "build-x86_64-windows\backends\qualcomm\Release\PyQnnManagerAdaptor*.pyd",
+    "build-x86_64-windows\backends\qualcomm\Release\qnn_executorch_backend.dll",
+    "build-x86_64-windows\examples\qualcomm\executor_runner\Release\qnn_executor_runner.exe"
+)
+foreach ($artifact in $x86Artifacts) {
+    if (-not (Get-ChildItem -Path $artifact -ErrorAction SilentlyContinue)) {
+        Write-Error "ERROR: x86_64 artifact not found: $artifact"
+        exit 1
+    }
+}
+
+# The ARM64 MSVC toolchain is currently not installed in the Windows CI
+# environment. Enabling this build configuration results in build failures
+# due to the missing ARM64 platform definition.
+# `.\backends\qualcomm\scripts\build.ps1 -SkipX86Windows -Release`
+#
+# Temporarily disable this build option until ARM64 MSVC support is available
+# in CI. The configuration can be re-enabled in a future update.
+
+Write-Host "PASSED: QNN backend Windows MSVC build completed"

.github/workflows/add-unanswered-to-project.yml

@@ -27,11 +27,11 @@ jobs:
             // List of authors to exclude
             const excludedAuthors = new Set([
               "nil-is-all", "tanvirislam-meta", "cbilgin", "kimishpatel", "psiddh", "digantdesai", "SS-JIA", "ahmtox", "mcr229", 
-              "shoumikhin", "manuelcandales", "metascroy", "cccclai", "rohansjoshi", "kirklandsign", "abhinaykukkadapu", 
-              "JacobSzwejbka", "Conarnar", "rascani", "lucylq", "larryliu0820", "BujSet", "Gasoonjia", "Juntian777", "guangy10", 
+              "shoumikhin", "manuelcandales", "metascroy", "cccclai", "rohansjoshi", "kirklandsign", "abhinaykukkadapu", "JacobSzwejbka", 
+              "Conarnar", "rascani", "kiymetakdemir", "JCNTH", "lucylq", "larryliu0820", "BujSet", "Gasoonjia", "Juntian777", "guangy10", 
               "jackzhxng", "GregoryComer", "leafs1", "swolchok", "mergennachin", "tarun292", "byjlw", "jathu", "Jack-Khuu", "georgehong", 
-              "zhenyan-zhang-meta", "silverguo", "harishs88ss", "AlannaBurke", "dbort", "huydhn", "mcremon-meta", "trivedivivek", 
-              "angelayi", "helunwencser", "hsharma35", "zhxchen17", "iseeyuan", "svekars", "nathanaelsee", "dulinriley", 
+              "zhenyan-zhang-meta", "silverguo", "harishs88ss", "AlannaBurke", "Doggeral", "laithsakka", "Reubend", "dbort", "huydhn", "mcremon-meta", 
+              "trivedivivek", "angelayi", "helunwencser", "hsharma35", "zhxchen17", "iseeyuan", "svekars", "nathanaelsee", "dulinriley", 
               "jerryzh168", "cmodi-meta", "bigfootjon", "sxu", "ydwu4", "Riandy", "tugsbayasgalan", "bsoyluoglu", "yangw-dev", 
               "YIWENX14", "namanahuja", "yushangdi", "limintang", "pianpwk", "viveknayakatmeta", "andreanicastro", "JakeStevens",
               "gmagogsfm", "zonglinpeng", "eigen-k", "derekxu", "salilsdesai", "skrtskrtfb", "pssrawat", "r-barnes",
@@ -50,7 +50,7 @@ jobs:
               "mansnils", "martinlsm", "freddan80", "YufengShi-dudu", "tom-arm", "perheld", "Jerry-Ge", "gggekov", "fumchin", "wwwind", 
               "benkli01", "Tessil", "maddun01", "Michiel-Olieslagers", "armwaheed", "agrima1304", "emmakujala", "annietllnd", 
               "MatthiasHertel80", "AlexTawseArm", "jmahbs", "morgolock", "Christoffer-JL", "ArmRyan", "xingguo01", "tgonzalezorlandoarm", 
-              "chizkiyahu", "sarah-blades", "itsMarco-G", "usamahz", "Rob-Hughes-Arm", 
+              "chizkiyahu", "sarah-blades", "itsMarco-G", "usamahz", "Rob-Hughes-Arm", "swha815", "FabulousSuperDude",
               "haowhsu-quic", "shewu-quic", "winskuo-quic", "chunit-quic", "DannyYuyang-quic", "chuntl", "thchenqti", "jethroqti", 
               "chenweng-quic", "qti-horodnic", "qti-mmadhava", "quic-boyuc", "zhaoxul-qti", 
               "cymbalrush", "DenisVieriu97", "billmguo", 

.github/workflows/doc-build.yml

@@ -104,6 +104,9 @@ jobs:
       repository: pytorch/executorch
       download-artifact: docs
       ref: gh-pages
+      # Publish on the host so actions/checkout's persisted credentials are
+      # available to git push.
+      run-with-docker: false
       timeout: 90
       script: |
         set -euo pipefail

.github/workflows/pull.yml

@@ -1427,7 +1427,7 @@ jobs:
       docker-image: ci-image:executorch-ubuntu-22.04-clang12
       submodules: 'recursive'
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-      timeout: 120
+      timeout: 150
       script: |
         set -eux
 

.github/workflows/qnn-windows-msvc.yml

@@ -0,0 +1,74 @@
+name: Test QNN Windows MSVC build
+
+# Changes to backends/qualcomm/, top-level CMake files, extension/,
+# examples/, runtime/, and other shared infrastructure can affect
+# the QNN Windows MSVC build. Rather than maintaining a fragile list
+# of relevant path filters, this workflow runs on every PR to ensure
+# build coverage.
+#
+# Reasons for keeping qnn-windows-msvc.yml separate from test-backend-qnn.yml:
+#
+# - Two workflows are triggered by different tags.
+#   - test-backend-qnn.yml runs under ciflow/nightly/*.
+#   - qnn-windows-msvc.yml runs under ciflow/trunk/*.
+#   Merging them would introduce the behavior change to the existing flow.
+#
+# - Workflow reruns are more efficient when they remain separate.
+#   A Windows-only failure would still require rerunning jobs in test-backend-qnn.yml
+#   if they are combined into a single workflow, resulting in unnecessary CI
+#   resource consumption (and vice versa).
+#
+# - Failure signals are clearer when the workflows are isolated.
+#   With a combined workflow, additional inspection of the job list would be required to
+#   identify the root cause of a failing status. Keeping the workflows separate provides
+#   distinct top-level CI statuses, making the failure domain immediately obvious.
+#
+# For now, qnn-windows-msvc.yml should remain separate from trunk.yml and pull.yml:
+#
+# - trunk.yml is only triggered for PRs that modify files matching:
+#     - .ci/docker/ci_commit_pins/pytorch.txt
+#     - .ci/scripts/**
+#     - zephyr/**
+#   As a result, trunk.yml would not run for PRs that touch backends/qualcomm/**.
+#
+# - pull.yml runs on every PR without path filters, but currently contains only
+#   Linux jobs. Keeping qnn-windows-msvc.yml as a standalone workflow provides
+#   independent status visibility and more efficient reruns for QNN Windows build.
+#
+# Once the QNN Windows CI path has demonstrated sufficient stability, we can revisit
+# whether it makes sense to consolidate qnn-windows-msvc.yml into pull.yml.
+
+on:
+  push:
+    branches:
+      - main
+      - release/*
+    tags:
+      - ciflow/trunk/*
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ github.event_name == 'workflow_dispatch' }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  build-qnn-windows-msvc:
+    name: build-qnn-windows-msvc
+    uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
+    with:
+      ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+      timeout: 90
+      script: |
+        git config --global http.sslBackend openssl
+        git submodule update --init --recursive
+        conda init powershell
+        powershell -Command "& {
+          Set-PSDebug -Trace 1
+          \$ErrorActionPreference = 'Stop'
+          \$PSNativeCommandUseErrorActionPreference = \$true
+          .ci/scripts/build-qnn-windows-msvc.ps1
+        }"

backends/aoti/passes/TARGETS backends/aoti/passes/BUCKbackends/aoti/passes/TARGETS renamed to backends/aoti/passes/BUCK

@@ -1,11 +1,13 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 
 oncall("executorch")
 
-runtime.python_library(
+fbcode_target(
+    _kind = runtime.python_library,
     name = "passes",
     srcs = [
-      "replace_view_copy_with_view.py",
+        "replace_view_copy_with_view.py",
     ],
     visibility = [
         "//executorch/...",

backends/aoti/slim/factory/test/test_from_etensor.cpp

@@ -20,8 +20,6 @@
 
 namespace executorch::backends::aoti::slim {
 
-using executorch::runtime::Error;
-using executorch::runtime::TensorShapeDynamism;
 using executorch::runtime::etensor::ScalarType;
 using executorch::runtime::testing::TensorFactory;
 

backends/apple/coreml/runtime/delegate/executorch_operations.mm

@@ -13,7 +13,6 @@
 #import <memory>
 
 namespace executorch::core_ml_backend_delegate {
-  using executorch::runtime::get_backend_class;
 
 static std::unique_ptr<executorch::backends::coreml::CoreMLBackendDelegate> backendInterfaceLazy_;
 

backends/apple/coreml/runtime/test/CoreMLBackendDelegateTests.mm

@@ -18,7 +18,6 @@
 static constexpr size_t kRuntimeMemorySize = 50 * 1024U * 1024U; // 50 MB
 
 using namespace executorch::runtime;
-using executorch::runtime::testing::TensorFactory;
 
 namespace {
 // TODO: Move the following methods to a utility class, so that it can be shared with `executor_runner.main.mm`

backends/apple/coreml/runtime/test/coreml_backend_options_test.cpp

@@ -13,7 +13,6 @@
 #include <gtest/gtest.h>
 
 using executorch::backends::coreml::LoadOptionsBuilder;
-using executorch::runtime::BackendOption;
 using executorch::runtime::Error;
 using executorch::runtime::kMaxOptionValueLength;
 using executorch::runtime::LoadBackendOptionsMap;