Merge branch 'main' into Add-sign-decomposition-pass-and-test

Author: zingo

.ci/scripts/test_model.sh

@@ -188,22 +188,6 @@ test_model_with_qnn() {
     EXPORT_SCRIPT=edsr
     # Additional deps for edsr
     pip install piq
-  elif [[ "${MODEL_NAME}" == "cvt" ]]; then
-    EXPORT_SCRIPT=cvt
-  elif [[ "${MODEL_NAME}" == "dit" ]]; then
-    EXPORT_SCRIPT=dit
-  elif [[ "${MODEL_NAME}" == "efficientnet" ]]; then
-    EXPORT_SCRIPT=efficientnet
-  elif [[ "${MODEL_NAME}" == "focalnet" ]]; then
-    EXPORT_SCRIPT=focalnet
-  elif [[ "${MODEL_NAME}" == "mobilevit_v1" ]]; then
-    EXPORT_SCRIPT=mobilevit_v1
-  elif [[ "${MODEL_NAME}" == "mobilevit_v2" ]]; then
-    EXPORT_SCRIPT=mobilevit_v2
-  elif [[ "${MODEL_NAME}" == "pvt" ]]; then
-    EXPORT_SCRIPT=pvt
-  elif [[ "${MODEL_NAME}" == "swin" ]]; then
-    EXPORT_SCRIPT=swin_transformer
   elif [[ "${MODEL_NAME}" == "albert" ]]; then
     EXPORT_SCRIPT=albert
   elif [[ "${MODEL_NAME}" == "bert" ]]; then
@@ -212,8 +196,6 @@ test_model_with_qnn() {
     EXPORT_SCRIPT=distilbert
   elif [[ "${MODEL_NAME}" == "eurobert" ]]; then
     EXPORT_SCRIPT=eurobert
-  elif [[ "${MODEL_NAME}" == "roberta" ]]; then
-    EXPORT_SCRIPT=roberta
   else
     echo "Unsupported model $MODEL_NAME"
     exit 1
@@ -228,13 +210,10 @@ test_model_with_qnn() {
     "dl3"|"mv3"|"mv2"|"ic4"|"ic3"|"vit"|"mb"|"w2l")
         SCRIPT_FOLDER=scripts
         ;;
-    "cvt"|"dit"|"focalnet"|"mobilevit_v2"|"pvt"|"swin")
-        SCRIPT_FOLDER=oss_scripts
-        ;;
-    "albert"|"bert"|"distilbert"|"roberta"|"efficientnet"|"mobilevit_v1")
+    "albert"|"bert"|"distilbert")
         pip install evaluate
         SCRIPT_FOLDER=oss_scripts
-        # 16bit models will encounter op validation fail on some operations,
+        # Bert models running in 16bit will encounter op validation fail on some operations,
         # which requires CHIPSET >= SM8550.
         QNN_CHIPSET=SM8550
         ;;

.github/workflows/trunk.yml

@@ -271,6 +271,36 @@ jobs:
           exit 1
         fi
 
+  nxp-build-test:
+    name: nxp-build-test
+    uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
+    permissions:
+      id-token: write
+      contents: read
+    with:
+      runner: linux.2xlarge
+      docker-image: executorch-ubuntu-22.04-arm-sdk
+      submodules: 'recursive'
+      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]")
+        conda activate "${CONDA_ENV}"
+
+        # Build
+        cmake -DEXECUTORCH_BUILD_NXP_NEUTRON=ON -Bcmake-out .
+        cmake --build cmake-out --target executorch_delegate_neutron --config Release
+
+        # Build check for the neutron backend library
+        lib_neutron="cmake-out/backends/nxp/libexecutorch_delegate_neutron.a"
+        if [ -f $lib_neutron ]; then
+            echo "Neutron backend library built."
+        else
+            echo "Neutron backend library not found!"
+            exit 1
+        fi
+
   test-coreml-delegate:
     name: test-coreml-delegate
     uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
@@ -470,7 +500,7 @@ jobs:
       docker-image: executorch-ubuntu-22.04-qnn-sdk
       submodules: 'recursive'
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-      timeout: 90
+      timeout: 900
       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]")
@@ -489,14 +519,14 @@ jobs:
     strategy:
       matrix:
         dtype: [fp32]
-        model: [cvt, dit, efficientnet, focalnet, mobilevit_v1, mobilevit_v2, pvt, swin, albert, bert, distilbert, roberta] # eurobert requires transfomer >= 4.48.0, skip for now
+        model: [albert, bert, distilbert] # eurobert requires transfomer >= 4.48.0, skip for now
       fail-fast: false
     with:
       runner: linux.2xlarge
       docker-image: executorch-ubuntu-22.04-qnn-sdk
       submodules: 'recursive'
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-      timeout: 90
+      timeout: 900
       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]")

CMakeLists.txt

@@ -449,6 +449,12 @@ install(
   FILES_MATCHING
   PATTERN "*.h"
 )
+install(
+  DIRECTORY runtime/executor/
+  DESTINATION include/executorch/runtime/executor
+  FILES_MATCHING
+  PATTERN "*.h"
+)
 install(
   DIRECTORY runtime/kernel/
   DESTINATION include/executorch/runtime/kernel
@@ -496,6 +502,10 @@ if(EXECUTORCH_BUILD_CADENCE)
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/backends/cadence)
 endif()
 
+if(EXECUTORCH_BUILD_NXP_NEUTRON)
+  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/backends/nxp)
+endif()
+
 if(EXECUTORCH_BUILD_COREML)
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/backends/apple/coreml)
 endif()
@@ -542,6 +552,12 @@ endif()
 
 if(EXECUTORCH_BUILD_EXTENSION_MODULE)
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/extension/module)
+  install(
+    DIRECTORY extension/module/
+    DESTINATION include/executorch/extension/module
+    FILES_MATCHING
+    PATTERN "*.h"
+  )
 endif()
 
 if(EXECUTORCH_BUILD_EXTENSION_LLM)

backends/arm/_passes/decompose_linear_pass.py

@@ -88,6 +88,7 @@ def call(self, graph_module):
                     op_target=exir_ops.edge.aten.view_copy.default,
                     args=(conv, list(output_shape)),
                     kwargs={},
+                    from_node=node,
                 )
 
             node.replace_all_uses_with(output)

backends/arm/operator_support/tosa_supported_operators.py

@@ -328,6 +328,7 @@ class CheckProperQuantization(OperatorSupportBase):
         exir_ops.edge.aten.upsample_bilinear2d.vec,
         exir_ops.edge.aten.upsample_nearest2d.vec,
         torch.ops.aten.scalar_tensor.default,
+        exir_ops.edge.aten.mean.dim,
         *TableOps.included_ops(),
     )
 

backends/nxp/CMakeLists.txt

@@ -0,0 +1,18 @@
+# Copyright 2024 NXP
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+set(
+  _common_include_directories 
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../..
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../runtime/core/portable_type/c10
+)
+add_compile_definitions(C10_USING_CUSTOM_GENERATED_MACROS)
+
+set(_neutron_sources ${CMAKE_CURRENT_SOURCE_DIR}/runtime/NeutronBackend.cpp )
+
+add_library(executorch_delegate_neutron STATIC ${_neutron_sources})
+target_include_directories(
+  executorch_delegate_neutron PUBLIC ${_common_include_directories}
+)