Merge branch 'pytorch:main' into add-datasink-try-before-set-tests

Author: keyprocedure

.ci/scripts/test_qnn_static_llama.sh

@@ -5,7 +5,7 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-set -exu
+set -euxo pipefail
 
 source "$(dirname "${BASH_SOURCE[0]}")/utils.sh"
 
@@ -56,4 +56,3 @@ if [ $exit_code1 -ne 0 ] || [ $exit_code2 -ne 0 ]; then
 else
     exit 0
 fi
-set -e

.ci/scripts/utils.sh

@@ -32,7 +32,7 @@ install_executorch() {
   which pip
   # Install executorch, this assumes that Executorch is checked out in the
   # current directory.
-  ./install_executorch.sh --pybind xnnpack "$@"
+  ./install_executorch.sh "$@"
   # Just print out the list of packages for debugging
   pip list
 }

.github/workflows/apple.yml

@@ -37,7 +37,7 @@ jobs:
         id: set_version
         shell: bash
         run: |
-          VERSION="0.5.0.$(TZ='PST8PDT' date +%Y%m%d)"
+          VERSION="0.7.0.$(TZ='PST8PDT' date +%Y%m%d)"
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
 
   build-demo-ios:

.github/workflows/pull.yml

@@ -573,7 +573,6 @@ jobs:
 
         BUILD_TOOL="cmake"
 
-        ./install_requirements.sh --use-pt-pinned-commit
         PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
         PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh
 

backends/arm/test/ops/test_any.py

@@ -6,6 +6,7 @@
 
 from typing import List, Tuple
 
+import pytest
 import torch
 from executorch.backends.arm.test import common
 from executorch.backends.arm.test.tester.test_pipeline import (
@@ -117,25 +118,6 @@ def forward(self, x: torch.Tensor):
 }
 
 
-fvp_xfails = {
-    "any_rank1": "MLETORCH-706 Support ScalarType::Bool in EthosUBackend.",
-    "any_rank1_squeeze": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
-    "any_rank2": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
-    "any_rank2_squeeze": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
-    "any_rank2_dims": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
-    "any_rank2_dims_squeeze": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
-    "any_rank3_dims_squeeze": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
-    "any_rank4": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
-    "any_rank4_squeeze": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
-    "any_rank4_dims": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
-    "any_rank4_dims_squeeze": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
-    "any_rank1_reduce_all": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
-    "any_rank2_reduce_all": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
-    "any_rank3_reduce_all": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
-    "any_rank4_reduce_all": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
-}
-
-
 @common.parametrize("test_data", test_data)
 def test_any_tosa_MI(test_data: input_t1):
     op, test_input = test_data
@@ -147,13 +129,13 @@ def test_any_tosa_MI(test_data: input_t1):
 def test_any_tosa_BI(test_data: input_t1):
     op, test_input = test_data
     pipeline = TosaPipelineBI[input_t1](op, test_input, op.aten_op, op.exir_op)
-    pipeline.pop_stage(pipeline.find_pos("quantize") + 1)
     pipeline.pop_stage("quantize")
+    pipeline.pop_stage("check.quant_nodes")
     pipeline.run()
 
 
 @common.parametrize("test_data", test_data)
-def test_logical_u55_BI(test_data: input_t1):
+def test_any_u55_BI(test_data: input_t1):
     # Tests that we don't delegate these ops since they are not supported on U55.
     op, test_input = test_data
     pipeline = OpNotSupportedPipeline[input_t1](
@@ -163,23 +145,13 @@ def test_logical_u55_BI(test_data: input_t1):
 
 
 @common.parametrize("test_data", test_data)
-def test_floor_u85_BI(test_data: input_t1):
-    op, test_input = test_data
-    pipeline = EthosU85PipelineBI[input_t1](
-        op, test_input, op.aten_op, op.exir_op, run_on_fvp=False
-    )
-    pipeline.pop_stage(pipeline.find_pos("quantize") + 1)
-    pipeline.pop_stage("quantize")
-    pipeline.run()
-
-
-@common.parametrize("test_data", test_data, fvp_xfails)
-@common.SkipIfNoCorstone320
-def test_floor_u85_BI_on_fvp(test_data: input_t1):
+@pytest.mark.xfail(reason="MLETORCH-706: Support ScalarType::Bool in EthosUBackend.")
+@common.XfailIfNoCorstone320
+def test_any_u85_BI(test_data: input_t1):
     op, test_input = test_data
     pipeline = EthosU85PipelineBI[input_t1](
         op, test_input, op.aten_op, op.exir_op, run_on_fvp=True
     )
-    pipeline.pop_stage(pipeline.find_pos("quantize") + 1)
     pipeline.pop_stage("quantize")
+    pipeline.pop_stage("check.quant_nodes")
     pipeline.run()