Merge branch 'pytorch:main' into Arm-backend-Use-better-Ethos-U-PMU-counters-for-Ethos-U85

Author: zingo

.ci/docker/ci_commit_pins/pytorch.txt

@@ -1 +1 @@
-bd5482c7c3e1197e10c46ff739027f917d9c1fcc
+23d590e518688f96e1d1947a08e9ca27df3e67e4

.ci/docker/common/install_clang.sh

@@ -13,7 +13,7 @@ install_ubuntu() {
   apt-get install -y --no-install-recommends clang-"$CLANG_VERSION"
   apt-get install -y --no-install-recommends llvm-"$CLANG_VERSION"
   # Also require LLD linker from llvm and libomp to build PyTorch from source
-  apt-get install -y lld "libomp-${CLANG_VERSION}-dev"
+  apt-get install -y lld "libomp-${CLANG_VERSION}-dev" "libc++-${CLANG_VERSION}-dev"
 
   # Use update-alternatives to make this version the default
   update-alternatives --install /usr/bin/clang clang /usr/bin/clang-"$CLANG_VERSION" 50

.ci/docker/requirements-ci.txt

@@ -1,5 +1,5 @@
 mpmath==1.3.0
-numpy==1.22.0; python_version == '3.10'
+numpy==1.21.3; python_version == '3.10'
 numpy==1.23.2; python_version == '3.11'
 numpy; python_version >= '3.12'
 PyYAML==6.0.1

.ci/scripts/setup-linux.sh

@@ -19,6 +19,7 @@ else
 fi
 
 # As Linux job is running inside a Docker container, all of its dependencies
-# have already been installed
-install_executorch
+# have already been installed, so we use PyTorch build from source here instead
+# of nightly. This allows CI to test against latest commits from PyTorch
+install_executorch "use-pt-pinned-commit"
 build_executorch_runner "${BUILD_TOOL}"

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

@@ -31,8 +31,9 @@ install_qnn() {
 }
 
 setup_libc++() {
+  clang_version=$1
   sudo apt-get update
-  pkgs_to_check=('libc++-dev')
+  pkgs_to_check=("libc++-${clang_version}-dev")
   j=0
   while [ $j -lt ${#pkgs_to_check[*]} ]; do
     install_status=$(verify_pkg_installed ${pkgs_to_check[$j]})
@@ -47,5 +48,6 @@ setup_libc++() {
   done
 }
 
-setup_libc++
+# This needs to match with the clang version from the Docker image
+setup_libc++ 12
 install_qnn

.ci/scripts/utils.sh

@@ -20,8 +20,11 @@ install_executorch() {
   which pip
   # Install executorch, this assumes that Executorch is checked out in the
   # current directory.
-  # TODO(T199538337): clean up install scripts to use install_requirements.sh
-  ./install_requirements.sh --pybind xnnpack
+  if [[ "${1:-}" == "use-pt-pinned-commit" ]]; then
+    ./install_requirements.sh --pybind xnnpack --use-pt-pinned-commit
+  else
+    ./install_requirements.sh --pybind xnnpack
+  fi
   # Just print out the list of packages for debugging
   pip list
 }

.github/workflows/trunk.yml

@@ -137,6 +137,7 @@ jobs:
       docker-image: executorch-ubuntu-22.04-arm-sdk
       submodules: 'true'
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+      timeout: 90
       script: |
         # The generic Linux job chooses to use base env, not the one setup by the image
         CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
@@ -162,6 +163,7 @@ jobs:
       docker-image: executorch-ubuntu-22.04-arm-sdk
       submodules: 'true'
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+      timeout: 90
       script: |
         # The generic Linux job chooses to use base env, not the one setup by the image
         CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")

backends/qualcomm/runtime/backends/QnnProfiler.cpp

@@ -23,8 +23,9 @@ QnnProfile::QnnProfile(
     QnnProfile_Level_t qnnProfileLevel = 0;
     if (profile_level == QnnExecuTorchProfileLevel::kProfileBasic) {
       qnnProfileLevel = QNN_PROFILE_LEVEL_BASIC;
-    } else if (profile_level == QnnExecuTorchProfileLevel::kProfileDetailed
-        || profile_level == QnnExecuTorchProfileLevel::kProfileOptrace) {
+    } else if (
+        profile_level == QnnExecuTorchProfileLevel::kProfileDetailed ||
+        profile_level == QnnExecuTorchProfileLevel::kProfileOptrace) {
       qnnProfileLevel = QNN_PROFILE_LEVEL_DETAILED;
     } else {
       QNN_EXECUTORCH_LOG_WARN("Invalid profile level");
@@ -46,15 +47,17 @@ QnnProfile::QnnProfile(
 
     if (profile_level == QnnExecuTorchProfileLevel::kProfileOptrace) {
       if (handle_ == nullptr) {
-        QNN_EXECUTORCH_LOG_WARN("Prfoile handle is null, cannot enable optrace");
+        QNN_EXECUTORCH_LOG_WARN(
+            "Prfoile handle is null, cannot enable optrace");
         return;
       }
 
       QnnProfile_Config_t qnnProfileConfig = QNN_PROFILE_CONFIG_INIT;
       qnnProfileConfig.option = QNN_PROFILE_CONFIG_OPTION_ENABLE_OPTRACE;
       std::array<const QnnProfile_Config_t*, 2> profileConfigs = {
           &qnnProfileConfig, nullptr};
-      error = qnn_interface.qnn_profile_set_config(handle_, profileConfigs.data());
+      error =
+          qnn_interface.qnn_profile_set_config(handle_, profileConfigs.data());
 
       if (error != QNN_SUCCESS) {
         QNN_EXECUTORCH_LOG_WARN(

backends/qualcomm/utils/utils.py

@@ -833,9 +833,7 @@ def generate_qnn_executorch_compiler_spec(
         qnn_executorch_options.library_path = "libQnnSaver.so"
 
     if optrace:
-        qnn_executorch_options.profile_level = (
-            QnnExecuTorchProfileLevel.kProfileOptrace
-        )
+        qnn_executorch_options.profile_level = QnnExecuTorchProfileLevel.kProfileOptrace
     elif profile:
         qnn_executorch_options.profile_level = (
             QnnExecuTorchProfileLevel.kProfileDetailed

backends/vulkan/_passes/TARGETS

@@ -12,6 +12,7 @@ runtime.python_library(
     deps = [
         "//caffe2:torch",
         "//executorch/exir:pass_base",
+        "//executorch/backends/vulkan:utils_lib",
     ],
 )